Skip to content

Commit 9db2e21

Browse files
authored
[202012] Change dhcp6relay to be a submodule (#11922)
* Add dhcprelay submodule
1 parent f3443cb commit 9db2e21

19 files changed

+33
-1586
lines changed

.gitmodules

+7
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,10 @@
9090
path = src/linkmgrd
9191
url = https://github.com/Azure/sonic-linkmgrd.git
9292
branch = 202012
93+
[submodule "src/dhcprelay"]
94+
path = src/dhcprelay
95+
url = https://github.com/sonic-net/sonic-dhcp-relay.git
96+
branch = 202012
97+
[submodule "sonic-dhcp-relay"]
98+
path = sonic-dhcp-relay
99+
url = https://github.com/kellyyeh/sonic-dhcp-relay.git

rules/dhcp6relay.dep

-9
This file was deleted.

rules/dhcp6relay.mk

-12
This file was deleted.

rules/dhcprelay.dep

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
2+
SPATH := $($(SONIC_DHCPRELAY)_SRC_PATH)
3+
DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/dhcprelay.mk rules/dhcprelay.dep
4+
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
5+
SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files))
6+
7+
$(SONIC_DHCPRELAY)_CACHE_MODE := GIT_CONTENT_SHA
8+
$(SONIC_DHCPRELAY)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
9+
$(SONIC_DHCPRELAY)_DEP_FILES := $(DEP_FILES)
10+
$(SONIC_DHCPRELAY)_SMDEP_FILES := $(SMDEP_FILES)
11+
$(SONIC_DHCPRELAY)_SMDEP_PATHS := $(SPATH)

rules/dhcprelay.mk

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# SONiC DHCPV6 RELAY Package
2+
3+
SONIC_DHCPRELAY_VERSION = 1.0.0-0
4+
SONIC_DHCPRELAY_PKG_NAME = dhcp6relay
5+
6+
SONIC_DHCPRELAY = sonic-$(SONIC_DHCPRELAY_PKG_NAME)_$(SONIC_DHCPRELAY_VERSION)_$(CONFIGURED_ARCH).deb
7+
$(SONIC_DHCPRELAY)_DEPENDS = $(LIBSWSSCOMMON) $(LIBHIREDIS) $(LIBSWSSCOMMON_DEV) $(LIBHIREDIS_DEV)
8+
$(SONIC_DHCPRELAY)_SRC_PATH = $(SRC_PATH)/dhcprelay
9+
SONIC_DPKG_DEBS += $(SONIC_DHCPRELAY)
10+
11+
SONIC_DHCPRELAY_DBG = sonic-$(SONIC_DHCPRELAY_PKG_NAME)-dbgsym_$(SONIC_DHCPRELAY_VERSION)_$(CONFIGURED_ARCH).deb
12+
$(eval $(call add_derived_package,$(SONIC_DHCPRELAY),$(SONIC_DHCPRELAY_DBG)))

rules/docker-dhcp-relay.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ DOCKER_DHCP_RELAY_DBG = $(DOCKER_DHCP_RELAY_STEM)-$(DBG_IMAGE_MARK).gz
66

77
$(DOCKER_DHCP_RELAY)_PATH = $(DOCKERS_PATH)/$(DOCKER_DHCP_RELAY_STEM)
88

9-
$(DOCKER_DHCP_RELAY)_DEPENDS += $(ISC_DHCP_RELAY) $(SONIC_DHCPMON) $(SONIC_DHCP6RELAY) $(LIBSWSSCOMMON)
9+
$(DOCKER_DHCP_RELAY)_DEPENDS += $(ISC_DHCP_RELAY) $(SONIC_DHCPMON) $(SONIC_DHCPRELAY) $(LIBSWSSCOMMON)
1010

1111
$(DOCKER_DHCP_RELAY)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
12-
$(DOCKER_DHCP_RELAY)_DBG_DEPENDS += $(ISC_DHCP_RELAY_DBG) $(SONIC_DHCP6RELAY_DBG) $(SONIC_DHCPMON_DBG)
12+
$(DOCKER_DHCP_RELAY)_DBG_DEPENDS += $(ISC_DHCP_RELAY_DBG) $(SONIC_DHCPRELAY_DBG) $(SONIC_DHCPMON_DBG)
1313

1414
$(DOCKER_DHCP_RELAY)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES)
1515

src/dhcp6relay/.gitignore

-5
This file was deleted.

src/dhcp6relay/Makefile

-42
This file was deleted.

src/dhcp6relay/debian/changelog

-5
This file was deleted.

src/dhcp6relay/debian/compat

-1
This file was deleted.

src/dhcp6relay/debian/control

-17
This file was deleted.

src/dhcp6relay/debian/rules

-6
This file was deleted.

src/dhcp6relay/src/configInterface.cpp

-152
This file was deleted.

src/dhcp6relay/src/configInterface.h

-75
This file was deleted.

0 commit comments

Comments
 (0)