[sonic-buildimage] Kernel abiname change

This commit has the abiname change for linux kernel from 4.9.0-7-amd64 to 4.9.0-7-1-amd64 for udp_l3mdev_accept kernel patch. Signed-off-by: Harish Venkatraman <[email protected]>
sonic-net · Nov 2, 2018 · 1990abe · 1990abe
1 parent d3a9eed
commit 1990abe
Show file tree

Hide file tree

Showing 23 changed files with 42 additions and 91 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
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
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
diff --git 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/...emd/opennsl-modules-4.9.0-7-amd64.service → ...d/opennsl-modules-4.9.0-7-1-amd64.service b/...emd/opennsl-modules-4.9.0-7-amd64.service → ...d/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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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