From 2cd5208ab682860e7dd44479d52851a946eeddd9 Mon Sep 17 00:00:00 2001 From: Jipan Yang Date: Wed, 13 Feb 2019 14:12:59 -0800 Subject: [PATCH 1/3] Fix INSTALL_DEBUG_TOOLS build config option Signed-off-by: Jipan Yang --- rules/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/config b/rules/config index f672bd3722d4..d585dbe65a79 100644 --- a/rules/config +++ b/rules/config @@ -44,9 +44,9 @@ DEFAULT_PASSWORD = YourPaSsWoRd # by default for TOR switch # ENABLE_PFCWD_ON_START = y -# SONIC_INSTALL_DEBUG_TOOLS - installs debugging tools in baseline docker +# INSTALL_DEBUG_TOOLS - installs debugging tools in baseline docker # Uncomment next line to enable: -# SONIC_INSTALL_DEBUG_TOOLS = y +# INSTALL_DEBUG_TOOLS = y # SONIC_ROUTING_STACK - specify the routing-stack being elected to drive SONiC's control-plane. # Supported routing stacks on SONiC are: From 9a3b42864f10204cb1efe0b5060dcaae97feef66 Mon Sep 17 00:00:00 2001 From: Jipan Yang Date: Wed, 13 Feb 2019 17:51:53 -0800 Subject: [PATCH 2/3] Remove unnecessary SONIC_ Make variables Signed-off-by: Jipan Yang --- Makefile.work | 6 +++--- slave.mk | 18 +----------------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/Makefile.work b/Makefile.work index ced70c176848..1d7994db2fbd 100644 --- a/Makefile.work +++ b/Makefile.work @@ -109,9 +109,9 @@ SONIC_BUILD_INSTRUCTION := make \ BUILD_TIMESTAMP=$(BUILD_TIMESTAMP) \ ENABLE_DHCP_GRAPH_SERVICE=$(ENABLE_DHCP_GRAPH_SERVICE) \ SHUTDOWN_BGP_ON_START=$(SHUTDOWN_BGP_ON_START) \ - SONIC_ENABLE_PFCWD_ON_START=$(ENABLE_PFCWD_ON_START) \ - SONIC_ENABLE_SYNCD_RPC=$(ENABLE_SYNCD_RPC) \ - SONIC_INSTALL_DEBUG_TOOLS=$(INSTALL_DEBUG_TOOLS) \ + ENABLE_PFCWD_ON_START=$(ENABLE_PFCWD_ON_START) \ + ENABLE_SYNCD_RPC=$(ENABLE_SYNCD_RPC) \ + INSTALL_DEBUG_TOOLS=$(INSTALL_DEBUG_TOOLS) \ PASSWORD=$(PASSWORD) \ USERNAME=$(USERNAME) \ SONIC_BUILD_JOBS=$(SONIC_BUILD_JOBS) \ diff --git a/slave.mk b/slave.mk index f1fa937c7f73..aa4337459c7d 100644 --- a/slave.mk +++ b/slave.mk @@ -73,22 +73,6 @@ list : ## Include other rules ############################################################################### -ifeq ($(SONIC_ENABLE_PFCWD_ON_START),y) -ENABLE_PFCWD_ON_START = y -endif - -ifeq ($(SONIC_ENABLE_SYSTEM_TELEMETRY),y) -ENABLE_SYSTEM_TELEMETRY = y -endif - -ifeq ($(SONIC_ENABLE_SYNCD_RPC),y) -ENABLE_SYNCD_RPC = y -endif - -ifeq ($(SONIC_INSTALL_DEBUG_TOOLS),y) -INSTALL_DEBUG_TOOLS = y -endif - include $(RULES_PATH)/config include $(RULES_PATH)/functions include $(RULES_PATH)/*.mk @@ -545,7 +529,7 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \ $(HEADER) # Pass initramfs and linux kernel explicitly. They are used for all platforms export debs_path="$(STRETCH_DEBS_PATH)" - export python_debs_path="$(PYTHON_DEBS_PATH)" + export python_debs_path="$(PYTHON_DEBS_PATH)" export initramfs_tools="$(STRETCH_DEBS_PATH)/$(INITRAMFS_TOOLS)" export linux_kernel="$(STRTCH_DEBS_PATH)/$(LINUX_KERNEL)" export onie_recovery_image="$(FILES_PATH)/$(ONIE_RECOVERY_IMAGE)" From d06325ac7bae4082194fe08543c7f2fde2d1124c Mon Sep 17 00:00:00 2001 From: Jipan Yang Date: Tue, 19 Feb 2019 10:28:16 -0800 Subject: [PATCH 3/3] Revert "Remove unnecessary SONIC_ Make variables" This reverts commit 9a3b42864f10204cb1efe0b5060dcaae97feef66. --- Makefile.work | 6 +++--- slave.mk | 18 +++++++++++++++++- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Makefile.work b/Makefile.work index 1d7994db2fbd..ced70c176848 100644 --- a/Makefile.work +++ b/Makefile.work @@ -109,9 +109,9 @@ SONIC_BUILD_INSTRUCTION := make \ BUILD_TIMESTAMP=$(BUILD_TIMESTAMP) \ ENABLE_DHCP_GRAPH_SERVICE=$(ENABLE_DHCP_GRAPH_SERVICE) \ SHUTDOWN_BGP_ON_START=$(SHUTDOWN_BGP_ON_START) \ - ENABLE_PFCWD_ON_START=$(ENABLE_PFCWD_ON_START) \ - ENABLE_SYNCD_RPC=$(ENABLE_SYNCD_RPC) \ - INSTALL_DEBUG_TOOLS=$(INSTALL_DEBUG_TOOLS) \ + SONIC_ENABLE_PFCWD_ON_START=$(ENABLE_PFCWD_ON_START) \ + SONIC_ENABLE_SYNCD_RPC=$(ENABLE_SYNCD_RPC) \ + SONIC_INSTALL_DEBUG_TOOLS=$(INSTALL_DEBUG_TOOLS) \ PASSWORD=$(PASSWORD) \ USERNAME=$(USERNAME) \ SONIC_BUILD_JOBS=$(SONIC_BUILD_JOBS) \ diff --git a/slave.mk b/slave.mk index aa4337459c7d..f1fa937c7f73 100644 --- a/slave.mk +++ b/slave.mk @@ -73,6 +73,22 @@ list : ## Include other rules ############################################################################### +ifeq ($(SONIC_ENABLE_PFCWD_ON_START),y) +ENABLE_PFCWD_ON_START = y +endif + +ifeq ($(SONIC_ENABLE_SYSTEM_TELEMETRY),y) +ENABLE_SYSTEM_TELEMETRY = y +endif + +ifeq ($(SONIC_ENABLE_SYNCD_RPC),y) +ENABLE_SYNCD_RPC = y +endif + +ifeq ($(SONIC_INSTALL_DEBUG_TOOLS),y) +INSTALL_DEBUG_TOOLS = y +endif + include $(RULES_PATH)/config include $(RULES_PATH)/functions include $(RULES_PATH)/*.mk @@ -529,7 +545,7 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \ $(HEADER) # Pass initramfs and linux kernel explicitly. They are used for all platforms export debs_path="$(STRETCH_DEBS_PATH)" - export python_debs_path="$(PYTHON_DEBS_PATH)" + export python_debs_path="$(PYTHON_DEBS_PATH)" export initramfs_tools="$(STRETCH_DEBS_PATH)/$(INITRAMFS_TOOLS)" export linux_kernel="$(STRTCH_DEBS_PATH)/$(LINUX_KERNEL)" export onie_recovery_image="$(FILES_PATH)/$(ONIE_RECOVERY_IMAGE)"