Skip to content

Commit bfd3238

Browse files
committed
Update to Linux 6.1.123
Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
1 parent 2ab6278 commit bfd3238

33 files changed

Lines changed: 95 additions & 95 deletions

File tree

build_debian.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64)
3333
## docker engine version (with platform)
3434
DOCKER_VERSION=5:24.0.2-1~debian.12~$IMAGE_DISTRO
3535
CONTAINERD_IO_VERSION=1.6.21-1
36-
LINUX_KERNEL_VERSION=6.1.0-22-2
36+
LINUX_KERNEL_VERSION=6.1.0-29-2
3737

3838
## Working directory to prepare the file system
3939
FILESYSTEM_ROOT=./fsroot

files/dsc/install_debian.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,8 @@ cat <<EOF >> $root_mnt/$BL_CONF
244244
default main
245245
246246
label main
247-
kernel /$image_dir/boot/vmlinuz-6.1.0-22-2-arm64
248-
initrd /$image_dir/boot/initrd.img-6.1.0-22-2-arm64
247+
kernel /$image_dir/boot/vmlinuz-6.1.0-29-2-arm64
248+
initrd /$image_dir/boot/initrd.img-6.1.0-29-2-arm64
249249
devicetree /$image_dir/boot/elba-asic-psci.dtb
250250
append softdog.soft_panic=1 FW_NAME=mainfwa root=/dev/mmcblk0p10 rw rootwait rootfstype=ext4 loopfstype=squashfs loop=/$image_dir/fs.squashfs
251251
}

installer/default_platform.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -588,13 +588,13 @@ menuentry '$demo_grub_entry' {
588588
if [ x$grub_platform = xxen ]; then insmod xzio; insmod lzopio; fi
589589
insmod part_msdos
590590
insmod ext2
591-
$GRUB_CFG_LINUX_CMD /$image_dir/boot/vmlinuz-6.1.0-22-2-${arch} root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
591+
$GRUB_CFG_LINUX_CMD /$image_dir/boot/vmlinuz-6.1.0-29-2-${arch} root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
592592
net.ifnames=0 biosdevname=0 \
593593
loop=$image_dir/$FILESYSTEM_SQUASHFS loopfstype=squashfs \
594594
systemd.unified_cgroup_hierarchy=0 \
595595
apparmor=1 security=apparmor varlog_size=$VAR_LOG_SIZE usbcore.autosuspend=-1 $ONIE_PLATFORM_EXTRA_CMDLINE_LINUX
596596
echo 'Loading $demo_volume_label $demo_type initial ramdisk ...'
597-
$GRUB_CFG_INITRD_CMD /$image_dir/boot/initrd.img-6.1.0-22-2-${arch}
597+
$GRUB_CFG_INITRD_CMD /$image_dir/boot/initrd.img-6.1.0-29-2-${arch}
598598
}
599599
EOF
600600

platform/barefoot/bfn-modules/debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
77

88
Package: bfn-modules
99
Architecture: amd64
10-
Depends: linux-image-6.1.0-22-2-amd64-unsigned
10+
Depends: linux-image-6.1.0-29-2-amd64-unsigned
1111
Description: kernel modules for bfn asic for mmap
1212

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
77

88
Package: sonic-platform-modules-bfn-montara
99
Architecture: amd64
10-
Depends: linux-image-6.1.0-22-2-amd64-unsigned
10+
Depends: linux-image-6.1.0-29-2-amd64-unsigned
1111
Description: kernel modules for platform devices such as fan, led, sfp
1212

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ Standards-Version: 3.9.3
77

88
Package: sonic-platform-modules-bfn-newport-as9516
99
Architecture: amd64
10-
Depends: linux-image-6.1.0-22-2-amd64-unsigned
10+
Depends: linux-image-6.1.0-29-2-amd64-unsigned
1111
Description: kernel module for bfn platform fpga and scripts for the devices such as fan, led, sfp
1212

1313
Package: sonic-platform-modules-bfn-newport-as9516bf
1414
Architecture: amd64
15-
Depends: linux-image-6.1.0-22-2-amd64-unsigned
15+
Depends: linux-image-6.1.0-29-2-amd64-unsigned
1616
Description: kernel module for bfn platform fpga and scripts for the devices such as fan, led, sfp
1717

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
77

88
Package: sonic-platform-modules-bfn
99
Architecture: amd64
10-
Depends: linux-image-6.1.0-22-2-amd64-unsigned
10+
Depends: linux-image-6.1.0-29-2-amd64-unsigned
1111
Description: kernel modules for platform devices such as fan, led, sfp
1212

platform/barefoot/sonic-platform-modules-wnc-osw1800/debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
77

88
Package: platform-modules-wnc-osw1800
99
Architecture: amd64
10-
Depends: linux-image-6.1.0-22-2-amd64-unsigned
10+
Depends: linux-image-6.1.0-29-2-amd64-unsigned
1111
Description: kernel modules for platform devices such as fan, led, sfp
1212

platform/broadcom/saibcm-modules/debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ Standards-Version: 3.9.3
1010
Package: opennsl-modules
1111
Architecture: amd64
1212
Section: main
13-
Depends: linux-image-6.1.0-22-2-amd64-unsigned
13+
Depends: linux-image-6.1.0-29-2-amd64-unsigned
1414
Description: kernel modules for broadcom SAI

0 commit comments

Comments
 (0)