[submodule] update sonic-linux-kernel (#3038)

* [submodule] update sonic-linux-kernel (#2985)
* Fix many version strings
* Update minor version
* Update arista-drivers submodule (#9)
* Rebuild SDK on new kernel (#10)

Author: qiluo-msft

build_debian.sh

@@ -30,7 +30,7 @@ set -x -e
 
 ## docker engine version (with platform)
 DOCKER_VERSION=5:18.09.2~3-0~debian-stretch
-LINUX_KERNEL_VERSION=4.9.0-8
+LINUX_KERNEL_VERSION=4.9.0-9
 
 ## Working directory to prepare the file system
 FILESYSTEM_ROOT=./fsroot
@@ -403,7 +403,7 @@ fi
 ## Organization specific extensions such as Configuration & Scripts for features like AAA, ZTP...
 if [ "${enable_organization_extensions}" = "y" ]; then
    if [ -f files/build_templates/organization_extensions.sh ]; then
-      sudo chmod 755 files/build_templates/organization_extensions.sh 
+      sudo chmod 755 files/build_templates/organization_extensions.sh
       ./files/build_templates/organization_extensions.sh -f $FILESYSTEM_ROOT -h $HOSTNAME
    fi
 fi

files/build_templates/swss.service.j2

@@ -2,9 +2,9 @@
 Description=switch state service
 Requires=database.service updategraph.service
 {% if sonic_asic_platform == 'broadcom' %}
-Requires=opennsl-modules-4.9.0-8-amd64.service
+Requires=opennsl-modules-4.9.0-9-amd64.service
 {% elif sonic_asic_platform == 'nephos' %}
-Requires=nps-modules-4.9.0-8-amd64.service
+Requires=nps-modules-4.9.0-9-amd64.service
 {% endif %}
 After=database.service updategraph.service
 After=interfaces-config.service

files/build_templates/syncd.service.j2

@@ -2,16 +2,16 @@
 Description=syncd service
 Requires=database.service updategraph.service
 {% if sonic_asic_platform == 'broadcom' %}
-Requires=opennsl-modules-4.9.0-8-amd64.service
+Requires=opennsl-modules-4.9.0-9-amd64.service
 {% elif sonic_asic_platform == 'nephos' %}
-Requires=nps-modules-4.9.0-8-amd64.service
+Requires=nps-modules-4.9.0-9-amd64.service
 {% endif %}
 After=database.service updategraph.service
 After=interfaces-config.service
 {% if sonic_asic_platform == 'broadcom' %}
-After=opennsl-modules-4.9.0-8-amd64.service
+After=opennsl-modules-4.9.0-9-amd64.service
 {% elif sonic_asic_platform == 'nephos' %}
-After=nps-modules-4.9.0-8-amd64.service
+After=nps-modules-4.9.0-9-amd64.service
 {% endif %}
 After=swss.service
 Before=ntp-config.service

installer/x86_64/install.sh

@@ -162,7 +162,7 @@ if [ "$install_env" = "onie" ]; then
 fi
 
 # Creates a new partition for the DEMO OS.
-# 
+#
 # arg $1 -- base block device
 #
 # Returns the created partition number in $demo_part
@@ -177,7 +177,7 @@ create_demo_gpt_partition()
     tmpfifo=$(mktemp -u)
     trap_push "rm $tmpfifo || true"
     mkfifo -m 600 "$tmpfifo"
-    
+
     # See if demo partition already exists
     demo_part=$(sgdisk -p $blk_dev | grep -e "$demo_volume_label" -e "$legacy_volume_label" | awk '{print $1}')
     if [ -n "$demo_part" ] ; then
@@ -438,7 +438,7 @@ if [ "$install_env" = "onie" ]; then
         echo "Error: Unable to mount $demo_dev on $demo_mnt"
         exit 1
     }
-    
+
 elif [ "$install_env" = "sonic" ]; then
     demo_mnt="/host"
     eval running_sonic_revision=$(cat /etc/sonic/sonic_version.yml | grep build_version | cut -f2 -d" ")
@@ -595,12 +595,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-8-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX  \
+        linux   /$image_dir/boot/vmlinuz-4.9.0-9-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-8-amd64
+        initrd  /$image_dir/boot/initrd.img-4.9.0-9-amd64
 }
 EOF
 

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-8-amd64
+Depends: linux-image-4.9.0-9-amd64
 Description: kernel modules for bfn asic for mmap
 

platform/barefoot/sonic-platform-modules-arista

@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
 
 Package: sonic-platform-modules-bfn-montara
 Architecture: amd64
-Depends: linux-image-4.9.0-8-amd64
+Depends: linux-image-4.9.0-9-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 

platform/barefoot/sonic-platform-modules-bfn-montara/debian/control

@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
 
 Package: sonic-platform-modules-bfn
 Architecture: amd64
-Depends: linux-image-4.9.0-8-amd64
+Depends: linux-image-4.9.0-9-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 

platform/barefoot/sonic-platform-modules-bfn/debian/control

@@ -1,6 +1,6 @@
 # Broadcom SAI modules
 
-KVERSION = 4.9.0-8-amd64
+KVERSION = 4.9.0-9-amd64
 BRCM_OPENNSL_KERNEL_VERSION = 3.4.1.11-1
 
 BRCM_OPENNSL_KERNEL = opennsl-modules-$(KVERSION)_$(BRCM_OPENNSL_KERNEL_VERSION)_amd64.deb

platform/broadcom/sai-modules.mk

@@ -7,8 +7,8 @@ Standards-Version: 3.9.3
 #Vcs-Git: git://git.debian.org/collab-maint/bcmsdk.git
 #Vcs-Browser: http://git.debian.org/?p=collab-maint/bcmsdk.git;a=summary
 
-Package: opennsl-modules-4.9.0-8-amd64
+Package: opennsl-modules-4.9.0-9-amd64
 Architecture: amd64
 Section: main
-Depends: linux-image-4.9.0-8-amd64
+Depends: linux-image-4.9.0-9-amd64
 Description: kernel modules for broadcom SAI

platform/broadcom/saibcm-modules/debian/control

@@ -1 +1 @@
-lib/modules/4.9.0-8-amd64/extra
+lib/modules/4.9.0-9-amd64/extra

platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-8-amd64.dirs

@@ -69,7 +69,7 @@ force-reload|restart)
     ;;
 
 *)
-    echo "Usage: /etc/init.d/opennsl-modules-4.9.0-8-amd64.init {start|stop}"
+    echo "Usage: /etc/init.d/opennsl-modules-4.9.0-9-amd64.init {start|stop}"
     exit 1
     ;;
 esac

platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-8-amd64.init

@@ -1,5 +1,5 @@
-systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.9.0-8-amd64/extra
-systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.9.0-8-amd64/extra
-systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.9.0-8-amd64/extra
-systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.9.0-8-amd64/extra
-systemd/opennsl-modules-4.9.0-8-amd64.service lib/systemd/system
+systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.9.0-9-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.9.0-9-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.9.0-9-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.9.0-9-amd64/extra
+systemd/opennsl-modules-4.9.0-9-amd64.service lib/systemd/system

platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-8-amd64.install

@@ -60,7 +60,7 @@ 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 KERNDIR=/usr/src/linux-headers-4.9.0-8-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-8-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 KERNDIR=/usr/src/linux-headers-4.9.0-9-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-9-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
 #	rm -f driver/*.o driver/*.ko
 #
 ### end  KERNEL SETUP
@@ -78,7 +78,7 @@ 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 KERNDIR=/usr/src/linux-headers-4.9.0-8-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-8-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 KERNDIR=/usr/src/linux-headers-4.9.0-9-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-9-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6
 
 	touch $@
 
@@ -103,7 +103,7 @@ 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 KERNDIR=/usr/src/linux-headers-4.9.0-8-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-8-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 KERNDIR=/usr/src/linux-headers-4.9.0-9-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-9-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
 
 	dh_clean
 

platform/broadcom/saibcm-modules/debian/rules

@@ -5,13 +5,13 @@ Before=syncd.service
 
 [Service]
 Type=oneshot
-ExecStart=-/etc/init.d/opennsl-modules-4.9.0-8-amd64 start
+ExecStart=-/etc/init.d/opennsl-modules-4.9.0-9-amd64 start
 # Don't remove opennsl driver when stopping service. Because
 # removing knet drivers takes ~30 seconds to delete netdevs.
 # This delay cuts too deep into warm reboot time budget.
 # We could skip this step because we don't expect stopping
 # opennsl service in any context other than rebooting.
-# ExecStop=-/etc/init.d/opennsl-modules-4.9.0-8-amd64 stop
+# ExecStop=-/etc/init.d/opennsl-modules-4.9.0-9-amd64 stop
 RemainAfterExit=yes
 
 [Install]

platform/broadcom/saibcm-modules/systemd/opennsl-modules-4.9.0-8-amd64.service

@@ -4,13 +4,13 @@ if [ -s /usr/local/bin/done_idt_init ];then
     echo "There is a done_idt_init file"
 else
 
-    cat /etc/init.d/opennsl-modules-4.9.0-8-amd64|grep idt_init.sh
+    cat /etc/init.d/opennsl-modules-4.9.0-9-amd64|grep idt_init.sh
     if [ $? -ne 0 ];then
         echo "Add idt_init.sh to opennsl-modules for TD3 MAC"
-        sed -i '/modprobe linux-kernel-bde/i     sleep 1' /etc/init.d/opennsl-modules-4.9.0-8-amd64
-        sed -i '/sleep/i /usr/local/bin/idt_init.sh' /etc/init.d/opennsl-modules-4.9.0-8-amd64
-        sed -i '/idt_init/i echo "IDT init" ' /etc/init.d/opennsl-modules-4.9.0-8-amd64
-        sed -i '/IDT init/i echo 1 > /usr/local/bin/done_idt_init'  /etc/init.d/opennsl-modules-4.9.0-8-amd64
+        sed -i '/modprobe linux-kernel-bde/i     sleep 1' /etc/init.d/opennsl-modules-4.9.0-9-amd64
+        sed -i '/sleep/i /usr/local/bin/idt_init.sh' /etc/init.d/opennsl-modules-4.9.0-9-amd64
+        sed -i '/idt_init/i echo "IDT init" ' /etc/init.d/opennsl-modules-4.9.0-9-amd64
+        sed -i '/IDT init/i echo 1 > /usr/local/bin/done_idt_init'  /etc/init.d/opennsl-modules-4.9.0-9-amd64
 
     fi
 

platform/broadcom/sonic-platform-modules-accton/as7326-56x/utils/accton_handle_idt.sh

@@ -3,13 +3,13 @@
 if [ -s /usr/local/bin/done_idt_init ];then
     echo "There is a done_idt_init file"
 else
-    cat /etc/init.d/opennsl-modules-4.9.0-8-amd64|grep idt_init.sh
+    cat /etc/init.d/opennsl-modules-4.9.0-9-amd64|grep idt_init.sh
     if [ $? -ne 0 ];then
         echo "Add idt_init.sh to opennsl-modules for TD3 MAC"
-        sed -i '/modprobe linux-kernel-bde/i     sleep 1' /etc/init.d/opennsl-modules-4.9.0-8-amd64
-        sed -i '/sleep/i /usr/local/bin/idt_init.sh' /etc/init.d/opennsl-modules-4.9.0-8-amd64
-        sed -i '/idt_init/i echo "IDT init" ' /etc/init.d/opennsl-modules-4.9.0-8-amd64
-        sed -i '/IDT init/i echo 1 > /usr/local/bin/done_idt_init'  /etc/init.d/opennsl-modules-4.9.0-8-amd64
+        sed -i '/modprobe linux-kernel-bde/i     sleep 1' /etc/init.d/opennsl-modules-4.9.0-9-amd64
+        sed -i '/sleep/i /usr/local/bin/idt_init.sh' /etc/init.d/opennsl-modules-4.9.0-9-amd64
+        sed -i '/idt_init/i echo "IDT init" ' /etc/init.d/opennsl-modules-4.9.0-9-amd64
+        sed -i '/IDT init/i echo 1 > /usr/local/bin/done_idt_init'  /etc/init.d/opennsl-modules-4.9.0-9-amd64
     fi
 
 fi

platform/broadcom/sonic-platform-modules-accton/as7726-32x/utils/accton_handle_idt.sh

@@ -7,11 +7,11 @@ Standards-Version: 3.9.3
 
 Package: sonic-platform-alphanetworks-snh60a0-320fv2
 Architecture: amd64
-Depends: linux-image-4.9.0-8-amd64
+Depends: linux-image-4.9.0-9-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-8-amd64
+Depends: linux-image-4.9.0-9-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 

platform/broadcom/sonic-platform-modules-alphanetworks/debian/control

@@ -7,11 +7,11 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-dx010
 Architecture: amd64
-Depends: linux-image-4.9.0-8-amd64
+Depends: linux-image-4.9.0-9-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 
 
 Package: platform-modules-haliburton
 Architecture: amd64
-Depends: linux-image-4.9.0-8-amd64
+Depends: linux-image-4.9.0-9-amd64
 Description: kernel modules for platform devices such as fan, led, sfp

platform/broadcom/sonic-platform-modules-arista

@@ -7,16 +7,16 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-z9264f
 Architecture: amd64
-Depends: linux-image-4.9.0-8-amd64
+Depends: linux-image-4.9.0-9-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-z9100
 Architecture: amd64
-Depends: linux-image-4.9.0-8-amd64
+Depends: linux-image-4.9.0-9-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-s6100
 Architecture: amd64
-Depends: linux-image-4.9.0-8-amd64
+Depends: linux-image-4.9.0-9-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 

platform/broadcom/sonic-platform-modules-cel/debian/control

@@ -7,21 +7,21 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-ag9032v1
 Architecture: amd64
-Depends: linux-image-4.9.0-8-amd64
+Depends: linux-image-4.9.0-9-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-ag9064
 Architecture: amd64
-Depends: linux-image-4.9.0-8-amd64
+Depends: linux-image-4.9.0-9-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-ag5648
 Architecture: amd64
-Depends: linux-image-4.9.0-8-amd64
+Depends: linux-image-4.9.0-9-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-8-amd64
+Depends: linux-image-4.9.0-9-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 

platform/broadcom/sonic-platform-modules-dell/debian/control

@@ -25,7 +25,7 @@ start)
     modprobe dni_gpio
     modprobe delta_et-6248brb_platform
 
-    if [ `uname -a | awk '{print $3}'` = "4.9.0-8-amd64" ]; then
+    if [ `uname -a | awk '{print $3}'` = "4.9.0-9-amd64" ]; then
         echo "453" > "/sys/class/gpio/export"
         echo "454" > "/sys/class/gpio/export"
         echo "455" > "/sys/class/gpio/export"

platform/broadcom/sonic-platform-modules-delta/debian/control

@@ -7,7 +7,7 @@ FAN2_RPM="/sys/bus/i2c/devices/0-002e/fan2_input"
 FAN_TRAY1_LED="/sys/devices/platform/delta-et6248brb-gpio.0/FAN/fan1_led_ag"
 FAN_TRAY2_LED="/sys/devices/platform/delta-et6248brb-gpio.0/FAN/fan2_led_ag"
 
-if [ `uname -a | awk '{print $3}'` = "4.9.0-8-amd64" ]; then
+if [ `uname -a | awk '{print $3}'` = "4.9.0-9-amd64" ]; then
     SYS_LED_G="/sys/class/gpio/gpio453/value"
     SYS_LED_R="/sys/class/gpio/gpio454/value"
     PWR_LED_G="/sys/class/gpio/gpio455/value"

platform/broadcom/sonic-platform-modules-delta/debian/platform-modules-et-6248brb.init

@@ -7,25 +7,25 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-d7032q28b
 Architecture: amd64
-Depends: linux-image-4.9.0-8-amd64
+Depends: linux-image-4.9.0-9-amd64
 Description: kernel modules for platform devices such as fan, led
 
 Package: platform-modules-d7054q28b
 Architecture: amd64
-Depends: linux-image-4.9.0-8-amd64
+Depends: linux-image-4.9.0-9-amd64
 Description: kernel modules for platform devices such as fan, led
 
 Package: platform-modules-d6254qs
 Architecture: amd64
-Depends: linux-image-4.9.0-8-amd64
+Depends: linux-image-4.9.0-9-amd64
 Description: kernel modules for platform devices such as fan, led
 
 Package: platform-modules-d6556
 Architecture: amd64
-Depends: linux-image-4.9.0-8-amd64
+Depends: linux-image-4.9.0-9-amd64
 Description: kernel modules for platform devices such as fan, led
 
 Package: platform-modules-d7264q28b
 Architecture: amd64
-Depends: linux-image-4.9.0-8-amd64
+Depends: linux-image-4.9.0-9-amd64
 Description: kernel modules for platform devices such as fan, led

platform/broadcom/sonic-platform-modules-delta/et-6248brb/scripts/led_status.sh

@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-s6000
 Architecture: amd64
-Depends: linux-image-4.9.0-8-amd64
+Depends: linux-image-4.9.0-9-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 

platform/broadcom/sonic-platform-modules-inventec/debian/control

@@ -7,11 +7,11 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-e582-48x2q4z
 Architecture: amd64
-Depends: linux-image-4.9.0-8-amd64
+Depends: linux-image-4.9.0-9-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-e582-48x6q
 Architecture: amd64
-Depends: linux-image-4.9.0-8-amd64
+Depends: linux-image-4.9.0-9-amd64
 Description: kernel modules for platform devices such as fan, led, sfp
 

platform/broadcom/sonic-platform-modules-s6000/debian/control

@@ -1,4 +1,4 @@
-MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/6ea244309b944af3bb34a9b99ad6ed60c5dc9937/sdk
+MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/378cc53bef634b6ae192819d7f412fb1543faff6/sdk
 MLNX_SDK_VERSION = 4.3.0136
 MLNX_SDK_RDEBS += $(APPLIBS) $(IPROUTE2_MLNX) $(SX_ACL_RM) $(SX_COMPLIB) \
 		  $(SX_EXAMPLES) $(SX_GEN_UTILS) $(SX_SCEW) $(SX_SDN_HAL) \