From 32e55ee92bf940ed97349b896efbfdec8ab61c39 Mon Sep 17 00:00:00 2001 From: Manjot Brar Date: Wed, 7 Dec 2016 10:32:19 -0800 Subject: [PATCH 1/5] adding docker-dhcp-relay to build --- rules/docker-dhcp-relay.mk | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 rules/docker-dhcp-relay.mk diff --git a/rules/docker-dhcp-relay.mk b/rules/docker-dhcp-relay.mk new file mode 100644 index 000000000000..1c68e8468a30 --- /dev/null +++ b/rules/docker-dhcp-relay.mk @@ -0,0 +1,7 @@ +# docker dhcp relay image + +DOCKER_DHCP_RELAY = docker-dhcp-relay.gz +$(DOCKER_DHCP_RELAY)_PATH = $(DOCKERS_PATH)/docker-dhcp-relay +$(DOCKER_DHCP_RELAY)_LOAD_DOCKERS = $(DOCKER_BASE) + +SONIC_SIMPLE_DOCKER_IMAGES += $(DOCKER_DHCP_RELAY) From f1efcc249d093aae60dc1bbb166b0dd6b7348592 Mon Sep 17 00:00:00 2001 From: Manjot Brar Date: Wed, 7 Dec 2016 10:43:09 -0800 Subject: [PATCH 2/5] adding dhcp relay docker for default mellanox build --- platform/mellanox/rules.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/mellanox/rules.mk b/platform/mellanox/rules.mk index d24b3e3a2e82..939451e1f437 100644 --- a/platform/mellanox/rules.mk +++ b/platform/mellanox/rules.mk @@ -12,7 +12,8 @@ SONIC_ALL += $(DOCKER_SYNCD_MLNX) \ $(DOCKER_LLDP_SV2) \ $(DOCKER_SNMP_SV2) \ $(DOCKER_TEAM) \ - $(DOCKER_PLATFORM_MONITOR) + $(DOCKER_PLATFORM_MONITOR) \ + $(DOCKER_DHCP_RELAY) # Inject mlnx sai into sairedis $(LIBSAIREDIS)_DEPENDS += $(MLNX_SAI) From 48d6962cd188a73f394cdecafafffa0ee47cf1c0 Mon Sep 17 00:00:00 2001 From: Manjot Brar Date: Wed, 7 Dec 2016 10:32:19 -0800 Subject: [PATCH 3/5] adding docker-dhcp-relay to build --- rules/docker-dhcp-relay.mk | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 rules/docker-dhcp-relay.mk diff --git a/rules/docker-dhcp-relay.mk b/rules/docker-dhcp-relay.mk new file mode 100644 index 000000000000..1c68e8468a30 --- /dev/null +++ b/rules/docker-dhcp-relay.mk @@ -0,0 +1,7 @@ +# docker dhcp relay image + +DOCKER_DHCP_RELAY = docker-dhcp-relay.gz +$(DOCKER_DHCP_RELAY)_PATH = $(DOCKERS_PATH)/docker-dhcp-relay +$(DOCKER_DHCP_RELAY)_LOAD_DOCKERS = $(DOCKER_BASE) + +SONIC_SIMPLE_DOCKER_IMAGES += $(DOCKER_DHCP_RELAY) From f14c7df2f351aa31bd235487d865b533ea66894b Mon Sep 17 00:00:00 2001 From: Manjot Brar Date: Wed, 7 Dec 2016 10:43:09 -0800 Subject: [PATCH 4/5] adding dhcp relay docker for default mellanox build --- platform/mellanox/rules.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/mellanox/rules.mk b/platform/mellanox/rules.mk index debf4a4606da..efd271909fcc 100644 --- a/platform/mellanox/rules.mk +++ b/platform/mellanox/rules.mk @@ -16,6 +16,7 @@ SONIC_ALL += $(DOCKER_SYNCD_MLNX) \ $(DOCKER_SNMP_SV2) \ $(DOCKER_TEAMD) \ $(DOCKER_PLATFORM_MONITOR) \ + $(DOCKER_DHCP_RELAY) debs/$(MLNX_HW_MANAGEMENT) \ debs/$(SX_KERNEL) From d97c8d2954ed17218eaee8fd9d2df0e032f7cd35 Mon Sep 17 00:00:00 2001 From: Manjot Brar Date: Thu, 12 Jan 2017 16:28:52 -0800 Subject: [PATCH 5/5] Fix missing line continue --- platform/mellanox/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/mellanox/rules.mk b/platform/mellanox/rules.mk index efd271909fcc..3c35a4e7c890 100644 --- a/platform/mellanox/rules.mk +++ b/platform/mellanox/rules.mk @@ -16,7 +16,7 @@ SONIC_ALL += $(DOCKER_SYNCD_MLNX) \ $(DOCKER_SNMP_SV2) \ $(DOCKER_TEAMD) \ $(DOCKER_PLATFORM_MONITOR) \ - $(DOCKER_DHCP_RELAY) + $(DOCKER_DHCP_RELAY) \ debs/$(MLNX_HW_MANAGEMENT) \ debs/$(SX_KERNEL)