diff --git a/build_debian.sh b/build_debian.sh index c6623ae9ac62..37829b066990 100755 --- a/build_debian.sh +++ b/build_debian.sh @@ -34,7 +34,7 @@ set -x -e ## docker engine version (with platform) DOCKER_VERSION=1.11.1-0~stretch_amd64 -LINUX_KERNEL_VERSION=4.9.0-3 +LINUX_KERNEL_VERSION=4.9.0-5 ## Working directory to prepare the file system FILESYSTEM_ROOT=./fsroot diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2 index 00924f00ab3e..6de14fb6c6f8 100644 --- a/files/Aboot/boot0.j2 +++ b/files/Aboot/boot0.j2 @@ -18,8 +18,8 @@ set -x -kernel=boot/vmlinuz-4.9.0-3-amd64 -initrd=boot/initrd.img-4.9.0-3-amd64 +kernel=boot/vmlinuz-4.9.0-5-amd64 +initrd=boot/initrd.img-4.9.0-5-amd64 kernel_params=kernel-params aboot_machine="arista_unknown" diff --git a/files/build_templates/swss.service.j2 b/files/build_templates/swss.service.j2 index 3c67c7c2dc19..a83bc2947683 100644 --- a/files/build_templates/swss.service.j2 +++ b/files/build_templates/swss.service.j2 @@ -2,16 +2,16 @@ Description=switch state service Requires=database.service {% if sonic_asic_platform == 'broadcom' %} -Requires=opennsl-modules-4.9.0-3-amd64.service +Requires=opennsl-modules-4.9.0-5-amd64.service {% elif sonic_asic_platform == 'nephos' %} -Requires=nps-modules-4.9.0-3-amd64.service +Requires=nps-modules-4.9.0-5-amd64.service {% endif %} After=database.service After=interfaces-config.service {% if sonic_asic_platform == 'broadcom' %} -After=opennsl-modules-4.9.0-3-amd64.service +After=opennsl-modules-4.9.0-5-amd64.service {% elif sonic_asic_platform == 'nephos' %} -After=nps-modules-4.9.0-3-amd64.service +After=nps-modules-4.9.0-5-amd64.service {% endif %} [Service] diff --git a/installer/x86_64/install.sh b/installer/x86_64/install.sh index dc4100145060..2e4606ff11ae 100755 --- a/installer/x86_64/install.sh +++ b/installer/x86_64/install.sh @@ -549,12 +549,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.9.0-3-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \ + linux /$image_dir/boot/vmlinuz-4.9.0-5-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 $ONIE_PLATFORM_EXTRA_CMDLINE_LINUX echo 'Loading $demo_volume_label $demo_type initial ramdisk ...' - initrd /$image_dir/boot/initrd.img-4.9.0-3-amd64 + initrd /$image_dir/boot/initrd.img-4.9.0-5-amd64 } EOF diff --git a/platform/broadcom/sdk.mk b/platform/broadcom/sdk.mk index abdf689fe346..12b0262b9305 100644 --- a/platform/broadcom/sdk.mk +++ b/platform/broadcom/sdk.mk @@ -1,4 +1,4 @@ -BRCM_OPENNSL_KERNEL = opennsl-modules-4.9.0-3-amd64_3.2.3.3-2_amd64.deb -$(BRCM_OPENNSL_KERNEL)_URL = "https://sonicstorage.blob.core.windows.net/packages/opennsl-modules-4.9.0-3-amd64_3.2.3.3-2_amd64.deb?sv=2015-04-05&sr=b&sig=HieTgULvva7WlMRegUhfoRFqkj2Oe9sAVxU%2FgCGj9Ys%3D&se=2154-09-28T04%3A46%3A03Z&sp=r" +BRCM_OPENNSL_KERNEL = opennsl-modules-4.9.0-5-amd64_3.2.3.7-1_amd64.deb +$(BRCM_OPENNSL_KERNEL)_URL = "https://sonicstorage.blob.core.windows.net/packages/opennsl-modules-4.9.0-5-amd64_3.2.3.7-1_amd64.deb?sv=2015-04-05&sr=b&sig=nju9vaqIjRlzV7V0wirMP6%2FNCJRsNqC%2FdqdqgxA0wrQ%3D&se=2154-12-03T07%3A37%3A17Z&sp=r" SONIC_ONLINE_DEBS += $(BRCM_OPENNSL_KERNEL) diff --git a/platform/broadcom/sonic-platform-modules-s6000 b/platform/broadcom/sonic-platform-modules-s6000 index ffec0b20b7ec..98377edb198b 160000 --- a/platform/broadcom/sonic-platform-modules-s6000 +++ b/platform/broadcom/sonic-platform-modules-s6000 @@ -1 +1 @@ -Subproject commit ffec0b20b7eca5a8cc2055d992d88a8d6f53b681 +Subproject commit 98377edb198b8b638ac382dae4c6c5da6376afe6 diff --git a/rules/linux-kernel.mk b/rules/linux-kernel.mk index f1d589505a4d..333301644d50 100644 --- a/rules/linux-kernel.mk +++ b/rules/linux-kernel.mk @@ -1,9 +1,9 @@ # linux kernel package -KVERSION_SHORT = 4.9.0-3 +KVERSION_SHORT = 4.9.0-5 KVERSION = $(KVERSION_SHORT)-amd64 -KERNEL_VERSION = 4.9.30 -KERNEL_SUBVERSION = 2+deb9u5 +KERNEL_VERSION = 4.9.65 +KERNEL_SUBVERSION = 3+deb9u2 export KVERSION_SHORT KVERSION KERNEL_VERSION KERNEL_SUBVERSION diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel index 0654757f488f..77522d1e3dc3 160000 --- a/src/sonic-linux-kernel +++ b/src/sonic-linux-kernel @@ -1 +1 @@ -Subproject commit 0654757f488fc2c4404b3a551b391c7daf5cc5a8 +Subproject commit 77522d1e3dc3372bd3b2cc0523e7bdeec2874a88