Merge pull request #4405 from lguohan/buster

[baseimage]: upgrade base image to debian buster bring up the base image to debian buster 4.19 kernel. using the merge commits to preserve the individual commits to better track the history.
2020-04-20 15:32:17 -07:00 · 2020-04-20 15:32:17 -07:00 · 46fad0e0c6
commit 46fad0e0c6
parent 7b53ae3b07 0095763780
165 changed files with 1116 additions and 375 deletions
--- a/17
+++ b/17
@ -1,13 +1,17 @@
 # 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 $@ +++"
@ -15,9 +19,18 @@ 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 $@
--- a/Makefile.cache
+++ b/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
@ -246,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
@ -321,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
@ -461,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))
@ -577,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)

@ -587,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)

@ -598,7 +601,7 @@ 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)

@ -606,7 +609,7 @@ $(SONIC_CACHE_CLEAN_TARGETS) :: $(TARGET_PATH)/%-clean : .platform
 # 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)

@ -614,7 +617,7 @@ $(SONIC_CACHE_CLEAN_STDEB_DEBS) :: $(PYTHON_DEBS_PATH)/%-clean : .platform
 # 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)

@ -622,7 +625,7 @@ $(SONIC_CACHE_CLEAN_WHEELS) :: $(PYTHON_WHEELS_PATH)/%-clean : .platform
 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
@ -659,7 +662,7 @@ show-%:
             )\
         )\
      )
-	$(info ) 
+	$(info )



--- a/Makefile.work
+++ b/Makefile.work
@ -76,11 +76,14 @@ ifeq ($(PLATFORM_ARCH),)
 	override PLATFORM_ARCH = $(CONFIGURED_ARCH)
 endif

-ifeq ($(BLDENV), stretch)
+ifeq ($(BLDENV), buster)
+SLAVE_DIR = sonic-slave-buster
+else ifeq ($(BLDENV), stretch)
 SLAVE_DIR = sonic-slave-stretch
 else
 SLAVE_DIR = sonic-slave-jessie
 endif
+
 SLAVE_BASE_TAG = $(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) j2 $(SLAVE_DIR)/Dockerfile.j2 > $(SLAVE_DIR)/Dockerfile && sha1sum $(SLAVE_DIR)/Dockerfile | awk '{print substr($$1,0,11);}')
 SLAVE_TAG = $(shell cat $(SLAVE_DIR)/Dockerfile.user $(SLAVE_DIR)/Dockerfile | sha1sum | awk '{print substr($$1,0,11);}')
 SLAVE_BASE_IMAGE = $(SLAVE_DIR)
@ -197,7 +200,7 @@ SONIC_BUILD_INSTRUCTION :=  make \
                           HTTPS_PROXY=$(https_proxy) \
                           SONIC_ENABLE_SYSTEM_TELEMETRY=$(ENABLE_SYSTEM_TELEMETRY) \
                           SONIC_ENABLE_RESTAPI=$(ENABLE_RESTAPI) \
-                           EXTRA_JESSIE_TARGETS=$(EXTRA_JESSIE_TARGETS) \
+                           EXTRA_DOCKER_TARGETS=$(EXTRA_DOCKER_TARGETS) \
                           BUILD_LOG_TIMESTAMP=$(BUILD_LOG_TIMESTAMP) \
                           $(SONIC_OVERRIDE_BUILD_VARS)

--- a/build_debian.sh
+++ b/build_debian.sh
@ -35,9 +35,9 @@ if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
    # Version name differs between ARCH, copying same version as in sonic-slave docker
    DOCKER_VERSION=18.06.3~ce~3-0~debian
 else
-    DOCKER_VERSION=5:18.09.8~3-0~debian-stretch
+    DOCKER_VERSION=5:18.09.8~3-0~debian-$IMAGE_DISTRO
 fi
-LINUX_KERNEL_VERSION=4.9.0-11-2
+LINUX_KERNEL_VERSION=4.19.0-6

 ## Working directory to prepare the file system
 FILESYSTEM_ROOT=./fsroot
@ -81,9 +81,9 @@ if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
    # qemu arm bin executable for cross-building
    sudo mkdir -p $FILESYSTEM_ROOT/usr/bin
    sudo cp /usr/bin/qemu*static $FILESYSTEM_ROOT/usr/bin || true
-    sudo http_proxy=$http_proxy debootstrap --variant=minbase --arch $CONFIGURED_ARCH stretch $FILESYSTEM_ROOT http://deb.debian.org/debian
+    sudo http_proxy=$http_proxy debootstrap --variant=minbase --arch $CONFIGURED_ARCH $IMAGE_DISTRO $FILESYSTEM_ROOT http://deb.debian.org/debian
 else
-    sudo http_proxy=$http_proxy debootstrap --variant=minbase --arch $CONFIGURED_ARCH stretch $FILESYSTEM_ROOT http://debian-archive.trafficmanager.net/debian
+    sudo http_proxy=$http_proxy debootstrap --variant=minbase --arch $CONFIGURED_ARCH $IMAGE_DISTRO $FILESYSTEM_ROOT http://debian-archive.trafficmanager.net/debian
 fi

 ## Config hostname and hosts, otherwise 'sudo ...' will complain 'sudo: unable to resolve host ...'
@ -98,12 +98,12 @@ sudo LANG=C chroot $FILESYSTEM_ROOT /bin/bash -c 'echo "sysfs /sys sysfs default
 ## Setup proxy
 [ -n "$http_proxy" ] && sudo /bin/bash -c "echo 'Acquire::http::Proxy \"$http_proxy\";' > $FILESYSTEM_ROOT/etc/apt/apt.conf.d/01proxy"

+trap_push 'sudo LANG=C chroot $FILESYSTEM_ROOT umount /proc || true'
+sudo LANG=C chroot $FILESYSTEM_ROOT mount proc /proc -t proc
 ## Note: mounting is necessary to makedev and install linux image
 echo '[INFO] Mount all'
 ## Output all the mounted device for troubleshooting
-mount
-trap_push 'sudo umount $FILESYSTEM_ROOT/proc || true'
-sudo LANG=C chroot $FILESYSTEM_ROOT mount proc /proc -t proc
+sudo LANG=C chroot $FILESYSTEM_ROOT mount

 ## Pointing apt to public apt mirrors and getting latest packages, needed for latest security updates
 sudo cp files/apt/sources.list.$CONFIGURED_ARCH $FILESYSTEM_ROOT/etc/apt/sources.list
@ -129,7 +129,7 @@ fi
 ## 2. mount supports squashfs
 ## However, 'dpkg -i' plus 'apt-get install -f' will ignore the recommended dependency. So
 ## we install busybox explicitly
-sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install busybox
+sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install busybox linux-base
 echo '[INFO] Install SONiC linux kernel image'
 ## Note: duplicate apt-get command to ensure every line return zero
 sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/initramfs-tools-core_*.deb || \
@ -184,11 +184,6 @@ if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
    cat files/initramfs-tools/modules.arm | sudo tee -a $FILESYSTEM_ROOT/etc/initramfs-tools/modules > /dev/null
 fi

-if [[ $CONFIGURED_ARCH == amd64 ]]; then
-    ## Install latest intel ixgbe driver
-    sudo cp $files_path/ixgbe.ko $FILESYSTEM_ROOT/lib/modules/${LINUX_KERNEL_VERSION}-amd64/kernel/drivers/net/ethernet/intel/ixgbe/ixgbe.ko
-fi
-
 ## Install docker
 echo '[INFO] Install docker'
 ## Install apparmor utils since they're missing and apparmor is enabled in the kernel
@ -203,9 +198,9 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -o /tmp/docker
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-key add /tmp/docker.gpg
 sudo LANG=C chroot $FILESYSTEM_ROOT rm /tmp/docker.gpg
 sudo LANG=C chroot $FILESYSTEM_ROOT add-apt-repository \
-                                    "deb [arch=$CONFIGURED_ARCH] https://download.docker.com/linux/debian stretch stable"
+                                    "deb [arch=$CONFIGURED_ARCH] https://download.docker.com/linux/debian $IMAGE_DISTRO stable"
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get update
-sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSION}
+sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSION} docker-ce-cli=${DOCKER_VERSION}
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y remove software-properties-common gnupg2

 if [ "$INSTALL_KUBERNETES" == "y" ]
@ -298,14 +293,16 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
    makedumpfile            \
    conntrack               \
    python-pip              \
-    python3-pip
+    python3-pip             \
+    cron                    \
+    haveged


 if [[ $CONFIGURED_ARCH == amd64 ]]; then
 ## Pre-install the fundamental packages for amd64 (x86)
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install      \
    flashrom                \
-    mcelog
+    rasdaemon
 fi

 ## Set /etc/shadow permissions to -rw-------.
@ -325,9 +322,9 @@ sudo sed -i '/^#.* en_US.* /s/^#//' $FILESYSTEM_ROOT/etc/locale.gen && \
 sudo LANG=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT update-locale "LANG=en_US.UTF-8"
 sudo LANG=C chroot $FILESYSTEM_ROOT bash -c "find /usr/share/i18n/locales/ ! -name 'en_US' -type f -exec rm -f {} +"

-# Install certain fundamental packages from stretch-backports in order to get
+# Install certain fundamental packages from $IMAGE_DISTRO-backports in order to get
 # more up-to-date (but potentially less stable) versions
-sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y -t stretch-backports install \
+sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y -t $IMAGE_DISTRO-backports install \
    picocom

 if [[ $CONFIGURED_ARCH == amd64 ]]; then
@ -369,6 +366,12 @@ EOF
 sudo sed -i 's/^ListenAddress ::/#ListenAddress ::/' $FILESYSTEM_ROOT/etc/ssh/sshd_config
 sudo sed -i 's/^#ListenAddress 0.0.0.0/ListenAddress 0.0.0.0/' $FILESYSTEM_ROOT/etc/ssh/sshd_config

+## Config rsyslog
+sudo augtool -r $FILESYSTEM_ROOT --autosave "
+rm /files/lib/systemd/system/rsyslog.service/Service/ExecStart/arguments
+set /files/lib/systemd/system/rsyslog.service/Service/ExecStart/arguments/1 -n
+"
+
 ## Config sysctl
 sudo mkdir -p $FILESYSTEM_ROOT/var/core
 sudo augtool --autosave "
@ -425,14 +428,8 @@ set /files/etc/sysctl.conf/net.core.somaxconn 512

 " -r $FILESYSTEM_ROOT

-if [[ $CONFIGURED_ARCH == amd64 ]]; then
-    # Configure mcelog to log machine checks to syslog
-    sudo sed -i 's/^#syslog = yes/syslog = yes/' $FILESYSTEM_ROOT/etc/mcelog/mcelog.conf
-fi
-
-## docker-py is needed by Ansible docker module
-sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT easy_install pip
-sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install 'docker-py==1.6.0'
+## docker Python API package is needed by Ansible docker module
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install 'docker==4.1.0'
 ## Note: keep pip installed for maintainance purpose

 ## Get gcc and python dev pkgs
@ -460,6 +457,10 @@ if [ -f files/image_config/ntp/ntp ]; then
    sudo cp ./files/image_config/ntp/ntp $FILESYSTEM_ROOT/etc/init.d/
 fi

+if [ -f files/image_config/ntp/ntp-systemd-wrapper ]; then
+    sudo cp ./files/image_config/ntp/ntp-systemd-wrapper $FILESYSTEM_ROOT/usr/lib/ntp/
+fi
+
 ## Version file
 sudo mkdir -p $FILESYSTEM_ROOT/etc/sonic
 sudo tee $FILESYSTEM_ROOT/etc/sonic/sonic_version.yml > /dev/null <<EOF
@ -497,8 +498,12 @@ if [ "${enable_organization_extensions}" = "y" ]; then
 fi

 ## Setup ebtable rules (rule file is in binary format)
-sudo sed -i 's/EBTABLES_LOAD_ON_START="no"/EBTABLES_LOAD_ON_START="yes"/g' ${FILESYSTEM_ROOT}/etc/default/ebtables
+sudo cp -f files/image_config/ebtables/ebtables.default $FILESYSTEM_ROOT/etc/default/ebtables
+sudo cp -f files/image_config/ebtables/ebtables.init $FILESYSTEM_ROOT/etc/init.d/ebtables
+sudo cp -f files/image_config/ebtables/ebtables.service $FILESYSTEM_ROOT/lib/systemd/system/ebtables.service
 sudo cp files/image_config/ebtables/ebtables.filter ${FILESYSTEM_ROOT}/etc
+sudo LANG=C chroot $FILESYSTEM_ROOT update-alternatives --set ebtables /usr/sbin/ebtables-legacy
+sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable ebtables.service

 ## Debug Image specific changes
 ## Update motd for debug image
@ -559,7 +564,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT fuser -vm /proc
 sudo LANG=C chroot $FILESYSTEM_ROOT fuser -km /proc || true
 ## Wait fuser fully kill the processes
 sleep 15
-sudo umount $FILESYSTEM_ROOT/proc || true
+sudo LANG=C chroot $FILESYSTEM_ROOT umount /proc || true

 if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
    # Remove qemu arm bin executable used for cross-building
--- a/build_image.sh
+++ b/build_image.sh
@ -67,8 +67,11 @@ elif [ "$IMAGE_TYPE" = "raw" ]; then
    echo "Creating SONiC raw partition : $OUTPUT_RAW_IMAGE of size $RAW_IMAGE_DISK_SIZE MB"
    fallocate -l "$RAW_IMAGE_DISK_SIZE"M $OUTPUT_RAW_IMAGE

+    # ensure proc is mounted
+    sudo mount proc /proc -t proc || true
+
    ## Generate a partition dump that can be used to 'dd' in-lieu of using the onie-nos-installer
-    ## Run the installer 
+    ## Run the installer
    ## The 'build' install mode of the installer is used to generate this dump.
    sudo chmod a+x $OUTPUT_ONIE_IMAGE
    sudo ./$OUTPUT_ONIE_IMAGE
--- a/files/Aboot/boot0.j2
+++ b/files/Aboot/boot0.j2
@ -321,10 +321,14 @@ platform_specific() {
        echo "iommu=on intel_iommu=on" >>/tmp/append
        read_system_eeprom
    fi
-    if in_array "$platform" "crow" "woodpecker" "magpie"; then
+    if in_array "$platform" "crow" "magpie"; then
        echo "amd_iommu=off modprobe.blacklist=snd_hda_intel,hdaudio" >> /tmp/append
        read_system_eeprom
    fi
+    if in_array "$platform" "woodpecker"; then
+        echo "modprobe.blacklist=snd_hda_intel,hdaudio" >> /tmp/append
+        read_system_eeprom
+    fi

    if [ $flash_size -ge 28000 ]; then
        varlog_size=4096
--- a/files/apt/sources.list.amd64
+++ b/files/apt/sources.list.amd64
@ -1,8 +1,8 @@
 ## Debian mirror on Microsoft Azure
 ## Ref: http://debian-archive.trafficmanager.net/

-deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ stretch main contrib non-free
-deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian/ stretch main contrib non-free
-deb [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ stretch/updates main contrib non-free
-deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ stretch/updates main contrib non-free
-deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ stretch-backports main contrib non-free
+deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ buster main contrib non-free
+deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian/ buster main contrib non-free
+deb [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ buster/updates main contrib non-free
+deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ buster/updates main contrib non-free
+deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ buster-backports main contrib non-free
--- a/files/apt/sources.list.arm64
+++ b/files/apt/sources.list.arm64
@ -1,8 +1,8 @@
 ## Debian mirror for ARM
 ## Not the repo mirror site can change in future, and needs to be updated to be in sync

-deb [arch=arm64] http://deb.debian.org/debian stretch main contrib non-free
-deb-src [arch=arm64] http://deb.debian.org/debian stretch main contrib non-free
-deb [arch=arm64] http://deb.debian.org/debian stretch-updates main contrib non-free
-deb-src [arch=arm64] http://deb.debian.org/debian stretch-updates main contrib non-free
-deb [arch=arm64] http://ftp.debian.org/debian stretch-backports main
+deb [arch=arm64] http://deb.debian.org/debian buster main contrib non-free
+deb-src [arch=arm64] http://deb.debian.org/debian buster main contrib non-free
+deb [arch=arm64] http://deb.debian.org/debian buster-updates main contrib non-free
+deb-src [arch=arm64] http://deb.debian.org/debian buster-updates main contrib non-free
+deb [arch=arm64] http://ftp.debian.org/debian buster-backports main
--- a/files/apt/sources.list.armhf
+++ b/files/apt/sources.list.armhf
@ -1,8 +1,8 @@
 ## Debian mirror for ARM
 ## Not the repo mirror site can change in future, and needs to be updated to be in sync

-deb [arch=armhf] http://deb.debian.org/debian stretch main contrib non-free
-deb-src [arch=armhf] http://deb.debian.org/debian stretch main contrib non-free
-deb [arch=armhf] http://deb.debian.org/debian stretch-updates main contrib non-free
-deb-src [arch=armhf] http://deb.debian.org/debian stretch-updates main contrib non-free
-deb [arch=armhf] http://ftp.debian.org/debian stretch-backports main
+deb [arch=armhf] http://deb.debian.org/debian buster main contrib non-free
+deb-src [arch=armhf] http://deb.debian.org/debian buster main contrib non-free
+deb [arch=armhf] http://deb.debian.org/debian buster-updates main contrib non-free
+deb-src [arch=armhf] http://deb.debian.org/debian buster-updates main contrib non-free
+deb [arch=armhf] http://ftp.debian.org/debian buster-backports main
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@ -42,9 +42,9 @@ FILESYSTEM_ROOT_ETC_SONIC="$FILESYSTEM_ROOT_ETC/sonic"
 GENERATED_SERVICE_FILE="$FILESYSTEM_ROOT/etc/sonic/generated_services.conf"

 clean_sys() {
-    sudo umount $FILESYSTEM_ROOT/sys/fs/cgroup/*            \
-                $FILESYSTEM_ROOT/sys/fs/cgroup              \
-                $FILESYSTEM_ROOT/sys || true
+    sudo chroot $FILESYSTEM_ROOT umount /sys/fs/cgroup/*            \
+                                        /sys/fs/cgroup              \
+                                        /sys || true
 }
 trap_push clean_sys
 sudo LANG=C chroot $FILESYSTEM_ROOT mount sysfs /sys -t sysfs
@ -344,7 +344,14 @@ sudo chmod a+x $FILESYSTEM_ROOT/usr/sbin/policy-rc.d
 {% if installer_debs.strip() -%}
 {% for deb in installer_debs.strip().split(' ') -%}
 {% if sonic_asic_platform == "mellanox" %}
-sudo dpkg --extract {{deb}} $FILESYSTEM_ROOT
+if [ -e tmpdir ] ;
+then
+    rm -rf tmpdir;
+fi
+sudo mkdir tmpdir
+sudo dpkg --extract {{deb}} tmpdir
+for subdir in $(ls tmpdir) ; do sudo cp -R tmpdir/$subdir/* $FILESYSTEM_ROOT/$subdir; done
+sudo rm -rf tmpdir
 {% else %}
 sudo dpkg --root=$FILESYSTEM_ROOT -i {{deb}} || sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
 {% endif %}
@ -403,6 +410,11 @@ if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
 fi

 {% if installer_images.strip() -%}
+clean_proc() {
+    sudo umount /proc || true
+}
+trap_push clean_proc
+sudo mount proc /proc -t proc
 sudo mkdir $FILESYSTEM_ROOT/target
 sudo mount --bind target $FILESYSTEM_ROOT/target
 sudo chroot $FILESYSTEM_ROOT docker $SONIC_NATIVE_DOCKERD_FOR_DOCKERFS info
@ -431,6 +443,7 @@ echo "docker images pull complete"

 sudo umount $FILESYSTEM_ROOT/target
 sudo rm -r $FILESYSTEM_ROOT/target
+sudo umount /proc || true
 if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
    sudo umount $FILESYSTEM_ROOT/dockerfs
    sudo rm -fr $FILESYSTEM_ROOT/dockerfs
--- a/files/image_config/apt/sources.list.d/amd64/debian_archive_trafficmanager_net_debian.list
+++ b/files/image_config/apt/sources.list.d/amd64/debian_archive_trafficmanager_net_debian.list
@ -1,3 +1,3 @@
-deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ stretch main contrib non-free
-deb [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ stretch/updates main contrib non-free
-deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ stretch-backports main contrib non-free
+deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ buster main contrib non-free
+deb [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ buster/updates main contrib non-free
+deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ buster-backports main contrib non-free
--- a/files/image_config/apt/sources.list.d/amd64/packages_microsoft_com_repos_sonic_dev.list
+++ b/files/image_config/apt/sources.list.d/amd64/packages_microsoft_com_repos_sonic_dev.list
@ -1 +0,0 @@
-deb [arch=amd64] http://packages.microsoft.com/repos/sonic-dev/ jessie main
--- a/files/image_config/ebtables/ebtables.default
+++ b/files/image_config/ebtables/ebtables.default
@ -0,0 +1,35 @@
+# Unload modules on restart and stop
+#   Value: yes|no,  default: yes
+# This option has to be 'yes' to get to a sane state for a firewall
+# restart or stop. Only set to 'no' if there are problems unloading netfilter
+# modules.
+EBTABLES_MODULES_UNLOAD="yes"
+
+# Load firewall rules on system startup.
+#   Value: yes|no,  default: no
+# Restores the ebtables rulesets from the last saved state when the
+# system boots up.
+EBTABLES_LOAD_ON_START="yes"
+
+# Save current firewall rules on stop.
+#   Value: yes|no,  default: no
+# Saves all firewall rules if firewall gets stopped
+# (e.g. on system shutdown).
+EBTABLES_SAVE_ON_STOP="no"
+
+# Save current firewall rules on restart.
+#   Value: yes|no,  default: no
+# Saves all firewall rules if firewall gets restarted.
+EBTABLES_SAVE_ON_RESTART="no"
+
+# Save (and restore) rule counters.
+#   Value: yes|no,  default: no
+# Save rule counters when saving a kernel table to a file. If the
+# rule counters were saved, they will be restored when restoring the table.
+EBTABLES_SAVE_COUNTER="no"
+
+# Backup suffix for ruleset save files.
+#   Value: <string>,  default: "~"
+# Keep one backup level of saved rules.
+# Set this variable to the empty string to disable backups.
+EBTABLES_BACKUP_SUFFIX="~"
--- a/files/image_config/ebtables/ebtables.init
+++ b/files/image_config/ebtables/ebtables.init
@ -0,0 +1,175 @@
+#!/bin/bash
+#
+# init script for the Ethernet Bridge filter tables
+#
+# Written by Dag Wieers <dag@wieers.com>
+# Modified by Rok Papez <rok.papez@arnes.si>
+#	     Bart De Schuymer <bdschuym@pandora.be>
+# Adapted to Debian by Jan Christoph Nordholz <hesso@pool.math.tu-berlin.de>
+#
+# chkconfig: - 15 85
+# description: Ethernet Bridge filtering tables
+#
+### BEGIN INIT INFO
+# Provides:		ebtables
+# Required-Start:
+# Required-Stop:
+# Should-Start:		$local_fs
+# Should-Stop:		$local_fs
+# Default-Start:	S
+# Default-Stop:		0 1 6
+# Short-Description:	ebtables ruleset management
+# Description:		Saves and restores the state of the ebtables rulesets.
+### END INIT INFO
+
+. /lib/lsb/init-functions
+
+test -f /sbin/ebtables || exit 0
+
+EBTABLES_DUMPFILE_STEM=/etc/ebtables
+
+RETVAL=0
+prog="ebtables"
+desc="Ethernet bridge filtering"
+umask 0077
+
+#default configuration
+EBTABLES_MODULES_UNLOAD="yes"
+EBTABLES_LOAD_ON_START="no"
+EBTABLES_SAVE_ON_STOP="no"
+EBTABLES_SAVE_ON_RESTART="no"
+EBTABLES_SAVE_COUNTER="no"
+EBTABLES_BACKUP_SUFFIX="~"
+
+config=/etc/default/$prog
+[ -f "$config" ] && . "$config"
+
+function get_supported_tables() {
+	EBTABLES_SUPPORTED_TABLES=
+	/sbin/ebtables -t filter -L 2>&1 1>/dev/null | grep -q permission
+	if [ $? -eq 0 ]; then
+		log_failure_msg "Error: insufficient privileges to access the ebtables rulesets."
+		exit 1
+	fi
+	for table in filter nat broute; do
+		/sbin/ebtables -t $table -L &> /dev/null
+		if [ $? -eq 0 ]; then
+			EBTABLES_SUPPORTED_TABLES="${EBTABLES_SUPPORTED_TABLES} $table"
+		fi
+	done
+}
+
+function load() {
+	RETVAL=0
+	get_supported_tables
+	log_daemon_msg "Restoring ebtables rulesets"
+	for table in $EBTABLES_SUPPORTED_TABLES; do
+		log_progress_msg "$table"
+		if [ -s ${EBTABLES_DUMPFILE_STEM}.$table ]; then
+			/sbin/ebtables -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table --atomic-commit
+			RET=$?
+			if [ $RET -ne 0 ]; then
+				log_progress_msg "(failed)"
+				RETVAL=$RET
+			fi
+		else
+			log_progress_msg "(no saved state)"
+		fi
+	done
+	if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then
+		log_progress_msg "no kernel support"
+	else
+		log_progress_msg "done"
+	fi
+	log_end_msg $RETVAL
+}
+
+function clear() {
+	RETVAL=0
+	get_supported_tables
+	log_daemon_msg "Clearing ebtables rulesets"
+	for table in $EBTABLES_SUPPORTED_TABLES; do
+		log_progress_msg "$table"
+		/sbin/ebtables -t $table --init-table
+	done
+
+	if [ "$EBTABLES_MODULES_UNLOAD" = "yes" ]; then
+		for mod in $(grep -E '^(ebt|ebtable)_' /proc/modules | cut -d' ' -f1) ebtables; do
+			rmmod $mod 2> /dev/null
+		done
+	fi
+	if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then
+		log_progress_msg "no kernel support"
+	else
+		log_progress_msg "done"
+	fi
+	log_end_msg $RETVAL
+}
+
+function save() {
+	RETVAL=0
+	get_supported_tables
+	log_daemon_msg "Saving ebtables rulesets"
+	for table in $EBTABLES_SUPPORTED_TABLES; do
+		log_progress_msg "$table"
+		[ -n "$EBTABLES_BACKUP_SUFFIX" ] && [ -s ${EBTABLES_DUMPFILE_STEM}.$table ] && \
+		  mv ${EBTABLES_DUMPFILE_STEM}.$table ${EBTABLES_DUMPFILE_STEM}.$table$EBTABLES_BACKUP_SUFFIX
+		/sbin/ebtables -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table --atomic-save
+		RET=$?
+		if [ $RET -ne 0 ]; then
+			log_progress_msg "(failed)"
+			RETVAL=$RET
+		else
+			if [ "$EBTABLES_SAVE_COUNTER" = "no" ]; then
+				/sbin/ebtables -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table -Z
+			fi
+		fi
+	done
+	if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then
+		log_progress_msg "no kernel support"
+	else
+		log_progress_msg "done"
+	fi
+	log_end_msg $RETVAL
+}
+
+case "$1" in
+  start)
+	[ "$EBTABLES_LOAD_ON_START" = "yes" ] && load
+	;;
+  stop)
+	[ "$EBTABLES_SAVE_ON_STOP" = "yes" ] && save
+	clear
+	;;
+  restart|reload|force-reload)
+	[ "$EBTABLES_SAVE_ON_RESTART" = "yes" ] && save
+	clear
+	[ "$EBTABLES_LOAD_ON_START" = "yes" ] && load
+	;;
+  load)
+	load
+	;;
+  save)
+	save
+	;;
+  status)
+	get_supported_tables
+	if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then
+		log_failure_msg "No kernel support for ebtables."
+		RETVAL=1
+	else
+		log_daemon_msg "Ebtables support available, number of installed rules"
+		for table in $EBTABLES_SUPPORTED_TABLES; do
+			COUNT=$(( $(/sbin/ebtables -t $table -L | sed -e "/^Bridge chain/! d" -e "s/^.*entries: //" -e "s/,.*$/ +/") 0 ))
+			log_progress_msg "$table($COUNT)"
+		done
+		log_end_msg 0
+		RETVAL=0
+	fi
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart|reload|force-reload|load|save|status}" >&2
+	RETVAL=1
+esac
+
+exit $RETVAL
--- a/files/image_config/ebtables/ebtables.service
+++ b/files/image_config/ebtables/ebtables.service
@ -0,0 +1,19 @@
+[Unit]
+Description=ebtables ruleset management
+DefaultDependencies=no
+Before=network-pre.target
+Wants=network-pre.target
+After=local-fs.target
+# n.b. use below if we want to tear down rules before shutting down.
+#Before=shutdown.target
+#Conflicts=shutdown.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/etc/init.d/ebtables start
+ExecStop=/etc/init.d/ebtables stop
+ExecReload=/etc/init.d/ebtables reload
+
+[Install]
+WantedBy=multi-user.target
--- a/files/image_config/interfaces/interfaces.j2
+++ b/files/image_config/interfaces/interfaces.j2
@ -76,10 +76,6 @@ iface eth0 {{ 'inet' if prefix | ipv4 else 'inet6' }} static
    up ip {{ '-4' if prefix | ipv4 else '-6' }} route add default via {{ MGMT_INTERFACE[(name, prefix)]['gwaddr'] }} dev eth0 table {{ vrf_table }} metric 201
    up ip {{ '-4' if prefix | ipv4 else '-6' }} route add {{ prefix | network }}/{{ prefix | prefixlen }} dev eth0 table {{ vrf_table }}
    up ip {{ '-4' if prefix | ipv4 else '-6' }} rule add from {{ prefix | ip }}/{{ '32' if prefix | ipv4 else '128' }} table {{ vrf_table }}
-{% if (MGMT_VRF_CONFIG) and (MGMT_VRF_CONFIG['vrf_global']['mgmtVrfEnabled'] == "true") %}
-    up cgcreate -g l3mdev:mgmt
-    up cgset -r l3mdev.master-device=mgmt mgmt
-{% endif %}
 {% for route in MGMT_INTERFACE[(name, prefix)]['forced_mgmt_routes'] %}
    up ip rule add to {{ route }} table {{ vrf_table }}
 {% endfor %}
@ -87,9 +83,6 @@ iface eth0 {{ 'inet' if prefix | ipv4 else 'inet6' }} static
    pre-down ip {{ '-4' if prefix | ipv4 else '-6' }} route delete default via {{ MGMT_INTERFACE[(name, prefix)]['gwaddr'] }} dev eth0 table {{ vrf_table }}
    pre-down ip {{ '-4' if prefix | ipv4 else '-6' }} route delete {{ prefix | network }}/{{ prefix | prefixlen }} dev eth0 table {{ vrf_table }}
    pre-down ip {{ '-4' if prefix | ipv4 else '-6' }} rule delete from {{ prefix | ip }}/{{ '32' if prefix | ipv4 else '128' }} table {{ vrf_table }}
-{% if (MGMT_VRF_CONFIG) and (MGMT_VRF_CONFIG['vrf_global']['mgmtVrfEnabled'] == "true") %}
-    down cgdelete -g l3mdev:mgmt
-{% endif %}
 {% for route in MGMT_INTERFACE[(name, prefix)]['forced_mgmt_routes'] %}
    pre-down ip rule delete to {{ route }} table {{ vrf_table }}
 {% endfor %}
@ -100,9 +93,6 @@ iface eth0 inet dhcp
    metric 202
 {% if (MGMT_VRF_CONFIG) and (MGMT_VRF_CONFIG['vrf_global']['mgmtVrfEnabled'] == "true") %}
    vrf mgmt
-    up cgcreate -g l3mdev:mgmt
-    up cgset -r l3mdev.master-device=mgmt mgmt
-    down cgdelete -g l3mdev:mgmt
 {% endif %}
 iface eth0 inet6 dhcp
    up sysctl net.ipv6.conf.eth0.accept_ra=1
--- a/files/image_config/misc/docker-wait-any
+++ b/files/image_config/misc/docker-wait-any
@ -11,13 +11,13 @@
    stopped running. Here, we spawn multiple threads and wait on one
    container per thread. If any of the threads exit, the entire
    application will exit.
-    NOTE: This script is written against docker-py version 1.6.0. Newer
-    versions of docker-py have a different API.
+    NOTE: This script is written against docker Python package 4.1.0. Newer
+    versions of docker may have a different API.
 """

 import sys
 import threading
-from docker import Client
+from docker import APIClient

 # Instantiate a global event to share among our threads
 g_thread_exit_event = threading.Event()
@ -40,7 +40,7 @@ def wait_for_container(docker_client, container_name):
 def main():
    thread_list = []

-    docker_client = Client(base_url='unix://var/run/docker.sock')
+    docker_client = APIClient(base_url='unix://var/run/docker.sock')

    # Ensure we were passed at least one argument
    if len(sys.argv) < 2:
--- a/files/image_config/ntp/ntp-systemd-wrapper
+++ b/files/image_config/ntp/ntp-systemd-wrapper
@ -0,0 +1,38 @@
+#!/bin/sh
+
+# This file was originally created automatically as part of default NTP application installation from debian package.
+# This is now manually modified for supporting NTP in management VRF.
+# When management VRF is enabled, the NTP application should be started using "ip vrf exec mgmt".
+# Check has been added to verify the management VRF enabled status and use "ip vrf exec mgmt"  when it is enabled.
+# This file will be copied to /usr/lib/ntp/ntp-systemd-wrapper file that gets created during build process.
+
+DAEMON=/usr/sbin/ntpd
+PIDFILE=/var/run/ntpd.pid
+
+if [ -r /etc/default/ntp ]; then
+        . /etc/default/ntp
+fi
+
+if [ -e /run/ntp.conf.dhcp ]; then
+        NTPD_OPTS="$NTPD_OPTS -c /run/ntp.conf.dhcp"
+fi
+
+LOCKFILE=/run/lock/ntpdate
+
+RUNASUSER=ntp
+UGID=$(getent passwd $RUNASUSER | cut -f 3,4 -d:) || true
+if test "$(uname -s)" = "Linux"; then
+        NTPD_OPTS="$NTPD_OPTS -u $UGID"
+fi
+
+(
+        flock -w 180 9
+        vrfEnabled=$(/usr/local/bin/sonic-cfggen -d -v 'MGMT_VRF_CONFIG["vrf_global"]["mgmtVrfEnabled"]' 2> /dev/null)
+        if [ "$vrfEnabled" = "true" ]
+        then
+                ip vrf exec mgmt start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- -p $PIDFILE $NTPD_OPTS
+        else
+                start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- -p $PIDFILE $NTPD_OPTS
+        fi
+) 9>$LOCKFILE
+
--- a/files/initramfs-tools/arista-convertfs.j2
+++ b/files/initramfs-tools/arista-convertfs.j2
@ -224,7 +224,7 @@ cmd="wait_for_root_dev"
 run_cmd "$cmd" "$err_msg"

 err_msg="Error: formatting to ext4 failed"
-cmd="mke2fs -t ext4 -F -O '^huge_file,^metadata_csum' $root_dev"
+cmd="/usr/local/sbin/mke2fs -t ext4 -F -O '^huge_file,^metadata_csum' $root_dev"
 run_cmd "$cmd" "$err_msg"

 err_msg="Error: mounting $root_dev to $root_mnt failed"
--- a/files/initramfs-tools/mke2fs
+++ b/files/initramfs-tools/mke2fs
@ -17,7 +17,7 @@ esac

 . /usr/share/initramfs-tools/hook-functions

-copy_exec /sbin/mke2fs
+copy_exec /usr/sbin/mke2fs /usr/local/sbin/
 copy_exec /sbin/sfdisk
 copy_exec /sbin/fdisk
 copy_exec /sbin/resize2fs
@ -30,7 +30,7 @@ for type in $fstypes; do
    if [ -h "$prog" ]; then
        link=$(readlink -f "$prog")
        copy_exec "$link"
-        ln -s "$link" "${DESTDIR}/$prog"
+        ln -s "/usr/local/sbin/$(basename $link)" "${DESTDIR}/$prog"
    elif [ -x "$prog" ] ; then
        copy_exec "$prog"
    else
--- a/files/sshd/sshd.service
+++ b/files/sshd/sshd.service
@ -10,6 +10,8 @@ ExecStart=/usr/sbin/sshd -D $SSHD_OPTS
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 Restart=on-failure
+RuntimeDirectory=sshd
+RuntimeDirectoryMode=0755

 [Install]
 WantedBy=multi-user.target
--- a/installer/x86_64/install.sh
+++ b/installer/x86_64/install.sh
@ -609,12 +609,12 @@ menuentry '$demo_grub_entry' {
        if [ x$grub_platform = xxen ]; then insmod xzio; insmod lzopio; fi
        insmod part_msdos
        insmod ext2
-        linux   /$image_dir/boot/vmlinuz-4.9.0-11-2-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX  \
+        linux   /$image_dir/boot/vmlinuz-4.19.0-6-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX  \
                net.ifnames=0 biosdevname=0 \
                loop=$image_dir/$FILESYSTEM_SQUASHFS loopfstype=squashfs                       \
                apparmor=1 security=apparmor varlog_size=$VAR_LOG_SIZE usbcore.autosuspend=-1 $ONIE_PLATFORM_EXTRA_CMDLINE_LINUX
        echo    'Loading $demo_volume_label $demo_type initial ramdisk ...'
-        initrd  /$image_dir/boot/initrd.img-4.9.0-11-2-amd64
+        initrd  /$image_dir/boot/initrd.img-4.19.0-6-amd64
 }
 EOF

--- a/platform/barefoot/bfn-modules.mk
+++ b/platform/barefoot/bfn-modules.mk
@ -6,5 +6,3 @@ BFN_MODULE = bfn-modules_$(VERSION)_amd64.deb
 $(BFN_MODULE)_SRC_PATH = $(PLATFORM_PATH)/bfn-modules
 $(BFN_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
 SONIC_DPKG_DEBS += $(BFN_MODULE)
-
-SONIC_STRETCH_DEBS += $(BFN_MODULE)
--- a/platform/barefoot/bfn-modules/debian/control
+++ b/platform/barefoot/bfn-modules/debian/control
@ -7,6 +7,6 @@ Standards-Version: 3.9.3

 Package: bfn-modules
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for bfn asic for mmap

--- a/platform/barefoot/platform-modules-arista.mk
+++ b/platform/barefoot/platform-modules-arista.mk
@ -21,5 +21,3 @@ $(eval $(call add_extra_package,$(ARISTA_PLATFORM_MODULE),$(ARISTA_PLATFORM_MODU
 export ARISTA_PLATFORM_MODULE ARISTA_PLATFORM_MODULE_PYTHON2 ARISTA_PLATFORM_MODULE_PYTHON3 ARISTA_PLATFORM_MODULE_DRIVERS

 export ARISTA_SCD_DRIVER_CONFIG=m
-
-SONIC_STRETCH_DEBS += $(ARISTA_PLATFORM_MODULE)
--- a/platform/barefoot/platform-modules-bfn-montara.mk
+++ b/platform/barefoot/platform-modules-bfn-montara.mk
@ -9,5 +9,3 @@ $(BFN_MONTARA_PLATFORM_MODULE)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-module
 $(BFN_MONTARA_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
 $(BFN_MONTARA_PLATFORM_MODULE)_PLATFORM = x86_64-accton_wedge100bf_32x-r0
 SONIC_DPKG_DEBS += $(BFN_MONTARA_PLATFORM_MODULE)
-
-SONIC_STRETCH_DEBS += $(BFN_MONTARA_PLATFORM_MODULE)
--- a/platform/barefoot/platform-modules-bfn-newport.mk
+++ b/platform/barefoot/platform-modules-bfn-newport.mk
@ -9,5 +9,3 @@ $(BFN_NEWPORT_PLATFORM_MODULE)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-module
 $(BFN_NEWPORT_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
 $(BFN_NEWPORT_PLATFORM_MODULE)_PLATFORM = x86_64-accton_as9516bf_32d-r0
 SONIC_DPKG_DEBS += $(BFN_NEWPORT_PLATFORM_MODULE)
-
-SONIC_STRETCH_DEBS += $(BFN_NEWPORT_PLATFORM_MODULE)
--- a/platform/barefoot/platform-modules-bfn.mk
+++ b/platform/barefoot/platform-modules-bfn.mk
@ -10,4 +10,3 @@ $(BFN_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
 $(BFN_PLATFORM_MODULE)_PLATFORM = x86_64-accton_wedge100bf_65x-r0
 SONIC_DPKG_DEBS += $(BFN_PLATFORM_MODULE)

-SONIC_STRETCH_DEBS += $(BFN_PLATFORM_MODULE)
--- a/platform/barefoot/platform-modules-ingrasys.mk
+++ b/platform/barefoot/platform-modules-ingrasys.mk
@ -17,4 +17,3 @@ $(INGRASYS_S9280_64X_PLATFORM_MODULE)_PLATFORM = x86_64-ingrasys_s9280_64x-r0

 $(eval $(call add_extra_package,$(INGRASYS_S9180_32X_PLATFORM_MODULE),$(INGRASYS_S9280_64X_PLATFORM_MODULE)))

-SONIC_STRETCH_DEBS += $(INGRASYS_S9180_32X_PLATFORM_MODULE)
--- a/platform/barefoot/platform-modules-wnc-osw1800.mk
+++ b/platform/barefoot/platform-modules-wnc-osw1800.mk
@ -10,4 +10,3 @@ $(WNC_OSW1800_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMO
 $(WNC_OSW1800_PLATFORM_MODULE)_PLATFORM = x86_64-wnc_osw1800-r0
 SONIC_DPKG_DEBS += $(WNC_OSW1800_PLATFORM_MODULE)

-SONIC_STRETCH_DEBS += $(WNC_OSW1800_PLATFORM_MODULE)
--- a/platform/barefoot/sonic-platform-modules-arista
+++ b/platform/barefoot/sonic-platform-modules-arista
@ -1 +1 @@
-Subproject commit 39860a109853b2f37367dfe68905e019b509d5bf
+Subproject commit ab4e8e17e610e23d66b024fbf27bd83b41edf44c
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/debian/control
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/debian/control
@ -7,6 +7,6 @@ Standards-Version: 3.9.3

 Package: sonic-platform-modules-bfn-montara
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as fan, led, sfp

--- a/platform/barefoot/sonic-platform-modules-bfn-newport/debian/control
+++ b/platform/barefoot/sonic-platform-modules-bfn-newport/debian/control
@ -7,6 +7,6 @@ Standards-Version: 3.9.3

 Package: sonic-platform-modules-bfn-newport
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel module for bfn platform fpga and scripts for the devices such as fan, led, sfp

--- a/platform/barefoot/sonic-platform-modules-bfn/debian/control
+++ b/platform/barefoot/sonic-platform-modules-bfn/debian/control
@ -7,6 +7,6 @@ Standards-Version: 3.9.3

 Package: sonic-platform-modules-bfn
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as fan, led, sfp

--- a/platform/barefoot/sonic-platform-modules-wnc-osw1800/debian/control
+++ b/platform/barefoot/sonic-platform-modules-wnc-osw1800/debian/control
@ -7,6 +7,6 @@ Standards-Version: 3.9.3

 Package: platform-modules-wnc-osw1800
 Architecture: amd64
-Depends: linux-image-3.16.0-5-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as fan, led, sfp

--- a/platform/broadcom/platform-modules-accton.mk
+++ b/platform/broadcom/platform-modules-accton.mk
@ -111,5 +111,3 @@ $(eval $(call add_extra_package,$(ACCTON_AS7712_32X_PLATFORM_MODULE),$(ACCTON_AS
 ACCTON_AS7315_27XB_PLATFORM_MODULE = sonic-platform-accton-as7315-27xb_$(ACCTON_AS7315_27XB_PLATFORM_MODULE_VERSION)_amd64.deb
 $(ACCTON_AS7315_27XB_PLATFORM_MODULE)_PLATFORM = x86_64-accton_as7315_27xb-r0
 $(eval $(call add_extra_package,$(ACCTON_AS7712_32X_PLATFORM_MODULE),$(ACCTON_AS7315_27XB_PLATFORM_MODULE)))
-
-SONIC_STRETCH_DEBS += $(ACCTON_AS7712_32X_PLATFORM_MODULE)
--- a/platform/broadcom/platform-modules-alphanetworks.mk
+++ b/platform/broadcom/platform-modules-alphanetworks.mk
@ -16,6 +16,5 @@ ALPHANETWORKS_SNH60B0_640F_PLATFORM_MODULE = sonic-platform-alphanetworks-snh60b
 $(ALPHANETWORKS_SNH60B0_640F_PLATFORM_MODULE)_PLATFORM = x86_64-alphanetworks_snh60b0_640f-r0
 $(eval $(call add_extra_package,$(ALPHANETWORKS_SNH60A0_320FV2_PLATFORM_MODULE),$(ALPHANETWORKS_SNH60B0_640F_PLATFORM_MODULE)))

-SONIC_STRETCH_DEBS += $(ALPHANETWORKS_SNH60A0_320FV2_PLATFORM_MODULE)


--- a/platform/broadcom/platform-modules-arista.mk
+++ b/platform/broadcom/platform-modules-arista.mk
@ -22,4 +22,3 @@ export ARISTA_PLATFORM_MODULE ARISTA_PLATFORM_MODULE_PYTHON2 ARISTA_PLATFORM_MOD

 export ARISTA_SCD_DRIVER_CONFIG=m

-SONIC_STRETCH_DEBS += $(ARISTA_PLATFORM_MODULE)
--- a/platform/broadcom/platform-modules-brcm-xlr-gts.mk
+++ b/platform/broadcom/platform-modules-brcm-xlr-gts.mk
@ -12,4 +12,3 @@ SONIC_MAKE_DEBS += $(BRCM_XLR_GTS_PLATFORM_MODULE)

 export BRCM_XLR_GTS_PLATFORM_MODULE 

-SONIC_STRETCH_DEBS += $(BRCM_XLR_GTS_PLATFORM_MODULE)
--- a/platform/broadcom/platform-modules-cel.mk
+++ b/platform/broadcom/platform-modules-cel.mk
@ -28,4 +28,3 @@ CEL_SILVERSTONE_PLATFORM_MODULE = platform-modules-silverstone_$(CEL_SILVERSTONE
 $(CEL_SILVERSTONE_PLATFORM_MODULE)_PLATFORM = x86_64-cel_silverstone-r0
 $(eval $(call add_extra_package,$(CEL_DX010_PLATFORM_MODULE),$(CEL_SILVERSTONE_PLATFORM_MODULE)))

-SONIC_STRETCH_DEBS += $(CEL_DX010_PLATFORM_MODULE)
--- a/platform/broadcom/platform-modules-dell.mk
+++ b/platform/broadcom/platform-modules-dell.mk
@ -46,7 +46,6 @@ $(eval $(call add_extra_package,$(DELL_Z9100_PLATFORM_MODULE),$(DELL_Z9332F_PLAT
 DELL_S5248F_PLATFORM_MODULE = platform-modules-s5248f_$(DELL_S5248F_PLATFORM_MODULE_VERSION)_amd64.deb
 $(DELL_S5248F_PLATFORM_MODULE)_PLATFORM = x86_64-dellemc_s5248f_c3538-r0
 $(eval $(call add_extra_package,$(DELL_Z9100_PLATFORM_MODULE),$(DELL_S5248F_PLATFORM_MODULE)))
-SONIC_STRETCH_DEBS += $(DELL_Z9100_PLATFORM_MODULE)

 #flashrom tool
 $(shell ./$(PLATFORM_PATH)/sonic-platform-modules-dell/tools/flashrom.sh  > /dev/null 2>&1)
--- a/platform/broadcom/platform-modules-delta.mk
+++ b/platform/broadcom/platform-modules-delta.mk
@ -34,4 +34,3 @@ DELTA_AG9032V2A_PLATFORM_MODULE = platform-modules-ag9032v2a_$(DELTA_AG9032V2A_P
 $(DELTA_AG9032V2A_PLATFORM_MODULE)_PLATFORM = x86_64-delta_ag9032v2a-r0
 $(eval $(call add_extra_package,$(DELTA_AG9032V1_PLATFORM_MODULE),$(DELTA_AG9032V2A_PLATFORM_MODULE)))

-SONIC_STRETCH_DEBS += $(DELTA_AG9032V1_PLATFORM_MODULE)
--- a/platform/broadcom/platform-modules-ingrasys.mk
+++ b/platform/broadcom/platform-modules-ingrasys.mk
@ -35,4 +35,3 @@ $(eval $(call add_extra_package,$(INGRASYS_S9100_PLATFORM_MODULE),$(INGRASYS_S89
 $(eval $(call add_extra_package,$(INGRASYS_S9100_PLATFORM_MODULE),$(INGRASYS_S8810_32Q_PLATFORM_MODULE)))
 $(eval $(call add_extra_package,$(INGRASYS_S9100_PLATFORM_MODULE),$(INGRASYS_S9200_64X_PLATFORM_MODULE)))

-SONIC_STRETCH_DEBS += $(INGRASYS_S9100_PLATFORM_MODULE)
--- a/platform/broadcom/platform-modules-inventec.mk
+++ b/platform/broadcom/platform-modules-inventec.mk
@ -40,4 +40,3 @@ INVENTEC_D7264Q28B_PLATFORM_MODULE = platform-modules-d7264q28b_$(INVENTEC_D7264
 $(INVENTEC_D7264Q28B_PLATFORM_MODULE)_PLATFORM = x86_64-inventec_d7264q28b-r0
 $(eval $(call add_extra_package,$(INVENTEC_D7032Q28B_PLATFORM_MODULE),$(INVENTEC_D7264Q28B_PLATFORM_MODULE)))

-SONIC_STRETCH_DEBS += $(INVENTEC_D7032Q28B_PLATFORM_MODULE)
--- a/platform/broadcom/platform-modules-juniper.mk
+++ b/platform/broadcom/platform-modules-juniper.mk
@ -16,5 +16,3 @@ JUNIPER_QFX5200_PLATFORM_MODULE = sonic-platform-juniper-qfx5200_$(JUNIPER_QFX52
 $(JUNIPER_QFX5200_PLATFORM_MODULE)_PLATFORM = x86_64-juniper_qfx5200-r0

 $(eval $(call add_extra_package,$(JUNIPER_QFX5210_PLATFORM_MODULE),$(JUNIPER_QFX5200_PLATFORM_MODULE)))
-
-SONIC_STRETCH_DEBS += $(JUNIPER_QFX5210_PLATFORM_MODULE)
--- a/platform/broadcom/platform-modules-mitac.mk
+++ b/platform/broadcom/platform-modules-mitac.mk
@ -10,4 +10,3 @@ $(MITAC_LY1200_32X_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_
 $(MITAC_LY1200_32X_PLATFORM_MODULE)_PLATFORM = x86_64-mitac_ly1200_b32h0_c3-r0
 SONIC_DPKG_DEBS += $(MITAC_LY1200_32X_PLATFORM_MODULE)

-SONIC_STRETCH_DEBS += $(MITAC_LY1200_32X_PLATFORM_MODULE)
--- a/platform/broadcom/platform-modules-quanta.mk
+++ b/platform/broadcom/platform-modules-quanta.mk
@ -34,4 +34,3 @@ QUANTA_IX9_32X_PLATFORM_MODULE = sonic-platform-quanta-ix9-32x_$(QUANTA_IX9_32X_
 $(QUANTA_IX9_32X_PLATFORM_MODULE)_PLATFORM = x86_64-quanta_ix9_bwde-r0
 $(eval $(call add_extra_package,$(QUANTA_IX1B_32X_PLATFORM_MODULE),$(QUANTA_IX9_32X_PLATFORM_MODULE)))

-SONIC_STRETCH_DEBS += $(QUANTA_IX1B_32X_PLATFORM_MODULE)
--- a/platform/broadcom/sai-modules.mk
+++ b/platform/broadcom/sai-modules.mk
@ -1,6 +1,5 @@
 # Broadcom SAI modules

-KVERSION = 4.9.0-11-2-amd64
 BRCM_OPENNSL_KERNEL_VERSION = 3.7.3.3-1

 BRCM_OPENNSL_KERNEL = opennsl-modules_$(BRCM_OPENNSL_KERNEL_VERSION)_amd64.deb
@ -8,4 +7,3 @@ $(BRCM_OPENNSL_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/saibcm-modules
 $(BRCM_OPENNSL_KERNEL)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
 SONIC_DPKG_DEBS += $(BRCM_OPENNSL_KERNEL)

-SONIC_STRETCH_DEBS += $(BRCM_OPENNSL_KERNEL)
--- a/platform/broadcom/saibcm-modules/debian/control
+++ b/platform/broadcom/saibcm-modules/debian/control
@ -10,5 +10,5 @@ Standards-Version: 3.9.3
 Package: opennsl-modules
 Architecture: amd64
 Section: main
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for broadcom SAI
--- a/platform/broadcom/saibcm-modules/debian/opennsl-modules.dirs
+++ b/platform/broadcom/saibcm-modules/debian/opennsl-modules.dirs
@ -1 +1 @@
-lib/modules/4.9.0-11-2-amd64/extra
+lib/modules/4.19.0-6-amd64/extra
--- a/platform/broadcom/saibcm-modules/debian/opennsl-modules.install
+++ b/platform/broadcom/saibcm-modules/debian/opennsl-modules.install
@ -1,6 +1,6 @@
-systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.9.0-11-2-amd64/extra
-systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.9.0-11-2-amd64/extra
-systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.9.0-11-2-amd64/extra
-systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.9.0-11-2-amd64/extra
-systems/linux/user/x86-smp_generic_64-2_6/psample.ko lib/modules/4.9.0-11-2-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.19.0-6-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.19.0-6-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.19.0-6-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.19.0-6-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/psample.ko lib/modules/4.19.0-6-amd64/extra
 systemd/opennsl-modules.service lib/systemd/system
--- a/platform/broadcom/saibcm-modules/debian/rules
+++ b/platform/broadcom/saibcm-modules/debian/rules
@ -34,6 +34,7 @@ sname:=opennsl
 PACKAGE=opennsl-modules
 # modifieable for experiments or debugging m-a
 MA_DIR ?= /usr/share/modass
+KVERSION ?= 4.19.0-6-amd64
 # load generic variable handling
 -include $(MA_DIR)/include/generic.make
 # load default rules, including kdist, kdist_image, ...
@ -60,7 +61,10 @@ kdist_config: prep-deb-files
 kdist_clean: clean
 	dh_testdir
 	dh_clean
-	SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 BUILD_PSAMPLE=1 KERNDIR=/usr/src/linux-headers-4.9.0-11-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-11-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
+	SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 BUILD_PSAMPLE=1 \
+	    KERNDIR=/usr/src/linux-headers-$(KVERSION) \
+	    KERNEL_SRC=/usr/src/linux-headers-$(KVERSION) \
+	    $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
 #	rm -f driver/*.o driver/*.ko
 #
 ### end  KERNEL SETUP
@ -78,7 +82,10 @@ build-arch-stamp:
 	dh_testdir

 	# Add here command to compile/build the package.
-	SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 BUILD_PSAMPLE=1 KERNDIR=/usr/src/linux-headers-4.9.0-11-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-11-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6
+	SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 BUILD_PSAMPLE=1 \
+	    KERNDIR=/usr/src/linux-headers-$(KVERSION) \
+	    KERNEL_SRC=/usr/src/linux-headers-$(KVERSION) \
+	    $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6

 	touch $@

@ -103,7 +110,10 @@ clean:
 	rm -f build-arch-stamp build-indep-stamp configure-stamp

 	# Add here commands to clean up after the build process.
-	SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 BUILD_PSAMPLE=1 KERNDIR=/usr/src/linux-headers-4.9.0-11-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-11-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
+	SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 BUILD_PSAMPLE=1 \
+	    KERNDIR=/usr/src/linux-headers-$(KVERSION) \
+	    KERNEL_SRC=/usr/src/linux-headers-$(KVERSION) \
+	    $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean

 	dh_clean

--- a/platform/broadcom/sonic-platform-modules-accton/as4630-54pe/modules/x86-64-accton-as4630-54pe-cpld.c
+++ b/platform/broadcom/sonic-platform-modules-accton/as4630-54pe/modules/x86-64-accton-as4630-54pe-cpld.c
@ -36,6 +36,7 @@
 #include <linux/delay.h>
 #include <linux/jiffies.h>
 #include <linux/kernel.h>
+#include <linux/fs.h>
 #include <asm/uaccess.h>


--- a/platform/broadcom/sonic-platform-modules-accton/as5712-54x/modules/leds-accton_as5712_54x.c
+++ b/platform/broadcom/sonic-platform-modules-accton/as5712-54x/modules/leds-accton_as5712_54x.c
@ -34,7 +34,6 @@ extern int as5712_54x_cpld_read (unsigned short cpld_addr, u8 reg);
 extern int as5712_54x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);

 extern void led_classdev_unregister(struct led_classdev *led_cdev);
-extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);

--- a/platform/broadcom/sonic-platform-modules-accton/as5812-54x/modules/leds-accton_as5812_54x.c
+++ b/platform/broadcom/sonic-platform-modules-accton/as5812-54x/modules/leds-accton_as5812_54x.c
@ -34,7 +34,6 @@ extern int as5812_54x_cpld_read (unsigned short cpld_addr, u8 reg);
 extern int as5812_54x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);

 extern void led_classdev_unregister(struct led_classdev *led_cdev);
-extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);

--- a/platform/broadcom/sonic-platform-modules-accton/as6712-32x/modules/leds-accton_as6712_32x.c
+++ b/platform/broadcom/sonic-platform-modules-accton/as6712-32x/modules/leds-accton_as6712_32x.c
@ -33,7 +33,6 @@ extern int as6712_32x_cpld_read (unsigned short cpld_addr, u8 reg);
 extern int as6712_32x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);

 extern void led_classdev_unregister(struct led_classdev *led_cdev);
-extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);

--- a/platform/broadcom/sonic-platform-modules-accton/as7312-54x/modules/accton_as7312_54x_leds.c
+++ b/platform/broadcom/sonic-platform-modules-accton/as7312-54x/modules/accton_as7312_54x_leds.c
@ -34,7 +34,6 @@ extern int as7312_54x_cpld_read (unsigned short cpld_addr, u8 reg);
 extern int as7312_54x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);

 extern void led_classdev_unregister(struct led_classdev *led_cdev);
-extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);

--- a/platform/broadcom/sonic-platform-modules-accton/as7312-54xs/modules/accton_as7312_54x_leds.c
+++ b/platform/broadcom/sonic-platform-modules-accton/as7312-54xs/modules/accton_as7312_54x_leds.c
@ -34,7 +34,6 @@ extern int as7312_54x_cpld_read (unsigned short cpld_addr, u8 reg);
 extern int as7312_54x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);

 extern void led_classdev_unregister(struct led_classdev *led_cdev);
-extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);

--- a/platform/broadcom/sonic-platform-modules-accton/as7326-56x/modules/accton_as7326_56x_leds.c
+++ b/platform/broadcom/sonic-platform-modules-accton/as7326-56x/modules/accton_as7326_56x_leds.c
@ -34,7 +34,6 @@ extern int as7326_56x_cpld_read (unsigned short cpld_addr, u8 reg);
 extern int as7326_56x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);

 extern void led_classdev_unregister(struct led_classdev *led_cdev);
-extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);

--- a/platform/broadcom/sonic-platform-modules-accton/as7712-32x/modules/leds-accton_as7712_32x.c
+++ b/platform/broadcom/sonic-platform-modules-accton/as7712-32x/modules/leds-accton_as7712_32x.c
@ -34,7 +34,6 @@ extern int accton_i2c_cpld_read (unsigned short cpld_addr, u8 reg);
 extern int accton_i2c_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);

 extern void led_classdev_unregister(struct led_classdev *led_cdev);
-extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);

--- a/platform/broadcom/sonic-platform-modules-accton/as7716-32x/modules/accton_as7716_32x_leds.c
+++ b/platform/broadcom/sonic-platform-modules-accton/as7716-32x/modules/accton_as7716_32x_leds.c
@ -34,7 +34,6 @@ extern int as7716_32x_cpld_read (unsigned short cpld_addr, u8 reg);
 extern int as7716_32x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);

 extern void led_classdev_unregister(struct led_classdev *led_cdev);
-extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);

--- a/platform/broadcom/sonic-platform-modules-accton/as7716-32xb/modules/accton_as7716_32xb_leds.c
+++ b/platform/broadcom/sonic-platform-modules-accton/as7716-32xb/modules/accton_as7716_32xb_leds.c
@ -31,7 +31,6 @@
 #include <linux/dmi.h>

 extern void led_classdev_unregister(struct led_classdev *led_cdev);
-extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);

--- a/platform/broadcom/sonic-platform-modules-accton/as7726-32x/modules/accton_as7726_32x_leds.c
+++ b/platform/broadcom/sonic-platform-modules-accton/as7726-32x/modules/accton_as7726_32x_leds.c
@ -34,7 +34,6 @@ extern int as7726_32x_cpld_read (unsigned short cpld_addr, u8 reg);
 extern int as7726_32x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);

 extern void led_classdev_unregister(struct led_classdev *led_cdev);
-extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);

--- a/platform/broadcom/sonic-platform-modules-accton/as7816-64x/modules/x86-64-accton-as7816-64x-leds.c
+++ b/platform/broadcom/sonic-platform-modules-accton/as7816-64x/modules/x86-64-accton-as7816-64x-leds.c
@ -34,7 +34,6 @@ extern int accton_i2c_cpld_read (u8 cpld_addr, u8 reg);
 extern int accton_i2c_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);

 extern void led_classdev_unregister(struct led_classdev *led_cdev);
-extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);

--- a/platform/broadcom/sonic-platform-modules-accton/common/modules/accton_pmbus_3y.c
+++ b/platform/broadcom/sonic-platform-modules-accton/common/modules/accton_pmbus_3y.c
@ -31,7 +31,7 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
 #include <linux/jiffies.h>
-#include <linux/i2c/pmbus.h>
+#include <linux/pmbus.h>
 #include "pmbus.h"


--- a/platform/broadcom/sonic-platform-modules-alphanetworks/debian/control
+++ b/platform/broadcom/sonic-platform-modules-alphanetworks/debian/control
@ -7,11 +7,11 @@ Standards-Version: 3.9.3

 Package: sonic-platform-alphanetworks-snh60a0-320fv2
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as fan, led, sfp

 Package: sonic-platform-alphanetworks-snh60b0-640f
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as fan, led, sfp

--- a/platform/broadcom/sonic-platform-modules-arista
+++ b/platform/broadcom/sonic-platform-modules-arista
@ -1 +1 @@
-Subproject commit 39860a109853b2f37367dfe68905e019b509d5bf
+Subproject commit ab4e8e17e610e23d66b024fbf27bd83b41edf44c
--- a/platform/broadcom/sonic-platform-modules-cel/debian/control
+++ b/platform/broadcom/sonic-platform-modules-cel/debian/control
@ -7,21 +7,21 @@ Standards-Version: 3.9.3

 Package: platform-modules-dx010
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as fan, led, sfp


 Package: platform-modules-haliburton
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as fan, led, sfp

 Package: platform-modules-seastone2
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as led, sfp

 Package: platform-modules-silverstone
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as led, sfp.
--- a/platform/broadcom/sonic-platform-modules-cel/haliburton/modules/dps200.c
+++ b/platform/broadcom/sonic-platform-modules-cel/haliburton/modules/dps200.c
@ -26,7 +26,7 @@
 #include <linux/slab.h>
 #include <linux/mutex.h>
 #include <linux/i2c.h>
-#include <linux/i2c/pmbus.h>
+#include <linux/pmbus.h>
 #include "pmbus.h"


--- a/platform/broadcom/sonic-platform-modules-dell/debian/control
+++ b/platform/broadcom/sonic-platform-modules-dell/debian/control
@ -7,35 +7,35 @@ Standards-Version: 3.9.3

 Package: platform-modules-s6000
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as fan, led, sfp

 Package: platform-modules-z9100
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as fan, led, sfp

 Package: platform-modules-s6100
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as fan, led, sfp

 Package: platform-modules-z9264f
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as fan, led, sfp

 Package: platform-modules-s5232f
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as fan, led, sfp

 Package: platform-modules-s5248f
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as fan, led, sfp

 Package: platform-modules-z9332f
 Architecture: amd64
-Depends: linux-image-4.9.0-9-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
--- a/platform/broadcom/sonic-platform-modules-dell/s6000/modules/dell_s6000_platform.c
+++ b/platform/broadcom/sonic-platform-modules-dell/s6000/modules/dell_s6000_platform.c
@ -5,7 +5,7 @@
 #include <linux/stat.h>
 #include <linux/i2c.h>
 #include <linux/i2c-mux.h>
-#include <linux/i2c-mux-gpio.h>
+#include <linux/platform_data/i2c-mux-gpio.h>
 #include <linux/platform_device.h>
 #include <linux/i2c/sff-8436.h>
 #include <linux/delay.h>
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/modules/cls-switchboard.c
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/modules/cls-switchboard.c
@ -21,7 +21,7 @@
 #include <linux/interrupt.h>
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #include "cls-i2c-ocore.h"

 #define MOD_VERSION "2.1.0-1"
--- a/platform/broadcom/sonic-platform-modules-delta/ag5648/modules/delta_ag5648_platform.c
+++ b/platform/broadcom/sonic-platform-modules-delta/ag5648/modules/delta_ag5648_platform.c
@ -9,9 +9,9 @@
 #include <linux/ctype.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #include <linux/i2c-mux.h>
-#include <linux/i2c-mux-gpio.h>
+#include <linux/platform_data/i2c-mux-gpio.h>
 #include <linux/i2c/sff-8436.h>

 #define BUS4_DEV_NUM    54
--- a/platform/broadcom/sonic-platform-modules-delta/ag9032v1/modules/delta_ag9032v1_platform.c
+++ b/platform/broadcom/sonic-platform-modules-delta/ag9032v1/modules/delta_ag9032v1_platform.c
@ -9,9 +9,9 @@
 #include <linux/ctype.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #include <linux/i2c-mux.h>
-#include <linux/i2c-mux-gpio.h>
+#include <linux/platform_data/i2c-mux-gpio.h>
 #include <linux/i2c/sff-8436.h>
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
--- a/platform/broadcom/sonic-platform-modules-delta/ag9032v2a/modules/delta_ag9032v2a_platform.c
+++ b/platform/broadcom/sonic-platform-modules-delta/ag9032v2a/modules/delta_ag9032v2a_platform.c
@ -1,6 +1,6 @@
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #include <linux/i2c-mux.h>
 #include <linux/device.h>
 #include <linux/module.h>
--- a/platform/broadcom/sonic-platform-modules-delta/ag9064/modules/delta_ag9064_platform.c
+++ b/platform/broadcom/sonic-platform-modules-delta/ag9064/modules/delta_ag9064_platform.c
@ -3,9 +3,9 @@
 #include <linux/dmi.h>
 #include <linux/version.h>
 #include <linux/ctype.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #include <linux/i2c-mux.h>
-#include <linux/i2c-mux-gpio.h>
+#include <linux/platform_data/i2c-mux-gpio.h>
 #include <linux/i2c/sff-8436.h>
 #include <linux/fs.h>
 #include <asm/segment.h>
--- a/platform/broadcom/sonic-platform-modules-delta/ag9064/modules/i2c-mei_main.c
+++ b/platform/broadcom/sonic-platform-modules-delta/ag9064/modules/i2c-mei_main.c
@ -28,7 +28,7 @@
 #if (defined CONFIG_I2C_MUX_GPIO || defined CONFIG_I2C_MUX_GPIO_MODULE) && \
 		defined CONFIG_DMI
 #include <linux/gpio.h>
-#include <linux/i2c-mux-gpio.h>
+#include <linux/platform_data/i2c-mux-gpio.h>
 #endif

 /* PCI Address Constants */
--- a/platform/broadcom/sonic-platform-modules-delta/debian/control
+++ b/platform/broadcom/sonic-platform-modules-delta/debian/control
@ -7,25 +7,25 @@ Standards-Version: 3.9.3

 Package: platform-modules-ag9032v1
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as fan, led, sfp

 Package: platform-modules-ag9064
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as fan, led, sfp

 Package: platform-modules-ag5648
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as fan, led, sfp

 Package: platform-modules-et-6248brb
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as fan, led, sfp

 Package: platform-modules-ag9032v2a
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as syseeprom, sfp
--- a/platform/broadcom/sonic-platform-modules-delta/et-6248brb/modules/delta_et-6248brb_platform.c
+++ b/platform/broadcom/sonic-platform-modules-delta/et-6248brb/modules/delta_et-6248brb_platform.c
@ -9,11 +9,11 @@
 #include <linux/ctype.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #include <linux/platform_data/pca953x.h>

 #include <linux/i2c-mux.h>
-#include <linux/i2c-mux-gpio.h>
+#include <linux/platform_data/i2c-mux-gpio.h>
 #include <linux/i2c/sff-8436.h>
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
--- a/platform/broadcom/sonic-platform-modules-ingrasys/s8900-64xc/modules/qsfp_cpld.c
+++ b/platform/broadcom/sonic-platform-modules-ingrasys/s8900-64xc/modules/qsfp_cpld.c
@ -28,7 +28,7 @@
 #include <linux/mutex.h>
 #include <linux/interrupt.h>
 #include <linux/i2c-mux.h>
-#include <linux/i2c-mux-gpio.h>
+#include <linux/platform_data/i2c-mux-gpio.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>

--- a/platform/broadcom/sonic-platform-modules-ingrasys/s9200-64x/modules/cpld.c
+++ b/platform/broadcom/sonic-platform-modules-ingrasys/s9200-64x/modules/cpld.c
@ -5,7 +5,7 @@
 #include <linux/stat.h>
 #include <linux/i2c.h>
 #include <linux/i2c-mux.h>
-#include <linux/i2c-mux-gpio.h>
+#include <linux/platform_data/i2c-mux-gpio.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>

--- a/platform/broadcom/sonic-platform-modules-inventec/d6254qs/modules/inv_platform.c
+++ b/platform/broadcom/sonic-platform-modules-inventec/d6254qs/modules/inv_platform.c
@ -6,13 +6,13 @@
 */

 #include <linux/i2c.h>
-#include <linux/i2c-gpio.h>
+#include <linux/platform_data/i2c-gpio.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>

-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>

 struct inv_i2c_board_info {
    int ch;
--- a/platform/broadcom/sonic-platform-modules-inventec/d6356/modules/i2c-mux-pca9541.c
+++ b/platform/broadcom/sonic-platform-modules-inventec/d6356/modules/i2c-mux-pca9541.c
@ -24,7 +24,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c-mux.h>

-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>

 /*
 * The PCA9541 is a bus master selector. It supports two I2C masters connected
--- a/platform/broadcom/sonic-platform-modules-inventec/d6356/modules/inv_platform.c
+++ b/platform/broadcom/sonic-platform-modules-inventec/d6356/modules/inv_platform.c
@ -1,11 +1,11 @@
 #include <linux/i2c.h>
-#include <linux/i2c-gpio.h>
+#include <linux/platform_data/i2c-gpio.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>

 struct inv_i2c_board_info {
    int ch;
--- a/platform/broadcom/sonic-platform-modules-inventec/d6356/modules/ucd9000.c
+++ b/platform/broadcom/sonic-platform-modules-inventec/d6356/modules/ucd9000.c
@ -25,7 +25,7 @@
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/i2c/pmbus.h>
+#include <linux/pmbus.h>
 #include "pmbus.h"

 enum chips { ucd9000, ucd90120, ucd90124, ucd90160, ucd9090, ucd90910 };
--- a/platform/broadcom/sonic-platform-modules-inventec/d6556/modules/inv_platform.c
+++ b/platform/broadcom/sonic-platform-modules-inventec/d6556/modules/inv_platform.c
@ -5,13 +5,13 @@
 * (at your option) any later version.
 */
 #include <linux/i2c.h>
-#include <linux/i2c-gpio.h>
+#include <linux/platform_data/i2c-gpio.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>

 struct inv_i2c_board_info {
    int ch;
--- a/platform/broadcom/sonic-platform-modules-inventec/d7032q28b/modules/inv_platform.c
+++ b/platform/broadcom/sonic-platform-modules-inventec/d7032q28b/modules/inv_platform.c
@ -1,12 +1,12 @@
 #include <linux/i2c.h>
 //#include <linux/i2c-algo-bit.h>
-#include <linux/i2c-gpio.h>
+#include <linux/platform_data/i2c-gpio.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>

-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #include <linux/platform_data/pca953x.h>
 #include <linux/platform_data/at24.h>

--- a/platform/broadcom/sonic-platform-modules-inventec/d7054q28b/modules/inv_platform.c
+++ b/platform/broadcom/sonic-platform-modules-inventec/d7054q28b/modules/inv_platform.c
@ -1,12 +1,12 @@
 #include <linux/i2c.h>
 //#include <linux/i2c-algo-bit.h>
-#include <linux/i2c-gpio.h>
+#include <linux/platform_data/i2c-gpio.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>

-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 //#include <linux/i2c/pca953x.h>
 //#include <linux/i2c/at24.h>

--- a/platform/broadcom/sonic-platform-modules-inventec/d7264q28b/modules/inv_platform.c
+++ b/platform/broadcom/sonic-platform-modules-inventec/d7264q28b/modules/inv_platform.c
@ -1,12 +1,12 @@
 #include <linux/i2c.h>
 //#include <linux/i2c-algo-bit.h>
-#include <linux/i2c-gpio.h>
+#include <linux/platform_data/i2c-gpio.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 //#include <linux/i2c/pca953x.h>
 //#include <linux/i2c/at24.h>

--- a/platform/broadcom/sonic-platform-modules-inventec/debian/control
+++ b/platform/broadcom/sonic-platform-modules-inventec/debian/control
@ -7,30 +7,30 @@ Standards-Version: 3.9.3

 Package: platform-modules-d7032q28b
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as fan, led

 Package: platform-modules-d7054q28b
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as fan, led

 Package: platform-modules-d6254qs
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as fan, led

 Package: platform-modules-d6556
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as fan, led

 Package: platform-modules-d6356
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as fan, led

 Package: platform-modules-d7264q28b
 Architecture: amd64
-Depends: linux-image-4.9.0-11-2-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as fan, led
--- a/platform/broadcom/sonic-platform-modules-juniper/qfx5200/modules/jnx-refpga-lpcm.c
+++ b/platform/broadcom/sonic-platform-modules-juniper/qfx5200/modules/jnx-refpga-lpcm.c
@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/ioport.h>

 #define REFPGA_LPC_BASE_ADDRESS		0xFED50000
 #define REFPGA_LPC_WINDOW_SIZE		0x00000400
@ -68,10 +69,10 @@ static int __init refpga_lpcm_init(void)
 	u8 minor_version = 0x00;

 	if (!request_mem_region(REFPGA_LPC_BASE_ADDRESS, REFPGA_LPC_WINDOW_SIZE, "refpga-lpc")) {
-		printk(KERN_ERR "Cannot allocate Re-fpga memory region\n"); 
+		printk(KERN_ERR "Cannot allocate Re-fpga memory region\n");
 		return -ENODEV;
 	}
-	
+
 	if ((fpga = ioremap(REFPGA_LPC_BASE_ADDRESS, REFPGA_LPC_WINDOW_SIZE)) == NULL) {
 		release_mem_region(REFPGA_LPC_BASE_ADDRESS, REFPGA_LPC_WINDOW_SIZE);
 		printk(KERN_ERR "Re-Fpga address mapping failed\n");
@ -81,14 +82,14 @@ static int __init refpga_lpcm_init(void)
 	major_version = ioread8((u8 *)fpga + REFPGA_MAJOR_VERSION);
 	minor_version = ioread8((u8 *)fpga + REFPGA_MINOR_VERSION);
 	printk(KERN_INFO "Re-Fpga major version: %x minor version: %x\n", major_version, minor_version);
-	
+
 	/*
 	 * Register the cpld soft reset handler
 	 */
 	if(register_reboot_notifier(&qfx5200_nb)) {
 		printk(KERN_ALERT "Restart handler registration failed\n");
 	}
-	
+
 	iowrite8(REFPGA_MGMT1_PHY_RESET, (u8 *)fpga + REFPGA_MRE_LPCM_RST_CTL_REG);

 	return 0;
--- a/platform/broadcom/sonic-platform-modules-juniper/qfx5210/modules/x86-64-juniper-qfx5210-64x-leds.c
+++ b/platform/broadcom/sonic-platform-modules-juniper/qfx5210/modules/x86-64-juniper-qfx5210-64x-leds.c
@ -37,7 +37,6 @@ extern int juniper_i2c_cpld_read (u8 cpld_addr, u8 reg);
 extern int juniper_i2c_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);

 extern void led_classdev_unregister(struct led_classdev *led_cdev);
-extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);

--- a/platform/broadcom/sonic-platform-modules-mitac/debian/control
+++ b/platform/broadcom/sonic-platform-modules-mitac/debian/control
@ -7,6 +7,6 @@ Standards-Version: 3.9.3

 Package: sonic-platform-mitac-ly1200-32x
 Architecture: amd64
-Depends: linux-image-3.16.0-5-amd64
+Depends: linux-image-4.19.0-6-amd64
 Description: kernel modules for platform devices such as fan, led, sfp

--- a/platform/broadcom/sonic-platform-modules-mitac/ly1200-32x/modules/mitac_ly1200_32x_fse000.c
+++ b/platform/broadcom/sonic-platform-modules-mitac/ly1200-32x/modules/mitac_ly1200_32x_fse000.c
@ -8,7 +8,7 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
 #include <linux/jiffies.h>
-#include <linux/i2c/pmbus.h>
+#include <linux/pmbus.h>
 #include "pmbus.h"
 #include <linux/version.h>

--- a/platform/broadcom/sonic-platform-modules-mitac/ly1200-32x/modules/mitac_ly1200_32x_sb_i2c.c
+++ b/platform/broadcom/sonic-platform-modules-mitac/ly1200-32x/modules/mitac_ly1200_32x_sb_i2c.c
@ -1,7 +1,7 @@
 #include <linux/i2c.h>
 #include <linux/module.h>
 #include <linux/platform_data/pca953x.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #include <linux/platform_data/at24.h>
 #include <linux/delay.h>
 #include "bms_i2c.h"
--- a/platform/broadcom/sonic-platform-modules-quanta/ix1b-32x/modules/qci_platform_ix1b.c
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix1b-32x/modules/qci_platform_ix1b.c
@ -39,7 +39,7 @@
 #include <linux/input-polldev.h>
 #include <linux/rfkill.h>
 #include <linux/slab.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #if LINUX_VERSION_CODE > KERNEL_VERSION(3,12,0)
 #include <linux/platform_data/pca953x.h>
 #else
--- a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/modules/quanta_platform_ix7.c
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/modules/quanta_platform_ix7.c
@ -39,7 +39,7 @@
 #include <linux/input-polldev.h>
 #include <linux/rfkill.h>
 #include <linux/slab.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0))
 #include <linux/i2c/pca953x.h>
 #else
--- a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/qci_platform_ix8.c
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/qci_platform_ix8.c
@ -39,7 +39,7 @@
 #include <linux/input-polldev.h>
 #include <linux/rfkill.h>
 #include <linux/slab.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0))
 #include <linux/i2c/pca953x.h>
 #else
--- a/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/modules/qci_platform_ix8c.c
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/modules/qci_platform_ix8c.c
@ -39,7 +39,7 @@
 #include <linux/input-polldev.h>
 #include <linux/rfkill.h>
 #include <linux/slab.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0))
 #include <linux/i2c/pca953x.h>
 #else
--- a/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/modules/qci_platform_ix9.c
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/modules/qci_platform_ix9.c
@ -39,7 +39,7 @@
 #include <linux/input-polldev.h>
 #include <linux/rfkill.h>
 #include <linux/slab.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #if LINUX_VERSION_CODE > KERNEL_VERSION(3,12,0)
 #include <linux/platform_data/pca953x.h>
 #else
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`deb [arch=amd64] http://packages.microsoft.com/repos/sonic-dev/ jessie main`