Skip to content

Commit

Permalink
[sonic-linux-kernel]: security update to kernel 4.19.152 (#6490)
Browse files Browse the repository at this point in the history
Signed-off-by: Guohan Lu <lguohan@gmail.com>
  • Loading branch information
lguohan authored and daall committed Feb 16, 2021
1 parent c705916 commit ab03441
Show file tree
Hide file tree
Showing 35 changed files with 87 additions and 87 deletions.
2 changes: 1 addition & 1 deletion build_debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64)

## docker engine version (with platform)
DOCKER_VERSION=5:18.09.8~3-0~debian-$IMAGE_DISTRO
LINUX_KERNEL_VERSION=4.19.0-9-2
LINUX_KERNEL_VERSION=4.19.0-12-2

## Working directory to prepare the file system
FILESYSTEM_ROOT=./fsroot
Expand Down
4 changes: 2 additions & 2 deletions installer/x86_64/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -624,12 +624,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-9-2-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
linux /$image_dir/boot/vmlinuz-4.19.0-12-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-9-2-amd64
initrd /$image_dir/boot/initrd.img-4.19.0-12-2-amd64
}
EOF
Expand Down
2 changes: 1 addition & 1 deletion platform/barefoot/bfn-modules/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Standards-Version: 3.9.3

Package: bfn-modules
Architecture: amd64
Depends: linux-image-4.19.0-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-2-amd64-unsigned
Description: kernel modules for bfn asic for mmap

Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Standards-Version: 3.9.3

Package: sonic-platform-modules-bfn-montara
Architecture: amd64
Depends: linux-image-4.19.0-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ Standards-Version: 3.9.3

Package: sonic-platform-modules-bfn-newport-as9516
Architecture: amd64
Depends: linux-image-4.19.0-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-2-amd64-unsigned
Description: kernel module for bfn platform fpga and scripts for the devices such as fan, led, sfp

Package: sonic-platform-modules-bfn-newport-as9516bf
Architecture: amd64
Depends: linux-image-4.19.0-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-2-amd64-unsigned
Description: kernel module for bfn platform fpga and scripts for the devices such as fan, led, sfp

Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Standards-Version: 3.9.3

Package: sonic-platform-modules-bfn
Architecture: amd64
Depends: linux-image-4.19.0-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Standards-Version: 3.9.3

Package: platform-modules-wnc-osw1800
Architecture: amd64
Depends: linux-image-4.19.0-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

2 changes: 1 addition & 1 deletion platform/broadcom/saibcm-modules/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ Standards-Version: 3.9.3
Package: opennsl-modules
Architecture: amd64
Section: main
Depends: linux-image-4.19.0-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-2-amd64-unsigned
Description: kernel modules for broadcom SAI
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lib/modules/4.19.0-9-2-amd64/extra
lib/modules/4.19.0-12-2-amd64/extra
12 changes: 6 additions & 6 deletions platform/broadcom/saibcm-modules/debian/opennsl-modules.install
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
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
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-ptp-clock.ko lib/modules/4.19.0-9-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.19.0-12-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.19.0-12-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.19.0-12-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.19.0-12-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/psample.ko lib/modules/4.19.0-12-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-ptp-clock.ko lib/modules/4.19.0-12-2-amd64/extra
systemd/opennsl-modules.service lib/systemd/system
sdklt/linux/bde/linux_ngbde.ko lib/modules/4.19.0-9-2-amd64/extra
4 changes: 2 additions & 2 deletions platform/broadcom/saibcm-modules/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ sname:=opennsl
PACKAGE=opennsl-modules
# modifieable for experiments or debugging m-a
MA_DIR ?= /usr/share/modass
KVERSION ?= 4.19.0-9-2-amd64
KERNVERSION ?= 4.19.0-9-2
KVERSION ?= 4.19.0-12-2-amd64
KERNVERSION ?= 4.19.0-12-2

# load generic variable handling
-include $(MA_DIR)/include/generic.make
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ Standards-Version: 3.9.3

Package: sonic-platform-alphanetworks-snh60a0-320fv2
Architecture: amd64
Depends: linux-image-4.19.0-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-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-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

8 changes: 4 additions & 4 deletions platform/broadcom/sonic-platform-modules-cel/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@ Standards-Version: 3.9.3

Package: platform-modules-dx010
Architecture: amd64
Depends: linux-image-4.19.0-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-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-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-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-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-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-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-2-amd64-unsigned
Description: kernel modules for platform devices such as led, sfp.
14 changes: 7 additions & 7 deletions platform/broadcom/sonic-platform-modules-dell/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,37 +7,37 @@ Standards-Version: 3.9.3

Package: platform-modules-s6000
Architecture: amd64
Depends: linux-image-4.19.0-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-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-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-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-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-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-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-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-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-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-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-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-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-s5296f
Expand Down
12 changes: 6 additions & 6 deletions platform/broadcom/sonic-platform-modules-delta/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,30 @@ Standards-Version: 3.9.3

Package: platform-modules-ag9032v1
Architecture: amd64
Depends: linux-image-4.19.0-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-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-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-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-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-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-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-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-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-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-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
14 changes: 7 additions & 7 deletions platform/broadcom/sonic-platform-modules-inventec/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,35 +7,35 @@ Standards-Version: 3.9.3

Package: platform-modules-d7032q28b
Architecture: amd64
Depends: linux-image-4.19.0-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-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-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-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-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-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-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-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-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-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-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led

Package: platform-modules-d6332
Architecture: amd64
Depends: linux-image-4.19.0-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Standards-Version: 3.9.3

Package: sonic-platform-mitac-ly1200-32x
Architecture: amd64
Depends: linux-image-4.19.0-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

2 changes: 1 addition & 1 deletion platform/cavium/cavm_platform_modules/DEBIAN/control
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: cavm-platform-modules
Version: 1.0
Architecture: amd64
Depends: linux-image-4.19.0-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-2-amd64-unsigned
Maintainer: Nadiya.Stetskovych@cavium.com
Description: kernel modules for platform devices such as fan, led, sfp
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ Standards-Version: 3.9.3

Package: platform-modules-e530-48t4x-p
Architecture: arm64
Depends: linux-image-4.19.0-9-2-arm64-unsigned
Depends: linux-image-4.19.0-12-2-arm64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-e530-24x2c
Architecture: arm64
Depends: linux-image-4.19.0-9-2-arm64-unsigned
Depends: linux-image-4.19.0-12-2-arm64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
../../centec/centec-dal/dal.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
24x2c/modules/centec_e530_24x2c_platform.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
../../centec/centec-dal/dal.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
24x2c/modules/centec_e530_24x2c_platform.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
24x2c/service/24x2c_platform.service /lib/systemd/system
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
../../centec/centec-dal/dal.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
48t4x_p/modules/centec_e530_48t4x_p_platform.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
../../centec/centec-dal/dal.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
48t4x_p/modules/centec_e530_48t4x_p_platform.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
48t4x_p/service/48t4x_p_platform.service /lib/systemd/system
4 changes: 2 additions & 2 deletions platform/centec-arm64/sonic_fit.its
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
images {
kernel_ctc {
description = "ARM64 Kernel";
data = /incbin/("./vmlinuz-4.19.0-9-2-arm64");
data = /incbin/("./vmlinuz-4.19.0-12-2-arm64");
type = "kernel";
arch = "arm64";
os = "linux";
Expand All @@ -25,7 +25,7 @@
};
initramfs {
description = "initramfs";
data = /incbin/("./initrd.img-4.19.0-9-2-arm64");
data = /incbin/("./initrd.img-4.19.0-12-2-arm64");
type = "ramdisk";
arch = "arm64";
os = "linux";
Expand Down
2 changes: 1 addition & 1 deletion platform/centec-arm64/tsingma-bsp/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ Standards-Version: 3.9.3

Package: tsingma-bsp
Architecture: arm64
Depends: linux-image-4.19.0-9-2-arm64-unsigned
Depends: linux-image-4.19.0-12-2-arm64-unsigned
Description: kernel modules for tsingma bsp
28 changes: 14 additions & 14 deletions platform/centec-arm64/tsingma-bsp/debian/tsingma-bsp.install
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
src/ctc5236-mc/ctc5236-mc.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
src/pwm-ctc/pwm-ctc.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
src/ctc5236_switch/ctc5236_switch.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
src/pinctrl-ctc/pinctrl-ctc.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
src/ctc_wdt/ctc_wdt.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
src/ctcmac/ctcmac.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
src/ctcmac/ctcmac_test.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
src/ctcmac/ctc5236_mdio.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
src/i2c-ctc/i2c-ctc.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
src/gpio-ctc/gpio-ctc.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
src/ehci-ctc/ehci-ctc.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
src/rtc-sd2405/rtc-sd2405.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
src/sdhci-ctc5236/sdhci-ctc5236.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
src/spi-ctc-qspi/spi-ctc-qspi.ko /lib/modules/4.19.0-9-2-arm64/kernel/extra
src/ctc5236-mc/ctc5236-mc.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
src/pwm-ctc/pwm-ctc.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
src/ctc5236_switch/ctc5236_switch.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
src/pinctrl-ctc/pinctrl-ctc.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
src/ctc_wdt/ctc_wdt.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
src/ctcmac/ctcmac.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
src/ctcmac/ctcmac_test.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
src/ctcmac/ctc5236_mdio.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
src/i2c-ctc/i2c-ctc.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
src/gpio-ctc/gpio-ctc.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
src/ehci-ctc/ehci-ctc.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
src/rtc-sd2405/rtc-sd2405.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
src/sdhci-ctc5236/sdhci-ctc5236.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
src/spi-ctc-qspi/spi-ctc-qspi.ko /lib/modules/4.19.0-12-2-arm64/kernel/extra
src/ctc-dts/e530-ctc5236.dtb /boot/
src/config/fw_env.config /etc/
src/config/tsingma-bsp.service /lib/systemd/system
4 changes: 2 additions & 2 deletions platform/centec/sonic-platform-modules-e582/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ Standards-Version: 3.9.3

Package: platform-modules-e582-48x2q4z
Architecture: amd64
Depends: linux-image-4.19.0-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-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-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Standards-Version: 3.9.3

Package: platform-modules-embedway-es6220
Architecture: amd64
Depends: linux-image-4.19.0-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ Standards-Version: 3.9.3

Package: platform-modules-midstone-200i
Architecture: amd64
Depends: linux-image-4.19.0-9-2-amd64-unsigned
Depends: linux-image-4.19.0-12-2-amd64-unsigned
Description: kernel modules for platform devices
Loading

0 comments on commit ab03441

Please sign in to comment.