merge with master

.gitignore

@@ -8,6 +8,7 @@ fs.*
 target/
 *.deb
 *.changes
+*.buildinfo
 
 # Subdirectories in src
 src/hiredis/*

.gitmodules

@@ -4,6 +4,7 @@
 [submodule "sonic-linux-kernel"]
 	path = src/sonic-linux-kernel
 	url = https://github.com/Azure/sonic-linux-kernel
+	branch = stretch
 [submodule "sonic-sairedis"]
 	path = src/sonic-sairedis
 	url = https://github.com/Azure/sonic-sairedis
@@ -35,30 +36,15 @@
 [submodule "src/sonic-utilities"]
 	path = src/sonic-utilities
 	url = https://github.com/Azure/sonic-utilities
-[submodule "platform/broadcom/sonic-platform-modules-s6000"]
-	path = platform/broadcom/sonic-platform-modules-s6000
-	url = https://github.com/Azure/sonic-platform-modules-s6000
 [submodule "platform/broadcom/sonic-platform-modules-arista"]
 	path = platform/broadcom/sonic-platform-modules-arista
 	url = https://github.com/aristanetworks/sonic
-[submodule "platform/broadcom/sonic-platform-modules-dell"]
-	path = platform/broadcom/sonic-platform-modules-dell
-	url = https://github.com/Azure/sonic-platform-modules-dell
-[submodule "platform/broadcom/sonic-platform-modules-ingrasys"]
-	path = platform/broadcom/sonic-platform-modules-ingrasys
-	url = https://github.com/Ingrasys-sonic/sonic-platform-modules-ingrasys
 [submodule "src/sonic-platform-common"]
 	path = src/sonic-platform-common
 	url = https://github.com/Azure/sonic-platform-common
 [submodule "src/sonic-platform-daemons"]
 	path = src/sonic-platform-daemons
 	url = https://github.com/Azure/sonic-platform-daemons
-[submodule "platform/broadcom/sonic-platform-modules-accton"]
-	path = platform/broadcom/sonic-platform-modules-accton
-	url = https://github.com/edge-core/sonic-platform-modules-accton.git
-[submodule "platform/broadcom/sonic-platform-modules-cel"]
-	path = platform/broadcom/sonic-platform-modules-cel
-	url = https://github.com/celestica-Inc/sonic-platform-modules-cel.git
 [submodule "src/sonic-frr/frr"]
 	path = src/sonic-frr/frr
 	url = https://github.com/FRRouting/frr.git
@@ -71,12 +57,9 @@
 [submodule "platform/nephos/sonic-platform-modules-ingrasys"]
 	path = platform/nephos/sonic-platform-modules-ingrasys
 	url = https://github.com/Ingrasys-sonic/sonic-platform-modules-ingrasys-nephos.git
-[submodule "platform/broadcom/sonic-platform-modules-quanta"]
-	path = platform/broadcom/sonic-platform-modules-quanta
-	url = https://github.com/QuantaSwitchONIE/sonic-platform-modules-quanta.git
-[submodule "platform/broadcom/sonic-platform-modules-mitac"]
-	path = platform/broadcom/sonic-platform-modules-mitac
-	url = https://github.com/MiTAC-EBU/sonic-platform-modules-mitac.git
 [submodule "platform/barefoot/sonic-platform-modules-arista"]
 	path = platform/barefoot/sonic-platform-modules-arista
 	url = https://github.com/aristanetworks/sonic
+[submodule "platform/mellanox/hw-management/hw-mgmt"]
+	path = platform/mellanox/hw-management/hw-mgmt
+	url = https://github.com/Mellanox/hw-mgmt/

Makefile

@@ -1,131 +1,20 @@
-###############################################################################
-## Wrapper for starting make inside sonic-slave container
-#
-#  Supported parameters:
-#
-#  * PLATFORM: Specific platform we wish to build images for.
-#  * BUILD_NUMBER: Desired version-number to pass to the building-system.
-#  * ENABLE_DHCP_GRAPH_SERVICE: Enables get-graph service to fetch minigraph files
-#    through http.
-#  * SHUTDOWN_BGP_ON_START: Sets admin-down state for all bgp peerings after restart.
-#  * ENABLE_PFCWD_ON_START: Enable PFC Watchdog (PFCWD) on server-facing ports
-#  * by default for TOR switch.
-#  * SONIC_ENABLE_SYNCD_RPC: Enables rpc-based syncd builds.
-#  * USERNAME: Desired username -- default at rules/config
-#  * PASSWORD: Desired password -- default at rules/config
-#  * KEEP_SLAVE_ON: Keeps slave container up after building-process concludes.
-#  * SOURCE_FOLDER: host path to be mount as /var/$(USER)/src, only effective when KEEP_SLAVE_ON=yes
-#  * SONIC_BUILD_JOBS: Specifying number of concurrent build job(s) to run
-#  * KERNEL_PROCURE_METHOD: Specifying method of obtaining kernel Debian package: download or build
-#
-###############################################################################
+# SONiC make file
 
-SHELL = /bin/bash
-
-USER := $(shell id -un)
-PWD := $(shell pwd)
-
-# Remove lock file in case previous run was forcefully stopped
-$(shell rm -f .screen)
-
-MAKEFLAGS += -B
-
-SLAVE_BASE_TAG = $(shell sha1sum sonic-slave/Dockerfile | awk '{print substr($$1,0,11);}')
-SLAVE_TAG = $(shell cat sonic-slave/Dockerfile.user sonic-slave/Dockerfile | sha1sum | awk '{print substr($$1,0,11);}')
-SLAVE_BASE_IMAGE = sonic-slave-base
-SLAVE_IMAGE = sonic-slave-$(USER)
-
-DOCKER_RUN := docker run --rm=true --privileged \
-    -v $(PWD):/sonic \
-    -w /sonic \
-    -e "http_proxy=$(http_proxy)" \
-    -e "https_proxy=$(https_proxy)" \
-    -i$(if $(TERM),t,)
-
-DOCKER_BASE_BUILD = docker build --no-cache \
-		    -t $(SLAVE_BASE_IMAGE) \
-		    --build-arg http_proxy=$(http_proxy) \
-		    --build-arg https_proxy=$(https_proxy) \
-		    sonic-slave && \
-		    docker tag $(SLAVE_BASE_IMAGE):latest $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG)
-
-DOCKER_BUILD = docker build --no-cache \
-	       --build-arg user=$(USER) \
-	       --build-arg uid=$(shell id -u) \
-	       --build-arg guid=$(shell id -g) \
-	       --build-arg hostname=$(shell echo $$HOSTNAME) \
-	       -t $(SLAVE_IMAGE) \
-	       -f sonic-slave/Dockerfile.user \
-	       sonic-slave && \
-	       docker tag $(SLAVE_IMAGE):latest $(SLAVE_IMAGE):$(SLAVE_TAG)
-
-SONIC_BUILD_INSTRUCTION :=  make \
-                           -f slave.mk \
-                           PLATFORM=$(PLATFORM) \
-                           BUILD_NUMBER=$(BUILD_NUMBER) \
-                           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) \
-                           ENABLE_SYNCD_RPC=$(ENABLE_SYNCD_RPC) \
-                           PASSWORD=$(PASSWORD) \
-                           USERNAME=$(USERNAME) \
-                           SONIC_BUILD_JOBS=$(SONIC_BUILD_JOBS) \
-                           KERNEL_PROCURE_METHOD=$(KERNEL_PROCURE_METHOD) \
-                           HTTP_PROXY=$(http_proxy) \
-                           HTTPS_PROXY=$(https_proxy) \
-                           SONIC_ENABLE_SYSTEM_TELEMETRY=$(ENABLE_SYSTEM_TELEMETRY)
-
-.PHONY: sonic-slave-build sonic-slave-bash init reset
-
-.DEFAULT_GOAL :=  all
+NOSTRETCH ?= 0
 
 %::
-	@docker inspect --type image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) &> /dev/null || \
-	    { echo Image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) not found. Building... ; \
-	    $(DOCKER_BASE_BUILD) ; }
-	@docker inspect --type image $(SLAVE_IMAGE):$(SLAVE_TAG) &> /dev/null || \
-	    { echo Image $(SLAVE_IMAGE):$(SLAVE_TAG) not found. Building... ; \
-	    $(DOCKER_BUILD) ; }
-ifeq "$(KEEP_SLAVE_ON)" "yes"
-    ifdef SOURCE_FOLDER
-		@$(DOCKER_RUN) -v $(SOURCE_FOLDER):/var/$(USER)/src $(SLAVE_IMAGE):$(SLAVE_TAG) bash -c "$(SONIC_BUILD_INSTRUCTION) $@; /bin/bash"
-    else
-		@$(DOCKER_RUN) $(SLAVE_IMAGE):$(SLAVE_TAG) bash -c "$(SONIC_BUILD_INSTRUCTION) $@; /bin/bash"
-    endif
-else
-	@$(DOCKER_RUN) $(SLAVE_IMAGE):$(SLAVE_TAG) $(SONIC_BUILD_INSTRUCTION) $@
+	@echo "+++ --- Making $@ --- +++"
+ifeq ($(NOSTRETCH), 0)
+	BLDENV=stretch make -f Makefile.work stretch
 endif
+	make -f Makefile.work $@
 
-sonic-slave-build :
-	$(DOCKER_BASE_BUILD)
-	$(DOCKER_BUILD)
-
-sonic-slave-bash :
-	@docker inspect --type image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) &> /dev/null || \
-	    { echo Image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) not found. Building... ; \
-	    $(DOCKER_BASE_BUILD) ; }
-	@docker inspect --type image $(SLAVE_IMAGE):$(SLAVE_TAG) &> /dev/null || \
-	    { echo Image $(SLAVE_IMAGE):$(SLAVE_TAG) not found. Building... ; \
-	    $(DOCKER_BUILD) ; }
-	@$(DOCKER_RUN) -t $(SLAVE_IMAGE):$(SLAVE_TAG) bash
-
-showtag:
-	@echo $(SLAVE_IMAGE):$(SLAVE_TAG)
-	@echo $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG)
-
-init :
-	@git submodule update --init --recursive
-	@git submodule foreach --recursive '[ -f .git ] && echo "gitdir: $$(realpath --relative-to=. $$(cut -d" " -f2 .git))" > .git'
+stretch:
+	@echo "+++ Making $@ +++"
+ifeq ($(NOSTRETCH), 0)
+	BLDENV=stretch make -f Makefile.work stretch
+endif
 
-reset :
-	@echo && echo -n "Warning! All local changes will be lost. Proceed? [y/N]: "
-	@read ans && \
-	 if [ $$ans == y ]; then \
-	     git clean -xfdf; \
-	     git reset --hard; \
-	     git submodule foreach --recursive git clean -xfdf; \
-	     git submodule foreach --recursive git reset --hard; \
-	     git submodule update --init --recursive;\
-	 else \
-	     echo "Reset aborted"; \
-	 fi
+clean reset init configure showtag sonic-slave-build sonic-slave-bash :
+	@echo "+++ Making $@ +++"
+	make -f Makefile.work $@

Makefile.work

@@ -0,0 +1,147 @@
+###############################################################################
+## Wrapper for starting make inside sonic-slave container
+#
+#  Supported parameters:
+#
+#  * PLATFORM: Specific platform we wish to build images for.
+#  * BUILD_NUMBER: Desired version-number to pass to the building-system.
+#  * ENABLE_DHCP_GRAPH_SERVICE: Enables get-graph service to fetch minigraph files
+#    through http.
+#  * SHUTDOWN_BGP_ON_START: Sets admin-down state for all bgp peerings after restart.
+#  * ENABLE_PFCWD_ON_START: Enable PFC Watchdog (PFCWD) on server-facing ports
+#  * by default for TOR switch.
+#  * SONIC_ENABLE_SYNCD_RPC: Enables rpc-based syncd builds.
+#  * USERNAME: Desired username -- default at rules/config
+#  * PASSWORD: Desired password -- default at rules/config
+#  * KEEP_SLAVE_ON: Keeps slave container up after building-process concludes.
+#  * SOURCE_FOLDER: host path to be mount as /var/$(USER)/src, only effective when KEEP_SLAVE_ON=yes
+#  * SONIC_BUILD_JOBS: Specifying number of concurrent build job(s) to run
+#  * KERNEL_PROCURE_METHOD: Specifying method of obtaining kernel Debian package: download or build
+#
+###############################################################################
+
+SHELL = /bin/bash
+
+USER := $(shell id -un)
+PWD := $(shell pwd)
+
+ifeq ($(USER), root)
+$(error Add your user account to docker group and use your user account to make. root or sudo are not supported!)
+endif
+
+# Remove lock file in case previous run was forcefully stopped
+$(shell rm -f .screen)
+
+MAKEFLAGS += -B
+
+ifeq ($(BLDENV), stretch)
+SLAVE_BASE_TAG = $(shell sha1sum sonic-slave-stretch/Dockerfile | awk '{print substr($$1,0,11);}')
+SLAVE_TAG = $(shell cat sonic-slave-stretch/Dockerfile.user sonic-slave-stretch/Dockerfile | sha1sum | awk '{print substr($$1,0,11);}')
+SLAVE_BASE_IMAGE = sonic-slave-stretch-base
+SLAVE_IMAGE = sonic-slave-stretch-$(USER)
+SLAVE_DIR = sonic-slave-stretch
+else
+SLAVE_BASE_TAG = $(shell sha1sum sonic-slave/Dockerfile | awk '{print substr($$1,0,11);}')
+SLAVE_TAG = $(shell cat sonic-slave/Dockerfile.user sonic-slave/Dockerfile | sha1sum | awk '{print substr($$1,0,11);}')
+SLAVE_BASE_IMAGE = sonic-slave-base
+SLAVE_IMAGE = sonic-slave-$(USER)
+SLAVE_DIR = sonic-slave
+endif
+
+INSMOD_OVERLAY := sudo modprobe overlay
+DOCKER_RUN := docker run --rm=true --privileged \
+    -v $(PWD):/sonic \
+    -w /sonic \
+    -e "http_proxy=$(http_proxy)" \
+    -e "https_proxy=$(https_proxy)" \
+    -i$(if $(TERM),t,)
+
+DOCKER_BASE_BUILD = docker build --no-cache \
+		    -t $(SLAVE_BASE_IMAGE) \
+		    --build-arg http_proxy=$(http_proxy) \
+		    --build-arg https_proxy=$(https_proxy) \
+		    $(SLAVE_DIR) && \
+		    docker tag $(SLAVE_BASE_IMAGE):latest $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG)
+
+DOCKER_BUILD = docker build --no-cache \
+	       --build-arg user=$(USER) \
+	       --build-arg uid=$(shell id -u) \
+	       --build-arg guid=$(shell id -g) \
+	       --build-arg hostname=$(shell echo $$HOSTNAME) \
+	       -t $(SLAVE_IMAGE) \
+	       -f $(SLAVE_DIR)/Dockerfile.user \
+	       $(SLAVE_DIR) && \
+	       docker tag $(SLAVE_IMAGE):latest $(SLAVE_IMAGE):$(SLAVE_TAG)
+
+SONIC_BUILD_INSTRUCTION :=  make \
+                           -f slave.mk \
+                           PLATFORM=$(PLATFORM) \
+                           BUILD_NUMBER=$(BUILD_NUMBER) \
+                           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) \
+                           ENABLE_SYNCD_RPC=$(ENABLE_SYNCD_RPC) \
+                           PASSWORD=$(PASSWORD) \
+                           USERNAME=$(USERNAME) \
+                           SONIC_BUILD_JOBS=$(SONIC_BUILD_JOBS) \
+                           KERNEL_PROCURE_METHOD=$(KERNEL_PROCURE_METHOD) \
+                           HTTP_PROXY=$(http_proxy) \
+                           HTTPS_PROXY=$(https_proxy) \
+                           SONIC_ENABLE_SYSTEM_TELEMETRY=$(ENABLE_SYSTEM_TELEMETRY)
+
+.PHONY: sonic-slave-build sonic-slave-bash init reset
+
+.DEFAULT_GOAL :=  all
+
+%::
+	@docker inspect --type image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) &> /dev/null || \
+	    { echo Image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) not found. Building... ; \
+	    $(DOCKER_BASE_BUILD) ; }
+	@docker inspect --type image $(SLAVE_IMAGE):$(SLAVE_TAG) &> /dev/null || \
+	    { echo Image $(SLAVE_IMAGE):$(SLAVE_TAG) not found. Building... ; \
+	    $(DOCKER_BUILD) ; }
+	@$(INSMOD_OVERLAY)
+ifeq "$(KEEP_SLAVE_ON)" "yes"
+    ifdef SOURCE_FOLDER
+		@$(DOCKER_RUN) -v $(SOURCE_FOLDER):/var/$(USER)/src $(SLAVE_IMAGE):$(SLAVE_TAG) bash -c "$(SONIC_BUILD_INSTRUCTION) $@; /bin/bash"
+    else
+		@$(DOCKER_RUN) $(SLAVE_IMAGE):$(SLAVE_TAG) bash -c "$(SONIC_BUILD_INSTRUCTION) $@; /bin/bash"
+    endif
+else
+	@$(DOCKER_RUN) $(SLAVE_IMAGE):$(SLAVE_TAG) $(SONIC_BUILD_INSTRUCTION) $@
+endif
+
+sonic-slave-build :
+	$(DOCKER_BASE_BUILD)
+	$(DOCKER_BUILD)
+
+sonic-slave-bash :
+	@docker inspect --type image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) &> /dev/null || \
+	    { echo Image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) not found. Building... ; \
+	    $(DOCKER_BASE_BUILD) ; }
+	@docker inspect --type image $(SLAVE_IMAGE):$(SLAVE_TAG) &> /dev/null || \
+	    { echo Image $(SLAVE_IMAGE):$(SLAVE_TAG) not found. Building... ; \
+	    $(DOCKER_BUILD) ; }
+	@$(INSMOD_OVERLAY)
+	@$(DOCKER_RUN) -t $(SLAVE_IMAGE):$(SLAVE_TAG) bash
+
+showtag:
+	@echo $(SLAVE_IMAGE):$(SLAVE_TAG)
+	@echo $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG)
+
+init :
+	@git submodule update --init --recursive
+	@git submodule foreach --recursive '[ -f .git ] && echo "gitdir: $$(realpath --relative-to=. $$(cut -d" " -f2 .git))" > .git'
+
+reset :
+	@echo && echo -n "Warning! All local changes will be lost. Proceed? [y/N]: "
+	@read ans && \
+	 if [ $$ans == y ]; then \
+	     git clean -xfdf; \
+	     git reset --hard; \
+	     git submodule foreach --recursive git clean -xfdf; \
+	     git submodule foreach --recursive git reset --hard; \
+	     git submodule update --init --recursive;\
+	 else \
+	     echo "Reset aborted"; \
+	 fi

README.md

@@ -58,7 +58,11 @@ To build SONiC installer image and docker images, run the following commands:
     # Execute make configure once to configure ASIC
     make configure PLATFORM=[ASIC_VENDOR]
 
-    make
+    # build debian stretch required targets (optional)
+    BLDENV=stretch make stretch
+
+    # build SONiC image
+    make all
 
  **NOTE**:
 
@@ -80,11 +84,13 @@ The SONiC installer contains all docker images needed. SONiC uses one image for
 For Broadcom ASIC, we build ONIE and EOS image. EOS image is used for Arista devices, ONIE image is used for all other Broadcom ASIC based devices. 
 
     make configure PLATFORM=broadcom
+    # build debian stretch required targets
+    BLDENV=stretch make stretch
     # build ONIE image
     make target/sonic-broadcom.bin
     # build EOS image
     make target/sonic-aboot-broadcom.swi
- 
+
 You may find the rules/config file useful. It contains configuration options for the build process, like adding more verbosity or showing dependencies, username and password for base image etc.
 
 Every docker image is built and saved to target/ directory.