Change dhcp6relay to be a submodule, and rename it to dhcprelay

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
sonic-net · Jul 8, 2022 · 8cc1c9c · 8cc1c9c
1 parent 1b7fcb4
commit 8cc1c9c
Show file tree

Hide file tree

Showing 19 changed files with 29 additions and 1,583 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -106,3 +106,6 @@
 [submodule "src/ptf-py3"]
 	path = src/ptf-py3
 	url = https://github.com/p4lang/ptf.git
+[submodule "src/dhcprelay"]
+	path = src/dhcprelay
+	url = https://github.com/sonic-net/sonic-dhcp-relay.git
diff --git a/rules/dhcp6relay.dep b/rules/dhcp6relay.dep
diff --git a/rules/dhcp6relay.mk b/rules/dhcp6relay.mk
diff --git a/rules/dhcprelay.dep b/rules/dhcprelay.dep
@@ -0,0 +1,11 @@
+
+SPATH       := $($(SONIC_DHCPRELAY)_SRC_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/dhcprelay.mk rules/dhcprelay.dep   
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files))
+
+$(SONIC_DHCPRELAY)_CACHE_MODE  := GIT_CONTENT_SHA 
+$(SONIC_DHCPRELAY)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(SONIC_DHCPRELAY)_DEP_FILES   := $(DEP_FILES)
+$(SONIC_DHCPRELAY)_SMDEP_FILES := $(SMDEP_FILES)
+$(SONIC_DHCPRELAY)_SMDEP_PATHS := $(SPATH)
diff --git a/rules/dhcprelay.mk b/rules/dhcprelay.mk
@@ -0,0 +1,12 @@
+# SONiC DHCPV6 RELAY Package
+
+SONIC_DHCPRELAY_VERSION = 1.0.0-0
+SONIC_DHCPRELAY_PKG_NAME = dhcp6relay
+
+SONIC_DHCPRELAY = sonic-$(SONIC_DHCPRELAY_PKG_NAME)_$(SONIC_DHCPRELAY_VERSION)_$(CONFIGURED_ARCH).deb
+$(SONIC_DHCPRELAY)_DEPENDS = $(LIBSWSSCOMMON) $(LIBHIREDIS) $(LIBSWSSCOMMON_DEV) $(LIBHIREDIS_DEV)
+$(SONIC_DHCPRELAY)_SRC_PATH = $(SRC_PATH)/dhcprelay
+SONIC_DPKG_DEBS += $(SONIC_DHCPRELAY)
+
+SONIC_DHCPRELAY_DBG = sonic-$(SONIC_DHCPRELAY_PKG_NAME)-dbgsym_$(SONIC_DHCPRELAY_VERSION)_$(CONFIGURED_ARCH).deb
+$(eval $(call add_derived_package,$(SONIC_DHCPRELAY),$(SONIC_DHCPRELAY_DBG)))
diff --git a/rules/docker-dhcp-relay.mk b/rules/docker-dhcp-relay.mk
@@ -6,10 +6,10 @@ DOCKER_DHCP_RELAY_DBG = $(DOCKER_DHCP_RELAY_STEM)-$(DBG_IMAGE_MARK).gz
 
 $(DOCKER_DHCP_RELAY)_PATH = $(DOCKERS_PATH)/$(DOCKER_DHCP_RELAY_STEM)
 
-$(DOCKER_DHCP_RELAY)_DEPENDS += $(ISC_DHCP_RELAY) $(SONIC_DHCPMON) $(SONIC_DHCP6RELAY) $(LIBSWSSCOMMON) 
+$(DOCKER_DHCP_RELAY)_DEPENDS += $(ISC_DHCP_RELAY) $(SONIC_DHCPMON) $(SONIC_DHCPRELAY) $(LIBSWSSCOMMON) 
 
 $(DOCKER_DHCP_RELAY)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_DEPENDS)
-$(DOCKER_DHCP_RELAY)_DBG_DEPENDS += $(ISC_DHCP_RELAY_DBG) $(SONIC_DHCP6RELAY_DBG) $(SONIC_DHCPMON_DBG)
+$(DOCKER_DHCP_RELAY)_DBG_DEPENDS += $(ISC_DHCP_RELAY_DBG) $(SONIC_DHCPRELAY_DBG) $(SONIC_DHCPMON_DBG)
 
 $(DOCKER_DHCP_RELAY)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_IMAGE_PACKAGES)
 

diff --git a/src/dhcp6relay/.gitignore b/src/dhcp6relay/.gitignore
diff --git a/src/dhcp6relay/Makefile b/src/dhcp6relay/Makefile
diff --git a/src/dhcp6relay/debian/changelog b/src/dhcp6relay/debian/changelog
diff --git a/src/dhcp6relay/debian/compat b/src/dhcp6relay/debian/compat
diff --git a/src/dhcp6relay/debian/control b/src/dhcp6relay/debian/control
diff --git a/src/dhcp6relay/debian/rules b/src/dhcp6relay/debian/rules
diff --git a/src/dhcp6relay/src/configInterface.cpp b/src/dhcp6relay/src/configInterface.cpp
diff --git a/src/dhcp6relay/src/configInterface.h b/src/dhcp6relay/src/configInterface.h
diff --git a/src/dhcp6relay/src/main.cpp b/src/dhcp6relay/src/main.cpp