matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update src/sonic-linux-kernel to point to the 5.10 kernel

Browse Source 
Some patches have been enabled at this point, others need more rework.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
This commit is contained in:
Saikrishna Arcot 2021-07-08 17:40:04 -07:00 committed by Saikrishna Arcot
parent 6105684b9e
commit 20598f3019
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build_debian.sh
View File

@ -31,8 +31,8 @@ set -x -e
CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64) CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64)
## docker engine version (with platform) ## docker engine version (with platform)
DOCKER_VERSION=5:18.09.8~3-0~debian-$IMAGE_DISTRO DOCKER_VERSION=5:20.10.7~3-0~debian-$IMAGE_DISTRO
LINUX_KERNEL_VERSION=4.19.0-12-2 LINUX_KERNEL_VERSION=5.10.0-8-2
## Working directory to prepare the file system ## Working directory to prepare the file system
FILESYSTEM_ROOT=./fsroot FILESYSTEM_ROOT=./fsroot

4
installer/x86_64/install.sh
View File

@ -674,13 +674,13 @@ menuentry '$demo_grub_entry' {
if [ x$grub_platform = xxen ]; then insmod xzio; insmod lzopio; fi if [ x$grub_platform = xxen ]; then insmod xzio; insmod lzopio; fi
insmod part_msdos insmod part_msdos
insmod ext2 insmod ext2
linux /$image_dir/boot/vmlinuz-4.19.0-12-2-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \ linux /$image_dir/boot/vmlinuz-5.10.0-8-2-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
net.ifnames=0 biosdevname=0 \ net.ifnames=0 biosdevname=0 \
loop=$image_dir/$FILESYSTEM_SQUASHFS loopfstype=squashfs \ loop=$image_dir/$FILESYSTEM_SQUASHFS loopfstype=squashfs \
systemd.unified_cgroup_hierarchy=0 \ systemd.unified_cgroup_hierarchy=0 \
apparmor=1 security=apparmor varlog_size=$VAR_LOG_SIZE usbcore.autosuspend=-1 $ONIE_PLATFORM_EXTRA_CMDLINE_LINUX 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 ...' echo 'Loading $demo_volume_label $demo_type initial ramdisk ...'
initrd /$image_dir/boot/initrd.img-4.19.0-12-2-amd64 initrd /$image_dir/boot/initrd.img-5.10.0-8-2-amd64
} }
EOF EOF

6
rules/linux-kernel.mk
View File

@ -1,9 +1,9 @@
# linux kernel package # linux kernel package
KVERSION_SHORT = 4.19.0-12-2 KVERSION_SHORT = 5.10.0-8-2
KVERSION = $(KVERSION_SHORT)-$(CONFIGURED_ARCH) KVERSION = $(KVERSION_SHORT)-$(CONFIGURED_ARCH)
KERNEL_VERSION = 4.19.152 KERNEL_VERSION = 5.10.46
KERNEL_SUBVERSION = 1 KERNEL_SUBVERSION = 4
ifeq ($(CONFIGURED_ARCH), armhf) ifeq ($(CONFIGURED_ARCH), armhf)
# Override kernel version for ARMHF as it uses arm MP (multi-platform) for short version # Override kernel version for ARMHF as it uses arm MP (multi-platform) for short version
KVERSION = $(KVERSION_SHORT)-armmp KVERSION = $(KVERSION_SHORT)-armmp

2
src/sonic-linux-kernel

@ -1 +1 @@
Subproject commit 0fe396ef3f15f6ac57c1a850265589827401446b Subproject commit 56b08d07359ce947dd439da48edf4ebf21d02285