diff --git a/build_debian.sh b/build_debian.sh index 78f40cc20c32..95d3e018d0ef 100755 --- a/build_debian.sh +++ b/build_debian.sh @@ -30,7 +30,8 @@ set -x -e ## docker engine version (with platform) DOCKER_VERSION=1.11.1-0~stretch_amd64 -LINUX_KERNEL_VERSION=4.9.0-7 +LINUX_KERNEL_ABI_MINOR_VERSION=1 +LINUX_KERNEL_VERSION=4.9.0-7-$LINUX_KERNEL_ABI_MINOR_VERSION ## 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 8b8d7b42d1ee..88250a257fcc 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-7-amd64.service +Requires=opennsl-modules-4.9.0-7-1-amd64.service {% elif sonic_asic_platform == 'nephos' %} -Requires=nps-modules-4.9.0-7-amd64.service +Requires=nps-modules-4.9.0-7-1-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 38b208e74b0b..6fb1f83a420f 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-7-amd64.service +Requires=opennsl-modules-4.9.0-7-1-amd64.service {% elif sonic_asic_platform == 'nephos' %} -Requires=nps-modules-4.9.0-7-amd64.service +Requires=nps-modules-4.9.0-7-1-amd64.service {% endif %} After=database.service updategraph.service After=interfaces-config.service {% if sonic_asic_platform == 'broadcom' %} -After=opennsl-modules-4.9.0-7-amd64.service +After=opennsl-modules-4.9.0-7-1-amd64.service {% elif sonic_asic_platform == 'nephos' %} -After=nps-modules-4.9.0-7-amd64.service +After=nps-modules-4.9.0-7-1-amd64.service {% endif %} [Service] diff --git a/installer/x86_64/install.sh b/installer/x86_64/install.sh index e39ed9727473..ae63e8266d2c 100755 --- a/installer/x86_64/install.sh +++ b/installer/x86_64/install.sh @@ -595,12 +595,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-7-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \ + linux /$image_dir/boot/vmlinuz-4.9.0-7-1-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-7-amd64 + initrd /$image_dir/boot/initrd.img-4.9.0-7-1-amd64 } EOF diff --git a/platform/barefoot/sonic-platform-modules-bfn-montara/debian/control b/platform/barefoot/sonic-platform-modules-bfn-montara/debian/control index 589f03d2f484..1d5b696c95a8 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: platform-modules-bfn-montara Architecture: amd64 -Depends: linux-image-4.9.0-7-amd64 +Depends: linux-image-4.9.0-7-1-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 d4fd702298d3..cd799625be15 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: platform-modules-bfn Architecture: amd64 -Depends: linux-image-4.9.0-7-amd64 +Depends: linux-image-4.9.0-7-1-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 f7c449300f8a..3f4bff5ec206 100644 --- a/platform/broadcom/sai-modules.mk +++ b/platform/broadcom/sai-modules.mk @@ -1,6 +1,7 @@ # Broadcom SAI modules -KVERSION = 4.9.0-7-amd64 +KERNEL_ABI_MINOR_VERSION=1 +KVERSION = 4.9.0-7-$(KERNEL_ABI_MINOR_VERSION)-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 b3884f80f2e0..eb18ef0dc9e0 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-7-amd64 +Package: opennsl-modules-4.9.0-7-1-amd64 Architecture: amd64 Section: main -Depends: linux-image-4.9.0-7-amd64 +Depends: linux-image-4.9.0-7-1-amd64 Description: kernel modules for broadcom SAI diff --git a/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-7-amd64.dirs b/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-7-amd64.dirs deleted file mode 100644 index e614841819bc..000000000000 --- a/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-7-amd64.dirs +++ /dev/null @@ -1 +0,0 @@ -lib/modules/4.9.0-7-amd64/extra diff --git a/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-7-amd64.init b/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-7-amd64.init deleted file mode 100755 index 7f9f2e24db19..000000000000 --- a/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-7-amd64.init +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash -# This script load/unload opennsl kernel modules - -### BEGIN INIT INFO -# Provides: load-opennsl-modules -# Required-Start: -# Required-Stop: -# Should-Start: -# Should-Stop: -# Default-Start: S -# Default-Stop: 0 6 -# Short-Description: Load OpenNSL kernel modules -### END INIT INFO - -case "$1" in -start) - echo -n "Load OpenNSL kernel modules... " - - modprobe linux-kernel-bde dmasize=32M maxpayload=128 - modprobe linux-user-bde - modprobe linux-bcm-knet use_rx_skb=1 rx_buffer_size=9238 - - echo "done." - ;; - -stop) - echo -n "Unload OpenNSL kernel modules... " - - rmmod linux-bcm-knet - rmmod linux-user-bde - rmmod linux-kernel-bde - - echo "done." - ;; - -force-reload|restart) - echo "Not supported" - ;; - -*) - echo "Usage: /etc/init.d/opennsl-modules-4.9.0-7-amd64.init {start|stop}" - exit 1 - ;; -esac - -exit 0 - diff --git a/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-7-amd64.install b/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-7-amd64.install deleted file mode 100644 index fe6b748c29b8..000000000000 --- a/platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-7-amd64.install +++ /dev/null @@ -1,4 +0,0 @@ -systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.9.0-7-amd64/extra -systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.9.0-7-amd64/extra -systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.9.0-7-amd64/extra -systemd/opennsl-modules-4.9.0-7-amd64.service lib/systemd/system diff --git a/platform/broadcom/saibcm-modules/debian/rules b/platform/broadcom/saibcm-modules/debian/rules index 7560bfad91fa..bbb96d375c43 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 KERNDIR=/usr/src/linux-headers-4.9.0-7-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-7-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean + SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 KERNDIR=/usr/src/linux-headers-4.9.0-7-1-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-7-1-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 KERNDIR=/usr/src/linux-headers-4.9.0-7-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-7-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 + SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 KERNDIR=/usr/src/linux-headers-4.9.0-7-1-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-7-1-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 KERNDIR=/usr/src/linux-headers-4.9.0-7-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-7-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean + SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 KERNDIR=/usr/src/linux-headers-4.9.0-7-1-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-7-1-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-7-amd64.service b/platform/broadcom/saibcm-modules/systemd/opennsl-modules-4.9.0-7-1-amd64.service similarity index 58% rename from platform/broadcom/saibcm-modules/systemd/opennsl-modules-4.9.0-7-amd64.service rename to platform/broadcom/saibcm-modules/systemd/opennsl-modules-4.9.0-7-1-amd64.service index 12c5ae40db97..40df72f0e625 100644 --- a/platform/broadcom/saibcm-modules/systemd/opennsl-modules-4.9.0-7-amd64.service +++ b/platform/broadcom/saibcm-modules/systemd/opennsl-modules-4.9.0-7-1-amd64.service @@ -5,8 +5,8 @@ Before=syncd.service [Service] Type=oneshot -ExecStart=-/etc/init.d/opennsl-modules-4.9.0-7-amd64 start -ExecStop=-/etc/init.d/opennsl-modules-4.9.0-7-amd64 stop +ExecStart=-/etc/init.d/opennsl-modules-4.9.0-7-1-amd64 start +ExecStop=-/etc/init.d/opennsl-modules-4.9.0-7-1-amd64 stop RemainAfterExit=yes [Install] diff --git a/platform/broadcom/sonic-platform-modules-alphanetworks/debian/control b/platform/broadcom/sonic-platform-modules-alphanetworks/debian/control index 075e86a008e4..875aa3b29bda 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-7-amd64 +Depends: linux-image-4.9.0-7-1-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-7-amd64 +Depends: linux-image-4.9.0-7-1-amd64 Description: kernel modules for platform devices such as fan, led, sfp diff --git a/platform/broadcom/sonic-platform-modules-alphanetworks/debian/rules b/platform/broadcom/sonic-platform-modules-alphanetworks/debian/rules old mode 100644 new mode 100755 diff --git a/platform/broadcom/sonic-platform-modules-cel/debian/control b/platform/broadcom/sonic-platform-modules-cel/debian/control index 9f561288d399..fb14dfc8080f 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-7-amd64 +Depends: linux-image-4.9.0-7-1-amd64 Description: kernel modules for platform devices such as fan, led, sfp Package: platform-modules-haliburton Architecture: amd64 -Depends: linux-image-4.9.0-7-amd64 +Depends: linux-image-4.9.0-7-1-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 15a88931c1c3..fa30be84c87b 100644 --- a/platform/broadcom/sonic-platform-modules-dell/debian/control +++ b/platform/broadcom/sonic-platform-modules-dell/debian/control @@ -7,16 +7,16 @@ Standards-Version: 3.9.3 Package: platform-modules-z9264f Architecture: amd64 -Depends: linux-image-4.9.0-7-amd64 +Depends: linux-image-4.9.0-7-1-amd64 Description: kernel modules for platform devices such as fan, led, sfp Package: platform-modules-z9100 Architecture: amd64 -Depends: linux-image-4.9.0-7-amd64 +Depends: linux-image-4.9.0-7-1-amd64 Description: kernel modules for platform devices such as fan, led, sfp Package: platform-modules-s6100 Architecture: amd64 -Depends: linux-image-4.9.0-7-amd64 +Depends: linux-image-4.9.0-7-1-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 0bcceccf6b18..82aacc56a6ee 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-7-amd64 +Depends: linux-image-4.9.0-7-1-amd64 Description: kernel modules for platform devices such as fan, led, sfp Package: platform-modules-ag9064 Architecture: amd64 -Depends: linux-image-4.9.0-7-amd64 +Depends: linux-image-4.9.0-7-1-amd64 Description: kernel modules for platform devices such as fan, led, sfp Package: platform-modules-ag5648 Architecture: amd64 -Depends: linux-image-4.9.0-7-amd64 +Depends: linux-image-4.9.0-7-1-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-7-amd64 +Depends: linux-image-4.9.0-7-1-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 726e0ba6923b..a1bf89ecb5a7 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-7-amd64" ]; then + if [ `uname -a | awk '{print $3}'` = "4.9.0-7-1-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 74276a6d31f3..f6b19a302229 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-7-amd64" ]; then +if [ `uname -a | awk '{print $3}'` = "4.9.0-7-1-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 464211650fa9..653dc90bc465 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-7-amd64 +Depends: linux-image-4.9.0-7-1-amd64 Description: kernel modules for platform devices such as fan, led Package: platform-modules-d7054q28b Architecture: amd64 -Depends: linux-image-4.9.0-7-amd64 +Depends: linux-image-4.9.0-7-1-amd64 Description: kernel modules for platform devices such as fan, led Package: platform-modules-d6254qs Architecture: amd64 -Depends: linux-image-4.9.0-7-amd64 +Depends: linux-image-4.9.0-7-1-amd64 Description: kernel modules for platform devices such as fan, led Package: platform-modules-d6556 Architecture: amd64 -Depends: linux-image-4.9.0-7-amd64 +Depends: linux-image-4.9.0-7-1-amd64 Description: kernel modules for platform devices such as fan, led Package: platform-modules-d7264q28b Architecture: amd64 -Depends: linux-image-4.9.0-7-amd64 +Depends: linux-image-4.9.0-7-1-amd64 Description: kernel modules for platform devices such as fan, led diff --git a/platform/broadcom/sonic-platform-modules-s6000/debian/control b/platform/broadcom/sonic-platform-modules-s6000/debian/control index eb91ec6718f3..832f46d8d18f 100644 --- a/platform/broadcom/sonic-platform-modules-s6000/debian/control +++ b/platform/broadcom/sonic-platform-modules-s6000/debian/control @@ -7,6 +7,6 @@ Standards-Version: 3.9.3 Package: platform-modules-s6000 Architecture: amd64 -Depends: linux-image-4.9.0-7-amd64 +Depends: linux-image-4.9.0-7-1-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 05caf384bcc6..1fdf266f3052 100644 --- a/rules/linux-kernel.mk +++ b/rules/linux-kernel.mk @@ -1,6 +1,7 @@ # linux kernel package -KVERSION_SHORT = 4.9.0-7 +KERNEL_ABI_MINOR_VERSION = 1 +KVERSION_SHORT = 4.9.0-7-$(KERNEL_ABI_MINOR_VERSION) KVERSION = $(KVERSION_SHORT)-amd64 KERNEL_VERSION = 4.9.110 KERNEL_SUBVERSION = 3+deb9u2