Modified SKU based utils to Platform based utils

.github/PULL_REQUEST_TEMPLATE.md

@@ -10,7 +10,7 @@ If this is a bug fix, make sure your description includes "fixes #xxxx", or
 Please provide the following information:
 -->
 
-**- What I did**
+**- Why I did it**
 
 **- How I did it**
 

.gitignore

@@ -20,94 +20,6 @@ target/
 *dbg.j2
 *.img
 
-# Subdirectories in src
-src/bash/*
-!src/bash/Makefile
-src/dhcpmon/debian/*
-!src/dhcpmon/debian/changelog 
-!src/dhcpmon/debian/compat 
-!src/dhcpmon/debian/control
-!src/dhcpmon/debian/rules 
-src/ixgbe/*
-!src/ixgbe/Makefile
-src/isc-dhcp/*
-!src/isc-dhcp/Makefile
-!src/isc-dhcp/patch
-src/socat/*
-!src/socat/Makefile
-!src/socat/*.patch
-src/tacacs/*
-src/tacacs/nsm/*
-src/tacacs/pam/*
-!src/tacacs/nsm/Makefile
-!src/tacacs/nsm/*.patch
-!src/tacacs/pam/Makefile
-!src/tacacs/pam/*.patch
-src/hiredis/*
-!src/hiredis/Makefile
-src/igb/*
-!src/igb/Makefile
-src/initramfs-tools/*
-!src/initramfs-tools/Makefile
-src/iproute2/*
-!src/iproute2/Makefile
-src/isc-dhcp/*
-!src/isc-dhcp/Makefile
-!src/isc-dhcp/patch/
-src/libnl3/*
-!src/libnl3/debian
-src/libnl3/debian/libnl-*/
-!src/libnl3/Makefile
-src/libteam/*
-!src/libteam/Makefile
-src/libyang/*
-!src/libyang/Makefile
-src/lldpd/*
-!src/lldpd/Makefile
-!src/lldpd/patch/
-src/lm-sensors/*
-!src/lm-sensors/Makefile
-src/monit/*
-!src/monit/Makefile
-!src/monit/patch/
-src/mpdecimal/*
-!src/mpdecimal/Makefile
-src/python-click/*
-!src/python-click/Makefile
-src/python3/*
-!src/python3/Makefile
-src/radvd/*
-!src/radvd/Makefile
-!src/radvd/patch/
-src/redis/*
-!src/redis/Makefile
-src/smartmontools/*
-!src/smartmontools/Makefile
-src/snmpd/*
-!src/snmpd/Makefile
-src/sonic-device-data/src/device/
-src/sonic-device-data/src/debian/
-src/supervisor/*
-!src/supervisor/Makefile
-!src/supervisor/patch/
-src/swig/*
-!src/swig/Makefile
-src/systemd-sonic-generator/systemd-sonic-generator
-src/systemd-sonic-generator/debian/*
-!src/systemd-sonic-generator/debian/changelog
-!src/systemd-sonic-generator/debian/compat
-!src/systemd-sonic-generator/debian/control
-!src/systemd-sonic-generator/debian/rules
-src/telemetry/debian/*
-!src/telemetry/debian/changelog
-!src/telemetry/debian/compat
-!src/telemetry/debian/control
-!src/telemetry/debian/rules
-!src/telemetry/debian/telemetry.init.d
-src/thrift/*
-!src/thrift/patch/
-!src/thrift/Makefile
-
 # Autogenerated Dockerfiles
 sonic-slave*/Dockerfile
 dockers/*/Dockerfile
@@ -125,6 +37,8 @@ src/sonic-daemon-base/build
 src/sonic-daemon-base/sonic_daemon_base.egg-info
 
 # Misc. files
+asic_config_checksum
+files/Aboot/boot0
 files/initramfs-tools/arista-convertfs
 files/initramfs-tools/union-mount
 

Makefile

@@ -1,23 +1,36 @@
 # SONiC make file
 
 NOJESSIE ?= 0
+NOSTRETCH ?= 0
 
 %::
 	@echo "+++ --- Making $@ --- +++"
 ifeq ($(NOJESSIE), 0)
-	EXTRA_JESSIE_TARGETS=$(notdir $@) make -f Makefile.work jessie
+	EXTRA_DOCKER_TARGETS=$(notdir $@) make -f Makefile.work jessie
 endif
-	BLDENV=stretch make -f Makefile.work $@
+ifeq ($(NOSTRETCH), 0)
+	EXTRA_DOCKER_TARGETS=$(notdir $@) BLDENV=stretch make -f Makefile.work stretch
+endif
+	BLDENV=buster make -f Makefile.work $@
 
 jessie:
 	@echo "+++ Making $@ +++"
 ifeq ($(NOJESSIE), 0)
 	make -f Makefile.work jessie
 endif
 
+stretch:
+	@echo "+++ Making $@ +++"
+ifeq ($(NOSTRETCH), 0)
+	make -f Makefile.work stretch
+endif
+
 clean reset init configure showtag sonic-slave-build sonic-slave-bash :
 	@echo "+++ Making $@ +++"
 ifeq ($(NOJESSIE), 0)
 	make -f Makefile.work $@
 endif
+ifeq ($(NOSTRETCH), 0)
 	BLDENV=stretch make -f Makefile.work $@
+endif
+	BLDENV=buster make -f Makefile.work $@

Makefile.cache

@@ -8,12 +8,12 @@
 #
 #   Email : kalimuthu.velappan@broadcom.com
 #           greg.paussa@broadcom.com
-#  
+#
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
 #   the Free Software Foundation; either version 2 of the License, or
 #   (at your option) any later version.
-#  
+#
 #   This program is distributed in the hope that it will be useful,
 #   but WITHOUT ANY WARRANTY; without even the implied warranty of
 #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -73,7 +73,8 @@ SONIC_COMMON_FLAGS_LIST :=  $(CONFIGURED_PLATFORM) \
 SONIC_COMMON_DPKG_LIST  :=  debian/control debian/changelog debian/rules \
                             debian/compat debian/install debian/copyright
 SONIC_COMMON_BASE_FILES_LIST  := sonic-slave-jessie/Dockerfile.j2 sonic-slave-jessie/Dockerfile.user \
-                                 sonic-slave-stretch/Dockerfile.j2 sonic-slave-stretch/Dockerfile.user
+                                 sonic-slave-stretch/Dockerfile.j2 sonic-slave-stretch/Dockerfile.user \
+                                 sonic-slave-buster/Dockerfile.j2 sonic-slave-buster/Dockerfile.user
 
 
 
@@ -105,7 +106,7 @@ MOD_CACHE_LOCK_TIMEOUT  := 3600
 SONIC_DPKG_LOCAL_CACHE_DIR=${TARGET_PATH}/cache
 $(shell test -d $(SONIC_DPKG_LOCAL_CACHE_DIR) || \
     mkdir -p $(SONIC_DPKG_LOCAL_CACHE_DIR) && chmod 777 $(SONIC_DPKG_LOCAL_CACHE_DIR) )
-$(shell test -w $(SONIC_DPKG_CACHE_DIR) || sudo chmod 777 $(SONIC_DPKG_CACHE_DIR) ) 
+$(shell test -w $(SONIC_DPKG_CACHE_DIR) || sudo chmod 777 $(SONIC_DPKG_CACHE_DIR) )
 
 DOCKER_LOCKFILE_SUFFIX  := access
 DOCKER_LOCKFILE_TIMEOUT := 1200
@@ -172,8 +173,14 @@ define GET_MOD_DEP_SHA
                             $(if $($(dfile)_MAIN_DEB),$($(dfile)_MAIN_DEB),$(dfile))) )
 
 	$(if $(MDEBUG), $(info $(1)_MOD_DEP_PKGS: $($(1)_MOD_DEP_PKGS)))
-	$(eval $(1)_DEP_MOD_SHA := $(shell git hash-object  \
-                            $(foreach dfile,$($(1)_MOD_DEP_PKGS), $($(dfile)_DEP_FLAGS_FILE) $($(dfile)_MOD_HASH_FILE) $($(dfile)_SMOD_HASH_FILE) ) \
+
+	# Warn if there is any missing dependency files
+	$(eval $(1)_DEP_MOD_SHA_FILES := $(foreach dfile,$($(1)_MOD_DEP_PKGS), \
+	                        $($(dfile)_DEP_FLAGS_FILE) $($(dfile)_MOD_HASH_FILE) $($(dfile)_SMOD_HASH_FILE)) )
+	$(eval $(1)_DEP_FILES_MISSING := $(filter-out $(wildcard $($(1)_DEP_MOD_SHA_FILES)),$($(1)_DEP_MOD_SHA_FILES)) )
+	$(if $($(1)_DEP_FILES_MISSING), $(warning "[ DPKG ] Dependecy file(s) are not found for $(1) : $($(1)_DEP_FILES_MISSING)))
+
+	$(eval $(1)_DEP_MOD_SHA := $(shell git hash-object  $($(1)_DEP_MOD_SHA_FILES) \
                             | sha1sum | awk '{print substr($$1,0,23);}'))
 endef
 
@@ -240,7 +247,7 @@ define LOAD_FROM_CACHE
 	# Update the cache_loaded variable
 	$(if $(and $(CACHE_FILE_SELECT),$(filter $(RCACHE_OPTIONS),$(SONIC_DPKG_CACHE_METHOD))),
 		$(if $(LOAD_DRV_DEB), $($(1)_CACHE_USER) tar -C $($(1)_BASE_PATH) -mxzvf $(CACHE_FILE_SELECT) 1>> $($(1)_DST_PATH)/$(1).log ,echo );
-		echo "File $(CACHE_FILE_SELECT) is loaded from cache" >> $($(1)_DST_PATH)/$(1).log
+		echo "File $(CACHE_FILE_SELECT) is loaded from cache into $($(1)_BASE_PATH)" >> $($(1)_DST_PATH)/$(1).log
 		$(eval $(1)_CACHE_LOADED := Yes)
 		$(shell touch $(CACHE_FILE_SELECT))
 		echo "[ CACHE::LOADED ] $($(1)_CACHE_DIR)/$($(1)_MOD_CACHE_FILE)" >> $($(1)_DST_PATH)/$(1).log
@@ -315,7 +322,7 @@ define SHOW_WHY
 		$(if $($(1)_PREREQ_PHONY),  PHONY PREREQUISITES: $($(1)_PREREQ_PHONY)))"  >> $($(1)_DST_PATH)/$(1).log
 
 	@echo "[ FLAGS  FILE    ] : [$($(1)_FILE_FLAGS)] " >> $($(1)_DST_PATH)/$(1).log
-	@echo "[ FLAGS  DEPENDS ] : [$($(1)_DEP_FLAGS)] " >> $($(1)_DST_PATH)/$(1).log
+	@echo "[ FLAGS  DEPENDS ] : [$($(1)_DEP_FLAGS_ALL)] " >> $($(1)_DST_PATH)/$(1).log
 	@echo "[ FLAGS  DIFF    ] : [$($(1)_FLAGS_DIFF)] " >> $($(1)_DST_PATH)/$(1).log
 	@echo "[ DEP    DEPENDS ] : [$($(1)_DEP_FILES_MODIFIED)] " >> $($(1)_DST_PATH)/$(1).log
 	@echo "[ SMDEP  DEPENDS ] : [$($(1)_SMDEP_FILES_MODIFIED)] " >> $($(1)_DST_PATH)/$(1).log
@@ -455,19 +462,21 @@ $(foreach pkg, $(SONIC_MAKE_DEBS) $(SONIC_DPKG_DEBS) $(SONIC_ONLINE_DEBS) $(SONI
 #  $(1)  => target name
 #  $(2)  => target destination folder path
 #  $(3)  => target file extension
+#  $(4)  => additional flags
 #
 #  It updates the _DEP_FLAGS variable if there is any change in the module flags.
 
 define FLAGS_DEP_RULES
 ALL_DEP_FILES_LIST += $(foreach pkg,$(2), $(if $(filter none,$($(1)_CACHE_MODE)),$(addsuffix .$(3),$(addprefix $(pkg)/, $(1)))))
 $(addsuffix .$(3),$(addprefix $(2)/, $(1))) :: $(2)/%.$(3) :
-	@$$(eval $$*_FILE_FLAGS := $$(shell test -f $$@ && cat $$@)) 
-	@echo '$$($$*_DEP_FLAGS)' | cmp -s - $$@ || echo '$$($$*_DEP_FLAGS)' > $$@
-	$$(eval $$*_FLAGS_DIFF := $$(filter-out $$($$*_FILE_FLAGS),$$($$*_DEP_FLAGS)) $$(filter-out $$($$*_DEP_FLAGS),$$($$*_FILE_FLAGS)))
+	@$$(eval $$*_FILE_FLAGS := $$(shell test -f $$@ && cat $$@))
+	@$$(eval $$*_DEP_FLAGS_ALL := $$(shell echo '$$($$*_DEP_FLAGS) $(4)' | sed -E 's/[ ]+/ /g' | sed -E 's/[ ]+$$$$//g'))
+	@echo '$$($$*_DEP_FLAGS_ALL)' | cmp -s - $$@ || echo '$$($$*_DEP_FLAGS_ALL)' > $$@
+	$$(eval $$*_FLAGS_DIFF := $$(filter-out $$($$*_FILE_FLAGS),$$($$*_DEP_FLAGS_ALL)) $$(filter-out $$($$*_DEP_FLAGS_ALL),$$($$*_FILE_FLAGS)))
 	@$$(if $$(MDEBUG), $$(info FLAGS: $$@, DEP:$$?))
 endef
-$(eval $(call FLAGS_DEP_RULES, $(SONIC_MAKE_DEBS) $(SONIC_DPKG_DEBS) $(SONIC_ONLINE_DEBS) $(SONIC_COPY_DEBS), $(DEBS_PATH),flags) )
-$(eval $(call FLAGS_DEP_RULES, $(SONIC_MAKE_FILES), $(FILES_PATH),flags))
+$(eval $(call FLAGS_DEP_RULES, $(SONIC_MAKE_DEBS) $(SONIC_DPKG_DEBS) $(SONIC_ONLINE_DEBS) $(SONIC_COPY_DEBS), $(DEBS_PATH),flags,$(BLDENV)) )
+$(eval $(call FLAGS_DEP_RULES, $(SONIC_MAKE_FILES), $(FILES_PATH),flags,$(BLDENV)))
 $(eval $(call FLAGS_DEP_RULES, $(SONIC_PYTHON_STDEB_DEBS), $(PYTHON_DEBS_PATH),flags))
 $(eval $(call FLAGS_DEP_RULES, $(SONIC_PYTHON_WHEELS), $(PYTHON_WHEELS_PATH),flags))
 $(eval $(call FLAGS_DEP_RULES, $(SONIC_DOCKER_IMAGES) $(SONIC_DOCKER_DBG_IMAGES), $(TARGET_PATH),flags))
@@ -571,7 +580,7 @@ SONIC_CACHE_CLEAN_DEBS = $(addsuffix -clean,$(addprefix $(DEBS_PATH)/, \
            $(SONIC_DPKG_DEBS) \
            $(SONIC_DERIVED_DEBS) \
            $(SONIC_EXTRA_DEBS)))
-$(SONIC_CACHE_CLEAN_DEBS) :: $(DEBS_PATH)/%-clean : .platform $$(addsuffix -clean,$$(addprefix $(DEBS_PATH)/,$$($$*_MAIN_DEB))) 
+$(SONIC_CACHE_CLEAN_DEBS) :: $(DEBS_PATH)/%-clean : .platform $$(addsuffix -clean,$$(addprefix $(DEBS_PATH)/,$$($$*_MAIN_DEB)))
 	@rm -f $($*_DEP_FLAGS_FILE) $($*_MOD_HASH_FILE) $($*_SMOD_HASH_FILE) \
         $($*_MOD_DEP_FILE) $($*_SMOD_DEP_FILE)
 
@@ -581,7 +590,7 @@ SONIC_CACHE_CLEAN_FILES = $(addsuffix -clean,$(addprefix $(FILES_PATH)/, \
            $(SONIC_ONLINE_FILES) \
            $(SONIC_COPY_FILES) \
            $(SONIC_MAKE_FILES)))
-$(SONIC_CACHE_CLEAN_FILES) :: $(FILES_PATH)/%-clean : .platform 
+$(SONIC_CACHE_CLEAN_FILES) :: $(FILES_PATH)/%-clean : .platform
 	@rm -f $($*_DEP_FLAGS_FILE) $($*_MOD_HASH_FILE) $($*_SMOD_HASH_FILE) \
         $($*_MOD_DEP_FILE) $($*_SMOD_DEP_FILE)
 
@@ -592,31 +601,31 @@ SONIC_CACHE_CLEAN_TARGETS = $(addsuffix -clean,$(addprefix $(TARGET_PATH)/, \
                $(SONIC_DOCKER_DBG_IMAGES) \
                $(SONIC_SIMPLE_DOCKER_IMAGES) \
                $(SONIC_INSTALLERS)))
-$(SONIC_CACHE_CLEAN_TARGETS) :: $(TARGET_PATH)/%-clean : .platform 
+$(SONIC_CACHE_CLEAN_TARGETS) :: $(TARGET_PATH)/%-clean : .platform
 	@rm -f $($*_DEP_FLAGS_FILE) $($*_MOD_HASH_FILE) $($*_SMOD_HASH_FILE) \
         $($*_MOD_DEP_FILE) $($*_SMOD_DEP_FILE)
 
 
 # Clean all the DEP and SHA files for all the PYTHON DEBS target
 SONIC_CACHE_CLEAN_STDEB_DEBS = $(addsuffix -clean,$(addprefix $(PYTHON_DEBS_PATH)/, \
              $(SONIC_PYTHON_STDEB_DEBS)))
-$(SONIC_CACHE_CLEAN_STDEB_DEBS) :: $(PYTHON_DEBS_PATH)/%-clean : .platform 
+$(SONIC_CACHE_CLEAN_STDEB_DEBS) :: $(PYTHON_DEBS_PATH)/%-clean : .platform
 	@rm -f $($*_DEP_FLAGS_FILE) $($*_MOD_HASH_FILE) $($*_SMOD_HASH_FILE) \
         $($*_MOD_DEP_FILE) $($*_SMOD_DEP_FILE)
 
 
 # Clean all the DEP and SHA files for all the PYTHON WHEELS target
 SONIC_CACHE_CLEAN_WHEELS = $(addsuffix -clean,$(addprefix $(PYTHON_WHEELS_PATH)/, \
              $(SONIC_PYTHON_WHEELS)))
-$(SONIC_CACHE_CLEAN_WHEELS) :: $(PYTHON_WHEELS_PATH)/%-clean : .platform 
+$(SONIC_CACHE_CLEAN_WHEELS) :: $(PYTHON_WHEELS_PATH)/%-clean : .platform
 	@rm -f $($*_DEP_FLAGS_FILE) $($*_MOD_HASH_FILE) $($*_SMOD_HASH_FILE) \
         $($*_MOD_DEP_FILE) $($*_SMOD_DEP_FILE)
 
 .PHONY: cclean
 cclean:: $(SONIC_CACHE_CLEAN_DEBS) $(SONIC_CACHE_CLEAN_FILES) $(SONIC_CACHE_CLEAN_TARGETS) \
         $(SONIC_CACHE_CLEAN_STDEB_DEBS) $(SONIC_CACHE_CLEAN_WHEELS)
 
-.PHONY: clean 
+.PHONY: clean
 clean:: cclean
 
 # Clear all the local cache contents
@@ -653,7 +662,7 @@ show-%:
              )\
          )\
       )
-	$(info ) 
+	$(info )