Merge Azure/sonic-buildimage

.gitignore

@@ -8,43 +8,91 @@ fs.*
 target/
 *.deb
 *.changes
+*.buildinfo
+*.tar
+*.xz
+*.gz
+*-dbg
+*dbg.j2
+*.img
 
 # Subdirectories in src
+src/bash/*
+!src/bash/Makefile
+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/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/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/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
 dockers/docker-base/Dockerfile
+dockers/docker-base-stretch/Dockerfile
 dockers/docker-config-engine/Dockerfile
+dockers/docker-config-engine-stretch/Dockerfile
 dockers/docker-database/Dockerfile
 dockers/docker-dhcp-relay/Dockerfile
 dockers/docker-fpm-frr/Dockerfile
@@ -58,6 +106,7 @@ dockers/docker-snmp-sv2/Dockerfile
 dockers/docker-teamd/Dockerfile
 dockers/docker-sonic-mgmt/Dockerfile
 dockers/docker-sonic-telemetry/Dockerfile
+platform/*/docker-saiserver-*/Dockerfile
 platform/*/docker-syncd-*/Dockerfile
 platform/*/docker-syncd-*-rpc/Dockerfile
 platform/vs/docker-sonic-vs/Dockerfile
@@ -69,3 +118,10 @@ installer/x86_64/platforms/
 src/sonic-config-engine/**/*.pyc
 src/sonic-config-engine/build
 src/sonic-config-engine/sonic_config_engine.egg-info
+src/sonic-daemon-base/**/*.pyc
+src/sonic-daemon-base/build
+src/sonic-daemon-base/sonic_daemon_base.egg-info
+
+# Misc. files
+files/initramfs-tools/arista-convertfs
+files/initramfs-tools/union-mount

.gitmodules

@@ -35,45 +35,34 @@
 [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
+	url = https://github.com/Azure/sonic-frr.git
+	branch = frr/7.0
 [submodule "platform/p4/p4-hlir/p4-hlir-v1.1"]
 	path = platform/p4/p4-hlir/p4-hlir-v1.1
 	url = https://github.com/p4lang/p4-hlir.git
 [submodule "platform/p4/SAI-P4-BM"]
 	path = platform/p4/SAI-P4-BM
 	url = https://github.com/Mellanox/SAI-P4-BM.git
-[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/
+[submodule "src/redis-dump-load"]
+	path = src/redis-dump-load
+	url = https://github.com/p/redis-dump-load.git
+[submodule "platform/mellanox/mlnx-sai/SAI-Implementation"]
+	path = platform/mellanox/mlnx-sai/SAI-Implementation
+	url = https://github.com/Mellanox/SAI-Implementation

Makefile

@@ -1,125 +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_JOB: Specifying number of concurrent build job(s) to run
-#
-###############################################################################
+# 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) \
-                           HTTP_PROXY=$(http_proxy) \
-                           HTTPS_PROXY=$(https_proxy) \
-                           ENABLE_SYSTEM_TELEMETRY=$(ENABLE_SYSTEM_TELEMETRY)
-
-.PHONY: sonic-slave-build sonic-slave-bash init reset
-
-.DEFAULT_GOAL :=  all
+NOJESSIE ?= 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 ($(NOJESSIE), 0)
+	EXTRA_JESSIE_TARGETS=$(notdir $@) make -f Makefile.work jessie
 endif
+	BLDENV=stretch 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
-
-init :
-	@git submodule update --init --recursive
-	@git submodule foreach --recursive '[ -f .git ] && echo "gitdir: $$(realpath --relative-to=. $$(cut -d" " -f2 .git))" > .git'
+jessie:
+	@echo "+++ Making $@ +++"
+ifeq ($(NOJESSIE), 0)
+	make -f Makefile.work jessie
+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 $@ +++"
+	BLDENV=stretch make -f Makefile.work $@