Skip to content

Revert "Fix the sonic build issue" #1671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jleveque merged 12 commits into from
May 2, 2018
Merged

Revert "Fix the sonic build issue" #1671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
473e6e5
Revert "[dockers] Prevent apt-get from installing suggested and recom…
jleveque May 2, 2018
79957e0
Revert "[broadcom]: update broadcom SAI to 3.1.3.4-11 (#1670)"
jleveque May 2, 2018
63cb464
Revert "[snmp]: Stop spamming logs with statfs permission denied log …
jleveque May 2, 2018
6f36c7a
Revert "[swss]: Change the hash seed to 0 for ToR and 10 for Leaf rou…
jleveque May 2, 2018
ebd6044
Revert "[zebra.conf] Fix template issue with multiple lo addresses (#…
jleveque May 2, 2018
d79ad4d
Revert "Revert "Remove snmpd hw_fsys module, remove disk monitoring w…
jleveque May 2, 2018
a087ece
Revert "[swss]: update swss submodule (#1664)"
jleveque May 2, 2018
412b1bc
Revert "Remove snmpd hw_fsys module, remove disk monitoring which are…
jleveque May 2, 2018
aeca0e9
Revert "Quagga: Use bgp keepalive and holdtime timers from configdb (…
jleveque May 2, 2018
6dc013a
Revert "Decrease usable space in log partition to 90% (#1648)"
jleveque May 2, 2018
7fe18b3
Revert "[minigraph.py] Fix an issue that mirror table might be consid…
jleveque May 2, 2018
1cefe27
Revert "[docker-dhcp]: Fix the sonic build issue (#1659)"
jleveque May 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rules/docker-dhcp-relay.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

DOCKER_DHCP_RELAY = docker-dhcp-relay.gz
$(DOCKER_DHCP_RELAY)_PATH = $(DOCKERS_PATH)/docker-dhcp-relay
$(DOCKER_DHCP_RELAY)_DEPENDS += $(ISC_DHCP_COMMON) $(ISC_DHCP_RELAY) $(ISC_DHCP_CLIENT)
$(DOCKER_DHCP_RELAY)_DEPENDS += $(ISC_DHCP_COMMON) $(ISC_DHCP_RELAY)
$(DOCKER_DHCP_RELAY)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE)
SONIC_DOCKER_IMAGES += $(DOCKER_DHCP_RELAY)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_DHCP_RELAY)
Expand Down
6 changes: 1 addition & 5 deletions rules/isc-dhcp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,5 @@ ISC_DHCP_COMMON = isc-dhcp-common_$(ISC_DHCP_VERSION)_amd64.deb
$(ISC_DHCP_COMMON)_SRC_PATH = $(SRC_PATH)/isc-dhcp
SONIC_MAKE_DEBS += $(ISC_DHCP_COMMON)

ISC_DHCP_CLIENT = isc-dhcp-client_$(ISC_DHCP_VERSION)_amd64.deb
$(ISC_DHCP_CLIENT)_SRC_PATH = $(SRC_PATH)/isc-dhcp
SONIC_MAKE_DEBS += $(ISC_DHCP_CLIENT)

ISC_DHCP_RELAY = isc-dhcp-relay_$(ISC_DHCP_VERSION)_amd64.deb
$(eval $(call add_derived_package,$(ISC_DHCP_COMMON),$(ISC_DHCP_RELAY),$(ISC_DHCP_CLIENT)))
$(eval $(call add_derived_package,$(ISC_DHCP_COMMON),$(ISC_DHCP_RELAY)))
3 changes: 1 addition & 2 deletions src/isc-dhcp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ SHELL = /bin/bash
.SHELLFLAGS += -e

MAIN_TARGET = isc-dhcp-common_$(ISC_DHCP_VERSION)_amd64.deb
DERIVED_TARGETS = isc-dhcp-relay_$(ISC_DHCP_VERSION)_amd64.deb \
isc-dhcp-client_$(ISC_DHCP_VERSION)_amd64.deb
DERIVED_TARGETS = isc-dhcp-relay_$(ISC_DHCP_VERSION)_amd64.deb

$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
# Remove any stale files
Expand Down