[kernel]: upgrade linux kernel to 4.9.118 (#4897)

upgrade kernel to latest maintenance version 4.9.118 Signed-off-by: Guohan Lu <lguohan@gmail.com>
sonic-net · Jul 7, 2020 · fa885c9 · fa885c9
1 parent 31baf38
commit fa885c9
Show file tree

Hide file tree

Showing 28 changed files with 58 additions and 58 deletions.
diff --git a/build_debian.sh b/build_debian.sh
@@ -37,7 +37,7 @@ if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
 else
     DOCKER_VERSION=5:18.09.8~3-0~debian-$IMAGE_DISTRO
 fi
-LINUX_KERNEL_VERSION=4.19.0-6-2
+LINUX_KERNEL_VERSION=4.19.0-9-2
 
 ## Working directory to prepare the file system
 FILESYSTEM_ROOT=./fsroot

diff --git 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.19.0-6-2-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX  \
+        linux   /$image_dir/boot/vmlinuz-4.19.0-9-2-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.19.0-6-2-amd64
+        initrd  /$image_dir/boot/initrd.img-4.19.0-9-2-amd64
 }
 EOF
 

diff --git 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.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for bfn asic for mmap
 
diff --git 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.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git 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.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel module for bfn platform fpga and scripts for the devices such as fan, led, sfp
 
diff --git 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.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git 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-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git 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.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for broadcom SAI
diff --git a/platform/broadcom/saibcm-modules/debian/opennsl-modules.dirs b/platform/broadcom/saibcm-modules/debian/opennsl-modules.dirs
@@ -1 +1 @@
-lib/modules/4.19.0-6-2-amd64/extra
+lib/modules/4.19.0-9-2-amd64/extra
diff --git 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.19.0-6-2-amd64/extra
-systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.19.0-6-2-amd64/extra
-systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.19.0-6-2-amd64/extra
-systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.19.0-6-2-amd64/extra
-systems/linux/user/x86-smp_generic_64-2_6/psample.ko lib/modules/4.19.0-6-2-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.19.0-9-2-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.19.0-9-2-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.19.0-9-2-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.19.0-9-2-amd64/extra
+systems/linux/user/x86-smp_generic_64-2_6/psample.ko lib/modules/4.19.0-9-2-amd64/extra
 systemd/opennsl-modules.service lib/systemd/system
diff --git a/platform/broadcom/saibcm-modules/debian/rules b/platform/broadcom/saibcm-modules/debian/rules
@@ -34,7 +34,7 @@ sname:=opennsl
 PACKAGE=opennsl-modules
 # modifieable for experiments or debugging m-a
 MA_DIR ?= /usr/share/modass
-KVERSION ?= 4.19.0-6-2-amd64
+KVERSION ?= 4.19.0-9-2-amd64
 # load generic variable handling
 -include $(MA_DIR)/include/generic.make
 # load default rules, including kdist, kdist_image, ...

diff --git 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.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: sonic-platform-alphanetworks-snh60b0-640f
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git 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.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 
 Package: platform-modules-haliburton
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-seastone2
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as led, sfp
 
 Package: platform-modules-silverstone
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as led, sfp.
diff --git 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.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-z9100
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-s6100
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-z9264f
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-s5232f
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-s5248f
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-z9332f
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
diff --git a/platform/broadcom/sonic-platform-modules-delta/debian/control b/platform/broadcom/sonic-platform-modules-delta/debian/control
@@ -7,30 +7,30 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-ag9032v1
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-ag9064
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-ag5648
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-et-6248brb
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-ag9032v2a
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as syseeprom, sfp
 
 Package: platform-modules-agc032
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
diff --git 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.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led
 
 Package: platform-modules-d7054q28b
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led
 
 Package: platform-modules-d6254qs
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led
 
 Package: platform-modules-d6556
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led
 
 Package: platform-modules-d6356
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led
 
 Package: platform-modules-d7264q28b
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led
diff --git 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-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git a/platform/cavium/cavm_platform_modules/DEBIAN/control b/platform/cavium/cavm_platform_modules/DEBIAN/control
@@ -1,6 +1,6 @@
 Package: cavm-platform-modules
 Version: 1.0
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Maintainer: Nadiya.Stetskovych@cavium.com
 Description: kernel modules for platform devices such as fan, led, sfp
diff --git a/platform/centec/sonic-platform-modules-e582/debian/control b/platform/centec/sonic-platform-modules-e582/debian/control
@@ -7,11 +7,11 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-e582-48x2q4z
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: platform-modules-e582-48x6q
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git a/platform/centec/sonic-platform-modules-embedway/debian/control b/platform/centec/sonic-platform-modules-embedway/debian/control
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-embedway-es6220
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git a/platform/innovium/sonic-platform-modules-cel/debian/control b/platform/innovium/sonic-platform-modules-cel/debian/control
@@ -7,5 +7,5 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-midstone-200i
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices
diff --git a/platform/innovium/sonic-platform-modules-delta/debian/control b/platform/innovium/sonic-platform-modules-delta/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.9.3
 
 Package: platform-modules-et-c032if
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 
diff --git a/platform/nephos/nephos-modules/debian/control b/platform/nephos/nephos-modules/debian/control
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
 
 Package: nephos-modules
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for nephos asic
 
diff --git a/platform/nephos/sonic-platform-modules-accton/debian/control b/platform/nephos/sonic-platform-modules-accton/debian/control
@@ -7,5 +7,5 @@ Standards-Version: 3.9.3
 
 Package: sonic-platform-accton-as7116-54x
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
diff --git a/platform/nephos/sonic-platform-modules-cig/debian/control b/platform/nephos/sonic-platform-modules-cig/debian/control
@@ -7,15 +7,15 @@ Standards-Version: 3.9.3
 
 Package: sonic-platform-cig-cs6436-56p
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: sonic-platform-cig-cs6436-54p
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
 Package: sonic-platform-cig-cs5435-54p
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
diff --git a/platform/nephos/sonic-platform-modules-pegatron/debian/control b/platform/nephos/sonic-platform-modules-pegatron/debian/control
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
 
 Package: sonic-platform-pegatron-porsche
 Architecture: amd64
-Depends: linux-image-4.19.0-6-2-amd64-unsigned
+Depends: linux-image-4.19.0-9-2-amd64-unsigned
 Description: kernel modules for platform devices such as fan, led, sfp
 
diff --git a/rules/linux-kernel.mk b/rules/linux-kernel.mk
@@ -1,9 +1,9 @@
 # linux kernel package
 
-KVERSION_SHORT = 4.19.0-6-2
+KVERSION_SHORT = 4.19.0-9-2
 KVERSION = $(KVERSION_SHORT)-$(CONFIGURED_ARCH)
-KERNEL_VERSION = 4.19.67
-KERNEL_SUBVERSION = 2+deb10u2
+KERNEL_VERSION = 4.19.118
+KERNEL_SUBVERSION = 2+deb10u1
 ifeq ($(CONFIGURED_ARCH), armhf)
 # Override kernel version for ARMHF as it uses arm MP (multi-platform) for short version
 KVERSION = $(KVERSION_SHORT)-armmp

diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel