Skip to content

Commit d1f72a4

Browse files
saiarcot895yxieca
authored andcommitted
Change dhcp6relay to be a submodule, and rename it to dhcprelay (#10711)
Why I did it src/dhcprelay is being split out to be its own submodule. How I did it Add existing dhcprelay commits into the new repo. Clean up Makefile (sonic-net/sonic-dhcp-relay@772625f) Add LGTM config (sonic-net/sonic-dhcp-relay@5cc0889) Add Azure pipeline config (sonic-net/sonic-dhcp-relay@c79cdb7) Add submodule reference, renaming most references of dhcp6relay to dhcprelay (to reflect that this will not just be for IPv6 in the future). How to verify it Successful run of LGTM is tested at sonic-net/sonic-dhcp-relay#4. Failure run of LGTM is tested at sonic-net/sonic-dhcp-relay#3. Azure pipeline is run for each commit/PR, and will build for amd64, armhf, and arm64. UT/code coverage check is not yet done. Signed-off-by: Saikrishna Arcot <[email protected]>
1 parent f16e7ad commit d1f72a4

File tree

19 files changed

+29
-1583
lines changed

19 files changed

+29
-1583
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,3 +113,6 @@
113113
[submodule "src/ptf-py3"]
114114
path = src/ptf-py3
115115
url = https://github.com/p4lang/ptf.git
116+
[submodule "src/dhcprelay"]
117+
path = src/dhcprelay
118+
url = https://github.com/sonic-net/sonic-dhcp-relay.git

rules/dhcp6relay.dep

Lines changed: 0 additions & 9 deletions
This file was deleted.

rules/dhcp6relay.mk

Lines changed: 0 additions & 12 deletions
This file was deleted.

rules/dhcprelay.dep

Lines changed: 11 additions & 0 deletions
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

Lines changed: 12 additions & 0 deletions
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

Lines changed: 2 additions & 2 deletions
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_BULLSEYE)_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_BULLSEYE)_DBG_IMAGE_PACKAGES)
1515

src/dhcp6relay/.gitignore

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/dhcp6relay/Makefile

Lines changed: 0 additions & 42 deletions
This file was deleted.

src/dhcp6relay/debian/changelog

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/dhcp6relay/debian/compat

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)