From 9d7f662422ef1d83ca996918764c66b907cfc0ba Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Fri, 15 Jan 2021 10:25:17 -0800 Subject: [PATCH] 4.9.0-12 -> 4.9.0-14 Signed-off-by: Guohan Lu --- build_debian.sh | 2 +- files/build_templates/swss.service.j2 | 4 ++-- files/build_templates/syncd.service.j2 | 8 ++++---- installer/x86_64/install.sh | 4 ++-- platform/barefoot/bfn-modules/debian/control | 2 +- .../sonic-platform-modules-bfn-montara/debian/control | 2 +- .../barefoot/sonic-platform-modules-bfn/debian/control | 2 +- platform/broadcom/sai-modules.mk | 2 +- platform/broadcom/saibcm-modules/debian/control | 4 ++-- .../debian/opennsl-modules-4.9.0-12-amd64.dirs | 1 - .../debian/opennsl-modules-4.9.0-14-amd64.dirs | 1 + ...-amd64.init => opennsl-modules-4.9.0-14-amd64.init} | 2 +- ....install => opennsl-modules-4.9.0-14-amd64.install} | 10 +++++----- platform/broadcom/saibcm-modules/debian/rules | 6 +++--- ....service => opennsl-modules-4.9.0-14-amd64.service} | 4 ++-- .../as7326-56x/utils/accton_handle_idt.sh | 10 +++++----- .../as7726-32x/utils/accton_handle_idt.sh | 10 +++++----- .../debian/control | 4 ++-- .../broadcom/sonic-platform-modules-cel/debian/control | 4 ++-- .../sonic-platform-modules-dell/debian/control | 8 ++++---- .../sonic-platform-modules-delta/debian/control | 8 ++++---- .../debian/platform-modules-et-6248brb.init | 2 +- .../et-6248brb/scripts/led_status.sh | 2 +- .../sonic-platform-modules-inventec/debian/control | 10 +++++----- .../centec/sonic-platform-modules-e582/debian/control | 4 ++-- .../innovium/sonic-platform-modules-cel/debian/control | 2 +- .../sonic-platform-modules-delta/debian/control | 2 +- platform/nephos/sdk.mk | 2 +- .../sonic-platform-modules-accton/debian/control | 2 +- .../nephos/sonic-platform-modules-cig/debian/control | 6 +++--- rules/linux-kernel.mk | 2 +- 31 files changed, 66 insertions(+), 66 deletions(-) delete mode 100644 platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-12-amd64.dirs create mode 100644 platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-14-amd64.dirs rename platform/broadcom/saibcm-modules/debian/{opennsl-modules-4.9.0-12-amd64.init => opennsl-modules-4.9.0-14-amd64.init} (96%) rename platform/broadcom/saibcm-modules/debian/{opennsl-modules-4.9.0-12-amd64.install => opennsl-modules-4.9.0-14-amd64.install} (58%) rename platform/broadcom/saibcm-modules/systemd/{opennsl-modules-4.9.0-12-amd64.service => opennsl-modules-4.9.0-14-amd64.service} (79%) diff --git a/build_debian.sh b/build_debian.sh index a42d3d708534..4d2da86b4138 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-12 +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 0582a88e2b0b..cf015485c669 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-12-amd64.service +Requires=opennsl-modules-4.9.0-14-amd64.service {% elif sonic_asic_platform == 'nephos' %} -Requires=nps-modules-4.9.0-12-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 af7939922017..fb1b03516beb 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-12-amd64.service +Requires=opennsl-modules-4.9.0-14-amd64.service {% elif sonic_asic_platform == 'nephos' %} -Requires=nps-modules-4.9.0-12-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-12-amd64.service +After=opennsl-modules-4.9.0-14-amd64.service {% elif sonic_asic_platform == 'nephos' %} -After=nps-modules-4.9.0-12-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 88fb1a6e1424..2ce3eb62e3b7 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-12-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-12-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 8eba4a807d51..b7a2e1820d7f 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-12-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 e20199e365b3..7760e09714f8 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-12-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 7f6d2f6a41a5..ca4073a3dee9 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-12-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 bf1c47799b49..6d81ebe0b88e 100644 --- a/platform/broadcom/sai-modules.mk +++ b/platform/broadcom/sai-modules.mk @@ -1,6 +1,6 @@ # Broadcom SAI modules -KVERSION = 4.9.0-12-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 4df5f62a0a51..9e93166a8d9f 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-12-amd64 +Package: opennsl-modules-4.9.0-14-amd64 Architecture: amd64 Section: main -Depends: linux-image-4.9.0-12-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-12-amd64.dirs b/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-12-amd64.dirs deleted file mode 100644 index a170f295a589..000000000000 --- a/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-12-amd64.dirs +++ /dev/null @@ -1 +0,0 @@ -lib/modules/4.9.0-12-amd64/extra 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 000000000000..d56b20d7ef67 --- /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-12-amd64.init b/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-14-amd64.init similarity index 96% rename from platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-12-amd64.init rename to platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-14-amd64.init index 1dea9a092a6e..63de1d9168e6 100755 --- a/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-12-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-12-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-12-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-12-amd64.install rename to platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-14-amd64.install index 1bdd9ba38c2d..ffb28fcd83ce 100644 --- a/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-12-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-12-amd64/extra -systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.9.0-12-amd64/extra -systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.9.0-12-amd64/extra -systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.9.0-12-amd64/extra -systemd/opennsl-modules-4.9.0-12-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/rules b/platform/broadcom/saibcm-modules/debian/rules index a19206d5844e..11e5ef6e9e1f 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-12-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-12-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-12-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-12-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-12-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-12-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-12-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-12-amd64.service rename to platform/broadcom/saibcm-modules/systemd/opennsl-modules-4.9.0-14-amd64.service index 486291d84c24..f1e7d27b0dd2 100644 --- a/platform/broadcom/saibcm-modules/systemd/opennsl-modules-4.9.0-12-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-12-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-12-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 153616b04c7e..eb1d8a37eeea 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-12-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-12-amd64 - sed -i '/sleep/i /usr/local/bin/idt_init.sh' /etc/init.d/opennsl-modules-4.9.0-12-amd64 - sed -i '/idt_init/i echo "IDT init" ' /etc/init.d/opennsl-modules-4.9.0-12-amd64 - sed -i '/IDT init/i echo 1 > /usr/local/bin/done_idt_init' /etc/init.d/opennsl-modules-4.9.0-12-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 c76aeefd3feb..1045e0c41bda 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-12-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-12-amd64 - sed -i '/sleep/i /usr/local/bin/idt_init.sh' /etc/init.d/opennsl-modules-4.9.0-12-amd64 - sed -i '/idt_init/i echo "IDT init" ' /etc/init.d/opennsl-modules-4.9.0-12-amd64 - sed -i '/IDT init/i echo 1 > /usr/local/bin/done_idt_init' /etc/init.d/opennsl-modules-4.9.0-12-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 1defaf95fdbd..98961f281fa5 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-12-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-12-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-cel/debian/control b/platform/broadcom/sonic-platform-modules-cel/debian/control index 1d0ec04ef35f..1cce3fea8cfc 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-12-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-12-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 953bf00a4694..c7df9a4313e6 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-12-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-12-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-12-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-12-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 6b5d1aef2145..2cb2fa68323b 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-12-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-12-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-12-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-12-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 da7d71208be3..80625d0649de 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-12-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 879434bc5248..dbc46095e164 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-12-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 054e172c94bd..7179d7121eae 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-12-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-12-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-12-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-12-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-12-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 e5e623ef11ee..1532da694978 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-12-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-12-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 a463582d083d..c9c410841f9b 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-12-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 261232e86ec5..ee5fe957ca26 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-12-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 cedfa8bbfbcd..b0246366ed7e 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-12 +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 8ef0cb621664..fe173cdcd183 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-12-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 0c9bc60b7656..09dd2bf2a3f7 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-12-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-12-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-12-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 ab825dc760ed..e768423fb374 100644 --- a/rules/linux-kernel.mk +++ b/rules/linux-kernel.mk @@ -1,6 +1,6 @@ # linux kernel package -KVERSION_SHORT = 4.9.0-12 +KVERSION_SHORT = 4.9.0-14 KVERSION = $(KVERSION_SHORT)-amd64 KERNEL_VERSION = 4.9.246 KERNEL_SUBVERSION = 2