diff --git a/build_debian.sh b/build_debian.sh index aa43c39db3..4d2da86b41 100755 --- a/build_debian.sh +++ b/build_debian.sh @@ -30,7 +30,7 @@ set -x -e ## docker engine version (with platform) DOCKER_VERSION=5:18.09.8~3-0~debian-stretch -LINUX_KERNEL_VERSION=4.9.0-9 +LINUX_KERNEL_VERSION=4.9.0-14 ## Working directory to prepare the file system FILESYSTEM_ROOT=./fsroot diff --git a/files/build_templates/swss.service.j2 b/files/build_templates/swss.service.j2 index 0490528afb..cf015485c6 100644 --- a/files/build_templates/swss.service.j2 +++ b/files/build_templates/swss.service.j2 @@ -2,9 +2,9 @@ Description=switch state service Requires=database.service updategraph.service {% if sonic_asic_platform == 'broadcom' %} -Requires=opennsl-modules-4.9.0-9-amd64.service +Requires=opennsl-modules-4.9.0-14-amd64.service {% elif sonic_asic_platform == 'nephos' %} -Requires=nps-modules-4.9.0-9-amd64.service +Requires=nps-modules-4.9.0-14-amd64.service {% endif %} After=database.service updategraph.service After=interfaces-config.service diff --git a/files/build_templates/syncd.service.j2 b/files/build_templates/syncd.service.j2 index b11bf93255..fb1b03516b 100644 --- a/files/build_templates/syncd.service.j2 +++ b/files/build_templates/syncd.service.j2 @@ -2,16 +2,16 @@ Description=syncd service Requires=database.service updategraph.service {% if sonic_asic_platform == 'broadcom' %} -Requires=opennsl-modules-4.9.0-9-amd64.service +Requires=opennsl-modules-4.9.0-14-amd64.service {% elif sonic_asic_platform == 'nephos' %} -Requires=nps-modules-4.9.0-9-amd64.service +Requires=nps-modules-4.9.0-14-amd64.service {% endif %} After=database.service updategraph.service After=interfaces-config.service {% if sonic_asic_platform == 'broadcom' %} -After=opennsl-modules-4.9.0-9-amd64.service +After=opennsl-modules-4.9.0-14-amd64.service {% elif sonic_asic_platform == 'nephos' %} -After=nps-modules-4.9.0-9-amd64.service +After=nps-modules-4.9.0-14-amd64.service {% endif %} After=swss.service Before=ntp-config.service diff --git a/installer/x86_64/install.sh b/installer/x86_64/install.sh index c7d6be55a6..2ce3eb62e3 100755 --- a/installer/x86_64/install.sh +++ b/installer/x86_64/install.sh @@ -600,12 +600,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-9-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \ + linux /$image_dir/boot/vmlinuz-4.9.0-14-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.9.0-9-amd64 + initrd /$image_dir/boot/initrd.img-4.9.0-14-amd64 } EOF diff --git a/platform/barefoot/bfn-modules/debian/control b/platform/barefoot/bfn-modules/debian/control index 6409ae752c..b7a2e1820d 100644 --- a/platform/barefoot/bfn-modules/debian/control +++ b/platform/barefoot/bfn-modules/debian/control @@ -7,6 +7,6 @@ Standards-Version: 3.9.3 Package: bfn-modules Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for bfn asic for mmap diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/debian/control b/platform/barefoot/sonic-platform-modules-bfn-montara/debian/control index 707c1ece9c..7760e09714 100644 --- a/platform/barefoot/sonic-platform-modules-bfn-montara/debian/control +++ b/platform/barefoot/sonic-platform-modules-bfn-montara/debian/control @@ -7,6 +7,6 @@ Standards-Version: 3.9.3 Package: sonic-platform-modules-bfn-montara Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for platform devices such as fan, led, sfp diff --git a/platform/barefoot/sonic-platform-modules-bfn/debian/control b/platform/barefoot/sonic-platform-modules-bfn/debian/control index c0c0e88a20..ca4073a3de 100644 --- a/platform/barefoot/sonic-platform-modules-bfn/debian/control +++ b/platform/barefoot/sonic-platform-modules-bfn/debian/control @@ -7,6 +7,6 @@ Standards-Version: 3.9.3 Package: sonic-platform-modules-bfn Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for platform devices such as fan, led, sfp diff --git a/platform/broadcom/sai-modules.mk b/platform/broadcom/sai-modules.mk index d6c059dc11..6d81ebe0b8 100644 --- a/platform/broadcom/sai-modules.mk +++ b/platform/broadcom/sai-modules.mk @@ -1,6 +1,6 @@ # Broadcom SAI modules -KVERSION = 4.9.0-9-amd64 +KVERSION = 4.9.0-14-amd64 BRCM_OPENNSL_KERNEL_VERSION = 3.4.1.11-1 BRCM_OPENNSL_KERNEL = opennsl-modules-$(KVERSION)_$(BRCM_OPENNSL_KERNEL_VERSION)_amd64.deb diff --git a/platform/broadcom/saibcm-modules/debian/control b/platform/broadcom/saibcm-modules/debian/control index 830685297f..9e93166a8d 100644 --- a/platform/broadcom/saibcm-modules/debian/control +++ b/platform/broadcom/saibcm-modules/debian/control @@ -7,8 +7,8 @@ Standards-Version: 3.9.3 #Vcs-Git: git://git.debian.org/collab-maint/bcmsdk.git #Vcs-Browser: http://git.debian.org/?p=collab-maint/bcmsdk.git;a=summary -Package: opennsl-modules-4.9.0-9-amd64 +Package: opennsl-modules-4.9.0-14-amd64 Architecture: amd64 Section: main -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for broadcom SAI diff --git a/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-14-amd64.dirs b/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-14-amd64.dirs new file mode 100644 index 0000000000..d56b20d7ef --- /dev/null +++ b/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-14-amd64.dirs @@ -0,0 +1 @@ +lib/modules/4.9.0-14-amd64/extra diff --git a/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-9-amd64.init b/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-14-amd64.init similarity index 95% rename from platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-9-amd64.init rename to platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-14-amd64.init index 7b2d32a3e0..63de1d9168 100755 --- a/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-9-amd64.init +++ b/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-14-amd64.init @@ -69,7 +69,7 @@ force-reload|restart) ;; *) - echo "Usage: /etc/init.d/opennsl-modules-4.9.0-9-amd64.init {start|stop}" + echo "Usage: /etc/init.d/opennsl-modules-4.9.0-14-amd64.init {start|stop}" exit 1 ;; esac diff --git a/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-9-amd64.install b/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-14-amd64.install similarity index 58% rename from platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-9-amd64.install rename to platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-14-amd64.install index 2f6eed55a7..ffb28fcd83 100644 --- a/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-9-amd64.install +++ b/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-14-amd64.install @@ -1,5 +1,5 @@ -systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.9.0-9-amd64/extra -systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.9.0-9-amd64/extra -systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.9.0-9-amd64/extra -systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.9.0-9-amd64/extra -systemd/opennsl-modules-4.9.0-9-amd64.service lib/systemd/system +systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.9.0-14-amd64/extra +systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.9.0-14-amd64/extra +systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.9.0-14-amd64/extra +systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.9.0-14-amd64/extra +systemd/opennsl-modules-4.9.0-14-amd64.service lib/systemd/system diff --git a/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-9-amd64.dirs b/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-9-amd64.dirs deleted file mode 100644 index bd864e8d14..0000000000 --- a/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-9-amd64.dirs +++ /dev/null @@ -1 +0,0 @@ -lib/modules/4.9.0-9-amd64/extra diff --git a/platform/broadcom/saibcm-modules/debian/rules b/platform/broadcom/saibcm-modules/debian/rules index b0849fe4b2..11e5ef6e9e 100755 --- a/platform/broadcom/saibcm-modules/debian/rules +++ b/platform/broadcom/saibcm-modules/debian/rules @@ -60,7 +60,7 @@ kdist_config: prep-deb-files kdist_clean: clean dh_testdir dh_clean - SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-9-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-9-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean + SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-14-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-14-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean # rm -f driver/*.o driver/*.ko # ### end KERNEL SETUP @@ -78,7 +78,7 @@ build-arch-stamp: dh_testdir # Add here command to compile/build the package. - SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-9-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-9-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 + SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-14-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-14-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 touch $@ @@ -103,7 +103,7 @@ clean: rm -f build-arch-stamp build-indep-stamp configure-stamp # Add here commands to clean up after the build process. - SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-9-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-9-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean + SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-14-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-14-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean dh_clean diff --git a/platform/broadcom/saibcm-modules/systemd/opennsl-modules-4.9.0-9-amd64.service b/platform/broadcom/saibcm-modules/systemd/opennsl-modules-4.9.0-14-amd64.service similarity index 79% rename from platform/broadcom/saibcm-modules/systemd/opennsl-modules-4.9.0-9-amd64.service rename to platform/broadcom/saibcm-modules/systemd/opennsl-modules-4.9.0-14-amd64.service index 2cc2223fa3..f1e7d27b0d 100644 --- a/platform/broadcom/saibcm-modules/systemd/opennsl-modules-4.9.0-9-amd64.service +++ b/platform/broadcom/saibcm-modules/systemd/opennsl-modules-4.9.0-14-amd64.service @@ -5,13 +5,13 @@ Before=syncd.service [Service] Type=oneshot -ExecStart=-/etc/init.d/opennsl-modules-4.9.0-9-amd64 start +ExecStart=-/etc/init.d/opennsl-modules-4.9.0-14-amd64 start # Don't remove opennsl driver when stopping service. Because # removing knet drivers takes ~30 seconds to delete netdevs. # This delay cuts too deep into warm reboot time budget. # We could skip this step because we don't expect stopping # opennsl service in any context other than rebooting. -# ExecStop=-/etc/init.d/opennsl-modules-4.9.0-9-amd64 stop +# ExecStop=-/etc/init.d/opennsl-modules-4.9.0-14-amd64 stop RemainAfterExit=yes [Install] diff --git a/platform/broadcom/sonic-platform-modules-accton/as7326-56x/utils/accton_handle_idt.sh b/platform/broadcom/sonic-platform-modules-accton/as7326-56x/utils/accton_handle_idt.sh index d61d93a619..eb1d8a37ee 100755 --- a/platform/broadcom/sonic-platform-modules-accton/as7326-56x/utils/accton_handle_idt.sh +++ b/platform/broadcom/sonic-platform-modules-accton/as7326-56x/utils/accton_handle_idt.sh @@ -4,13 +4,13 @@ if [ -s /usr/local/bin/done_idt_init ];then echo "There is a done_idt_init file" else - cat /etc/init.d/opennsl-modules-4.9.0-9-amd64|grep idt_init.sh + cat /etc/init.d/opennsl-modules-4.9.0-14-amd64|grep idt_init.sh if [ $? -ne 0 ];then echo "Add idt_init.sh to opennsl-modules for TD3 MAC" - sed -i '/modprobe linux-kernel-bde/i sleep 1' /etc/init.d/opennsl-modules-4.9.0-9-amd64 - sed -i '/sleep/i /usr/local/bin/idt_init.sh' /etc/init.d/opennsl-modules-4.9.0-9-amd64 - sed -i '/idt_init/i echo "IDT init" ' /etc/init.d/opennsl-modules-4.9.0-9-amd64 - sed -i '/IDT init/i echo 1 > /usr/local/bin/done_idt_init' /etc/init.d/opennsl-modules-4.9.0-9-amd64 + sed -i '/modprobe linux-kernel-bde/i sleep 1' /etc/init.d/opennsl-modules-4.9.0-14-amd64 + sed -i '/sleep/i /usr/local/bin/idt_init.sh' /etc/init.d/opennsl-modules-4.9.0-14-amd64 + sed -i '/idt_init/i echo "IDT init" ' /etc/init.d/opennsl-modules-4.9.0-14-amd64 + sed -i '/IDT init/i echo 1 > /usr/local/bin/done_idt_init' /etc/init.d/opennsl-modules-4.9.0-14-amd64 fi diff --git a/platform/broadcom/sonic-platform-modules-accton/as7726-32x/utils/accton_handle_idt.sh b/platform/broadcom/sonic-platform-modules-accton/as7726-32x/utils/accton_handle_idt.sh index 7b1d0388dd..1045e0c41b 100755 --- a/platform/broadcom/sonic-platform-modules-accton/as7726-32x/utils/accton_handle_idt.sh +++ b/platform/broadcom/sonic-platform-modules-accton/as7726-32x/utils/accton_handle_idt.sh @@ -3,13 +3,13 @@ if [ -s /usr/local/bin/done_idt_init ];then echo "There is a done_idt_init file" else - cat /etc/init.d/opennsl-modules-4.9.0-9-amd64|grep idt_init.sh + cat /etc/init.d/opennsl-modules-4.9.0-14-amd64|grep idt_init.sh if [ $? -ne 0 ];then echo "Add idt_init.sh to opennsl-modules for TD3 MAC" - sed -i '/modprobe linux-kernel-bde/i sleep 1' /etc/init.d/opennsl-modules-4.9.0-9-amd64 - sed -i '/sleep/i /usr/local/bin/idt_init.sh' /etc/init.d/opennsl-modules-4.9.0-9-amd64 - sed -i '/idt_init/i echo "IDT init" ' /etc/init.d/opennsl-modules-4.9.0-9-amd64 - sed -i '/IDT init/i echo 1 > /usr/local/bin/done_idt_init' /etc/init.d/opennsl-modules-4.9.0-9-amd64 + sed -i '/modprobe linux-kernel-bde/i sleep 1' /etc/init.d/opennsl-modules-4.9.0-14-amd64 + sed -i '/sleep/i /usr/local/bin/idt_init.sh' /etc/init.d/opennsl-modules-4.9.0-14-amd64 + sed -i '/idt_init/i echo "IDT init" ' /etc/init.d/opennsl-modules-4.9.0-14-amd64 + sed -i '/IDT init/i echo 1 > /usr/local/bin/done_idt_init' /etc/init.d/opennsl-modules-4.9.0-14-amd64 fi fi diff --git a/platform/broadcom/sonic-platform-modules-alphanetworks/debian/control b/platform/broadcom/sonic-platform-modules-alphanetworks/debian/control index dff8b337a6..98961f281f 100644 --- a/platform/broadcom/sonic-platform-modules-alphanetworks/debian/control +++ b/platform/broadcom/sonic-platform-modules-alphanetworks/debian/control @@ -7,11 +7,11 @@ Standards-Version: 3.9.3 Package: sonic-platform-alphanetworks-snh60a0-320fv2 Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for platform devices such as fan, led, sfp Package: sonic-platform-alphanetworks-snh60b0-640f Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for platform devices such as fan, led, sfp diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista index c4108a2e1e..6164b0cbbb 160000 --- a/platform/broadcom/sonic-platform-modules-arista +++ b/platform/broadcom/sonic-platform-modules-arista @@ -1 +1 @@ -Subproject commit c4108a2e1e1fde809daa46af6fbadcb03c0b5c44 +Subproject commit 6164b0cbbbb3a6a2658cd071bec20de068e5da7a diff --git a/platform/broadcom/sonic-platform-modules-cel/debian/control b/platform/broadcom/sonic-platform-modules-cel/debian/control index bdcf871fef..1cce3fea8c 100644 --- a/platform/broadcom/sonic-platform-modules-cel/debian/control +++ b/platform/broadcom/sonic-platform-modules-cel/debian/control @@ -7,11 +7,11 @@ Standards-Version: 3.9.3 Package: platform-modules-dx010 Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for platform devices such as fan, led, sfp Package: platform-modules-haliburton Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for platform devices such as fan, led, sfp diff --git a/platform/broadcom/sonic-platform-modules-dell/debian/control b/platform/broadcom/sonic-platform-modules-dell/debian/control index ce91991064..c7df9a4313 100644 --- a/platform/broadcom/sonic-platform-modules-dell/debian/control +++ b/platform/broadcom/sonic-platform-modules-dell/debian/control @@ -7,20 +7,20 @@ Standards-Version: 3.9.3 Package: platform-modules-s6000 Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for platform devices such as fan, led, sfp Package: platform-modules-z9100 Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for platform devices such as fan, led, sfp Package: platform-modules-s6100 Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for platform devices such as fan, led, sfp Package: platform-modules-z9264f Architecture: amd64 -Depends: linux-image-4.9.0-9-2-amd64 +Depends: linux-image-4.9.0-14-2-amd64 Description: kernel modules for platform devices such as fan, led, sfp diff --git a/platform/broadcom/sonic-platform-modules-delta/debian/control b/platform/broadcom/sonic-platform-modules-delta/debian/control index 1f579e9c90..2cb2fa6832 100644 --- a/platform/broadcom/sonic-platform-modules-delta/debian/control +++ b/platform/broadcom/sonic-platform-modules-delta/debian/control @@ -7,21 +7,21 @@ Standards-Version: 3.9.3 Package: platform-modules-ag9032v1 Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for platform devices such as fan, led, sfp Package: platform-modules-ag9064 Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for platform devices such as fan, led, sfp Package: platform-modules-ag5648 Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for platform devices such as fan, led, sfp Package: platform-modules-et-6248brb Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for platform devices such as fan, led, sfp diff --git a/platform/broadcom/sonic-platform-modules-delta/debian/platform-modules-et-6248brb.init b/platform/broadcom/sonic-platform-modules-delta/debian/platform-modules-et-6248brb.init index 705e6c29c2..80625d0649 100755 --- a/platform/broadcom/sonic-platform-modules-delta/debian/platform-modules-et-6248brb.init +++ b/platform/broadcom/sonic-platform-modules-delta/debian/platform-modules-et-6248brb.init @@ -25,7 +25,7 @@ start) modprobe dni_gpio modprobe delta_et-6248brb_platform - if [ `uname -a | awk '{print $3}'` = "4.9.0-9-amd64" ]; then + if [ `uname -a | awk '{print $3}'` = "4.9.0-14-amd64" ]; then echo "453" > "/sys/class/gpio/export" echo "454" > "/sys/class/gpio/export" echo "455" > "/sys/class/gpio/export" diff --git a/platform/broadcom/sonic-platform-modules-delta/et-6248brb/scripts/led_status.sh b/platform/broadcom/sonic-platform-modules-delta/et-6248brb/scripts/led_status.sh index aeb3b4ee29..dbc46095e1 100644 --- a/platform/broadcom/sonic-platform-modules-delta/et-6248brb/scripts/led_status.sh +++ b/platform/broadcom/sonic-platform-modules-delta/et-6248brb/scripts/led_status.sh @@ -7,7 +7,7 @@ FAN2_RPM="/sys/bus/i2c/devices/0-002e/fan2_input" FAN_TRAY1_LED="/sys/devices/platform/delta-et6248brb-gpio.0/FAN/fan1_led_ag" FAN_TRAY2_LED="/sys/devices/platform/delta-et6248brb-gpio.0/FAN/fan2_led_ag" -if [ `uname -a | awk '{print $3}'` = "4.9.0-9-amd64" ]; then +if [ `uname -a | awk '{print $3}'` = "4.9.0-14-amd64" ]; then SYS_LED_G="/sys/class/gpio/gpio453/value" SYS_LED_R="/sys/class/gpio/gpio454/value" PWR_LED_G="/sys/class/gpio/gpio455/value" diff --git a/platform/broadcom/sonic-platform-modules-inventec/debian/control b/platform/broadcom/sonic-platform-modules-inventec/debian/control index 1ab84ea12d..7179d7121e 100644 --- a/platform/broadcom/sonic-platform-modules-inventec/debian/control +++ b/platform/broadcom/sonic-platform-modules-inventec/debian/control @@ -7,25 +7,25 @@ Standards-Version: 3.9.3 Package: platform-modules-d7032q28b Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for platform devices such as fan, led Package: platform-modules-d7054q28b Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for platform devices such as fan, led Package: platform-modules-d6254qs Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for platform devices such as fan, led Package: platform-modules-d6556 Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for platform devices such as fan, led Package: platform-modules-d7264q28b Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for platform devices such as fan, led diff --git a/platform/centec/sonic-platform-modules-e582/debian/control b/platform/centec/sonic-platform-modules-e582/debian/control index 7a3d2c7412..1532da6949 100644 --- a/platform/centec/sonic-platform-modules-e582/debian/control +++ b/platform/centec/sonic-platform-modules-e582/debian/control @@ -7,11 +7,11 @@ Standards-Version: 3.9.3 Package: platform-modules-e582-48x2q4z Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for platform devices such as fan, led, sfp Package: platform-modules-e582-48x6q Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for platform devices such as fan, led, sfp diff --git a/platform/innovium/sonic-platform-modules-cel/debian/control b/platform/innovium/sonic-platform-modules-cel/debian/control index a8f3fd5e46..c9c410841f 100755 --- a/platform/innovium/sonic-platform-modules-cel/debian/control +++ b/platform/innovium/sonic-platform-modules-cel/debian/control @@ -7,5 +7,5 @@ Standards-Version: 3.9.3 Package: platform-modules-midstone-200i Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for platform devices diff --git a/platform/innovium/sonic-platform-modules-delta/debian/control b/platform/innovium/sonic-platform-modules-delta/debian/control index 53fc6df6b6..ee5fe957ca 100644 --- a/platform/innovium/sonic-platform-modules-delta/debian/control +++ b/platform/innovium/sonic-platform-modules-delta/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.9.3 Package: platform-modules-et-c032if Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for platform devices such as fan, led, sfp diff --git a/platform/nephos/sdk.mk b/platform/nephos/sdk.mk index 04f952c04b..b0246366ed 100644 --- a/platform/nephos/sdk.mk +++ b/platform/nephos/sdk.mk @@ -1,5 +1,5 @@ SDK_VERSION = 3.0.0 -LINUX_VER = 4.9.0-9 +LINUX_VER = 4.9.0-14 SDK_COMMIT_ID = 529202 NEPHOS_NPS_KERNEL = nps-modules-$(LINUX_VER)_$(SDK_VERSION)_$(SDK_COMMIT_ID)_amd64.deb $(NEPHOS_NPS_KERNEL)_URL = "https://github.com/NephosInc/SONiC/raw/master/sdk/nps-modules-$(LINUX_VER)_$(SDK_VERSION)_$(SDK_COMMIT_ID)_amd64.deb" diff --git a/platform/nephos/sonic-platform-modules-accton/debian/control b/platform/nephos/sonic-platform-modules-accton/debian/control index f0a4f04dd8..fe173cdcd1 100755 --- a/platform/nephos/sonic-platform-modules-accton/debian/control +++ b/platform/nephos/sonic-platform-modules-accton/debian/control @@ -7,5 +7,5 @@ Standards-Version: 3.9.3 Package: sonic-platform-accton-as7116-54x Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for platform devices such as fan, led, sfp diff --git a/platform/nephos/sonic-platform-modules-cig/debian/control b/platform/nephos/sonic-platform-modules-cig/debian/control index 6037b42e84..09dd2bf2a3 100755 --- a/platform/nephos/sonic-platform-modules-cig/debian/control +++ b/platform/nephos/sonic-platform-modules-cig/debian/control @@ -7,15 +7,15 @@ Standards-Version: 3.9.3 Package: sonic-platform-cig-cs6436-56p Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for platform devices such as fan, led, sfp Package: sonic-platform-cig-cs6436-54p Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for platform devices such as fan, led, sfp Package: sonic-platform-cig-cs5435-54p Architecture: amd64 -Depends: linux-image-4.9.0-9-amd64 +Depends: linux-image-4.9.0-14-amd64 Description: kernel modules for platform devices such as fan, led, sfp diff --git a/rules/linux-kernel.mk b/rules/linux-kernel.mk index 5d54c89706..e768423fb3 100644 --- a/rules/linux-kernel.mk +++ b/rules/linux-kernel.mk @@ -1,9 +1,9 @@ # linux kernel package -KVERSION_SHORT = 4.9.0-9 +KVERSION_SHORT = 4.9.0-14 KVERSION = $(KVERSION_SHORT)-amd64 -KERNEL_VERSION = 4.9.168 -KERNEL_SUBVERSION = 1+deb9u5 +KERNEL_VERSION = 4.9.246 +KERNEL_SUBVERSION = 2 export KVERSION_SHORT KVERSION KERNEL_VERSION KERNEL_SUBVERSION diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel index 53f6326418..557fc9eb96 160000 --- a/src/sonic-linux-kernel +++ b/src/sonic-linux-kernel @@ -1 +1 @@ -Subproject commit 53f6326418a94e00bf12133a7cef0e0a464327c9 +Subproject commit 557fc9eb968506360b3a4ff5a1901e90b1614465