Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[202205] Update Linux kernel to 5.10.179 #17569

Merged
merged 1 commit into from
Dec 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build_debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64)
## docker engine version (with platform)
DOCKER_VERSION=5:20.10.14~3-0~debian-$IMAGE_DISTRO
CONTAINERD_IO_VERSION=1.5.11-1
LINUX_KERNEL_VERSION=5.10.0-18-2
LINUX_KERNEL_VERSION=5.10.0-23-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 @@ -682,13 +682,13 @@ 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-5.10.0-18-2-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
linux /$image_dir/boot/vmlinuz-5.10.0-23-2-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
net.ifnames=0 biosdevname=0 \
loop=$image_dir/$FILESYSTEM_SQUASHFS loopfstype=squashfs \
systemd.unified_cgroup_hierarchy=0 \
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-5.10.0-18-2-amd64
initrd /$image_dir/boot/initrd.img-5.10.0-23-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-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-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-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-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-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-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-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-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-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-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-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-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-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Description: kernel modules for broadcom SAI
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lib/modules/5.10.0-18-2-amd64/extra
lib/modules/5.10.0-23-2-amd64/extra
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/5.10.0-18-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/5.10.0-18-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/5.10.0-18-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/5.10.0-18-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/5.10.0-23-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/5.10.0-23-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/5.10.0-23-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/5.10.0-23-2-amd64/extra
systemd/opennsl-modules.service lib/systemd/system
sdklt/linux/bde/linux_ngbde.ko lib/modules/5.10.0-18-2-amd64/extra
sdklt/linux/knet/linux_ngknet.ko lib/modules/5.10.0-18-2-amd64/extra
sdklt/linux/knetcb/linux_ngknetcb.ko lib/modules/5.10.0-18-2-amd64/extra
sdklt/linux/bde/linux_ngbde.ko lib/modules/5.10.0-23-2-amd64/extra
sdklt/linux/knet/linux_ngknet.ko lib/modules/5.10.0-23-2-amd64/extra
sdklt/linux/knetcb/linux_ngknetcb.ko lib/modules/5.10.0-23-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 ?= 5.10.0-18-2-amd64
KERNVERSION ?= 5.10.0-18-2
KVERSION ?= 5.10.0-23-2-amd64
KERNVERSION ?= 5.10.0-23-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,16 +7,16 @@ Standards-Version: 3.9.3

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

Package: sonic-platform-alphanetworks-snj60d0-320f
Architecture: amd64
Depends: linux-image-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

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

Package: platform-modules-dx010
Architecture: amd64
Depends: linux-image-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp


Package: platform-modules-haliburton
Architecture: amd64
Depends: linux-image-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-seastone2
Architecture: amd64
Depends: linux-image-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Description: kernel modules for platform devices such as led, sfp

Package: platform-modules-silverstone
Architecture: amd64
Depends: linux-image-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Description: kernel modules for platform devices such as led, sfp.

Package: platform-modules-belgite
Architecture: amd64
Depends: linux-image-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Description: kernel modules for platform devices such as led, sfp
24 changes: 12 additions & 12 deletions platform/broadcom/sonic-platform-modules-dell/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,60 +7,60 @@ Standards-Version: 3.9.3

Package: platform-modules-s6000
Architecture: amd64
Depends: linux-image-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-z9100
Architecture: amd64
Depends: linux-image-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-s6100
Architecture: amd64
Depends: linux-image-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-z9264f
Architecture: amd64
Depends: linux-image-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-s5212f
Architecture: amd64
Depends: linux-image-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-s5224f
Architecture: amd64
Depends: linux-image-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-s5232f
Architecture: amd64
Depends: linux-image-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-s5248f
Architecture: amd64
Depends: linux-image-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-n3248te
Architecture: amd64
Depends: linux-image-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-z9332f
Architecture: amd64
Depends: linux-image-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-n3248pxe
Architecture: amd64
Depends: linux-image-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-s5296f
Architecture: amd64
Depends: linux-image-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-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,20 +7,20 @@ Standards-Version: 3.9.3

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

Package: platform-modules-e530-24x2c
Architecture: arm64
Depends: linux-image-5.10.0-18-2-arm64-unsigned
Depends: linux-image-5.10.0-23-2-arm64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-e530-48s4x
Architecture: arm64
Depends: linux-image-5.10.0-18-2-arm64-unsigned
Depends: linux-image-5.10.0-23-2-arm64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-e530-24x2q
Architecture: arm64
Depends: linux-image-5.10.0-18-2-arm64-unsigned
Depends: linux-image-5.10.0-23-2-arm64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
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-5.10.0-18-2-arm64");
data = /incbin/("./vmlinuz-5.10.0-23-2-arm64");
type = "kernel";
arch = "arm64";
os = "linux";
Expand All @@ -25,7 +25,7 @@
};
initramfs {
description = "initramfs";
data = /incbin/("./initrd.img-5.10.0-18-2-arm64");
data = /incbin/("./initrd.img-5.10.0-23-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-5.10.0-18-2-arm64-unsigned
Depends: linux-image-5.10.0-23-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/5.10.0-18-2-arm64/kernel/extra
src/pwm-ctc/pwm-ctc.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
src/ctc5236_switch/ctc5236_switch.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
src/pinctrl-ctc/pinctrl-ctc.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
src/ctc_wdt/ctc_wdt.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
src/ctcmac/ctcmac.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
src/ctcmac/ctc5236_mdio.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
src/ctc-phy/mars.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
src/i2c-ctc/i2c-ctc.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
src/gpio-ctc/gpio-ctc.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
src/ehci-ctc/ehci-ctc.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
src/rtc-sd2405/rtc-sd2405.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
src/sdhci-ctc5236/sdhci-ctc5236.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
src/spi-ctc-qspi/spi-ctc-qspi.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra
src/ctc5236-mc/ctc5236-mc.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/pwm-ctc/pwm-ctc.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/ctc5236_switch/ctc5236_switch.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/pinctrl-ctc/pinctrl-ctc.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/ctc_wdt/ctc_wdt.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/ctcmac/ctcmac.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/ctcmac/ctc5236_mdio.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/ctc-phy/mars.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/i2c-ctc/i2c-ctc.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/gpio-ctc/gpio-ctc.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/ehci-ctc/ehci-ctc.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/rtc-sd2405/rtc-sd2405.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/sdhci-ctc5236/sdhci-ctc5236.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra
src/spi-ctc-qspi/spi-ctc-qspi.ko /lib/modules/5.10.0-23-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-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-e582-48x6q
Architecture: amd64
Depends: linux-image-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-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-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

6 changes: 3 additions & 3 deletions platform/centec/sonic-platform-modules-v682/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ Standards-Version: 3.9.3

Package: platform-modules-v682-48y8c-d
Architecture: amd64
Depends: linux-image-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-v682-48y8c
Architecture: amd64
Depends: linux-image-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-v682-48x8c
Architecture: amd64
Depends: linux-image-5.10.0-18-2-amd64-unsigned
Depends: linux-image-5.10.0-23-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
4 changes: 2 additions & 2 deletions platform/marvell-armhf/platform.conf
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ fdt_addr=0x2800000
fdt_high=0x28fffff
initrd_addr=0x2900000

kernel_fname="/boot/vmlinuz-5.10.0-18-2-armmp"
initrd_fname="/boot/initrd.img-5.10.0-18-2-armmp"
kernel_fname="/boot/vmlinuz-5.10.0-23-2-armmp"
initrd_fname="/boot/initrd.img-5.10.0-23-2-armmp"
fdt_fname="/boot/armada-385-ET6448M_4G_Nand.dtb"

if [ "$install_env" = "onie" ]; then
Expand Down
6 changes: 3 additions & 3 deletions rules/linux-kernel.mk
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# linux kernel package

KVERSION_SHORT = 5.10.0-18-2
KVERSION_SHORT = 5.10.0-23-2
KVERSION = $(KVERSION_SHORT)-$(CONFIGURED_ARCH)
KERNEL_VERSION = 5.10.140
KERNEL_SUBVERSION = 1
KERNEL_VERSION = 5.10.179
KERNEL_SUBVERSION = 3
ifeq ($(CONFIGURED_ARCH), armhf)
# Override kernel version for ARMHF as it uses arm MP (multi-platform) for short version
KVERSION = $(KVERSION_SHORT)-armmp
Expand Down
Loading