Skip to content

Commit 38f3eba

Browse files
lguohanlguohan
authored
[kernel]: upgrade kernel to 4.9.0-7 (4.9.110-3+deb9u1) (#1922)
* [kernel]: upgrade kernel to 4.9.0-7 (4.9.110-3+deb9u1) Signed-off-by: Guohan Lu <[email protected]> * [mellanox]: Update SDK pointer for 4.9.0-7 kernel (#44) Signed-off-by: Volodymyr Samotiy <[email protected]> * Update arista drivers for 4.9.0-7 linux kernel (#43)
1 parent c1e17c3 commit 38f3eba

File tree

22 files changed

+40
-40
lines changed

22 files changed

+40
-40
lines changed

‎build_debian.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ set -x -e
3030

3131
## docker engine version (with platform)
3232
DOCKER_VERSION=1.11.1-0~stretch_amd64
33-
LINUX_KERNEL_VERSION=4.9.0-5
33+
LINUX_KERNEL_VERSION=4.9.0-7
3434

3535
## Working directory to prepare the file system
3636
FILESYSTEM_ROOT=./fsroot

‎files/build_templates/swss.service.j2

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
Description=switch state service
33
Requires=database.service updategraph.service
44
{% if sonic_asic_platform == 'broadcom' %}
5-
Requires=opennsl-modules-4.9.0-5-amd64.service
5+
Requires=opennsl-modules-4.9.0-7-amd64.service
66
{% elif sonic_asic_platform == 'nephos' %}
7-
Requires=nps-modules-4.9.0-5-amd64.service
7+
Requires=nps-modules-4.9.0-7-amd64.service
88
{% endif %}
99
After=database.service updategraph.service
1010
After=interfaces-config.service
1111
{% if sonic_asic_platform == 'broadcom' %}
12-
After=opennsl-modules-4.9.0-5-amd64.service
12+
After=opennsl-modules-4.9.0-7-amd64.service
1313
{% elif sonic_asic_platform == 'nephos' %}
14-
After=nps-modules-4.9.0-5-amd64.service
14+
After=nps-modules-4.9.0-7-amd64.service
1515
{% endif %}
1616

1717
[Service]

‎installer/x86_64/install.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -570,12 +570,12 @@ menuentry '$demo_grub_entry' {
570570
if [ x$grub_platform = xxen ]; then insmod xzio; insmod lzopio; fi
571571
insmod part_msdos
572572
insmod ext2
573-
linux /$image_dir/boot/vmlinuz-4.9.0-5-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
573+
linux /$image_dir/boot/vmlinuz-4.9.0-7-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
574574
net.ifnames=0 biosdevname=0 \
575575
loop=$image_dir/$FILESYSTEM_SQUASHFS loopfstype=squashfs \
576576
apparmor=1 security=apparmor varlog_size=$VAR_LOG_SIZE usbcore.autosuspend=-1 $ONIE_PLATFORM_EXTRA_CMDLINE_LINUX
577577
echo 'Loading $demo_volume_label $demo_type initial ramdisk ...'
578-
initrd /$image_dir/boot/initrd.img-4.9.0-5-amd64
578+
initrd /$image_dir/boot/initrd.img-4.9.0-7-amd64
579579
}
580580
EOF
581581

‎platform/barefoot/sonic-platform-modules-arista

‎platform/broadcom/sai-modules.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Broadcom SAI modules
22

3-
KVERSION = 4.9.0-5-amd64
3+
KVERSION = 4.9.0-7-amd64
44
BRCM_OPENNSL_KERNEL_VERSION = 3.4.1.11-1
55

66
BRCM_OPENNSL_KERNEL = opennsl-modules-$(KVERSION)_$(BRCM_OPENNSL_KERNEL_VERSION)_amd64.deb

‎platform/broadcom/saibcm-modules/debian/control

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ Standards-Version: 3.9.3
77
#Vcs-Git: git://git.debian.org/collab-maint/bcmsdk.git
88
#Vcs-Browser: http://git.debian.org/?p=collab-maint/bcmsdk.git;a=summary
99

10-
Package: opennsl-modules-4.9.0-5-amd64
10+
Package: opennsl-modules-4.9.0-7-amd64
1111
Architecture: amd64
1212
Section: main
13-
Depends: linux-image-4.9.0-5-amd64
13+
Depends: linux-image-4.9.0-7-amd64
1414
Description: kernel modules for broadcom SAI

‎platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-5-amd64.dirs

-1
This file was deleted.

‎platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-7-amd64.dirs

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
lib/modules/4.9.0-7-amd64/extra

‎platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-5-amd64.init renamed to ‎platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-7-amd64.init

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ force-reload|restart)
3838
;;
3939

4040
*)
41-
echo "Usage: /etc/init.d/opennsl-modules-4.9.0-5-amd64.init {start|stop}"
41+
echo "Usage: /etc/init.d/opennsl-modules-4.9.0-7-amd64.init {start|stop}"
4242
exit 1
4343
;;
4444
esac

‎platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-5-amd64.install renamed to ‎platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-7-amd64.install

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.9.0-5-amd64/extra
2-
systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.9.0-5-amd64/extra
3-
systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.9.0-5-amd64/extra
4-
systemd/opennsl-modules-4.9.0-5-amd64.service lib/systemd/system
1+
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.9.0-7-amd64/extra
2+
systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.9.0-7-amd64/extra
3+
systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.9.0-7-amd64/extra
4+
systemd/opennsl-modules-4.9.0-7-amd64.service lib/systemd/system

‎platform/broadcom/saibcm-modules/debian/rules

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ kdist_config: prep-deb-files
6060
kdist_clean: clean
6161
dh_testdir
6262
dh_clean
63-
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 KERNDIR=/usr/src/linux-headers-4.9.0-5-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-5-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
63+
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
6464
# rm -f driver/*.o driver/*.ko
6565
#
6666
### end KERNEL SETUP
@@ -78,7 +78,7 @@ build-arch-stamp:
7878
dh_testdir
7979

8080
# Add here command to compile/build the package.
81-
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 KERNDIR=/usr/src/linux-headers-4.9.0-5-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-5-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6
81+
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
8282

8383
touch $@
8484

@@ -103,7 +103,7 @@ clean:
103103
rm -f build-arch-stamp build-indep-stamp configure-stamp
104104

105105
# Add here commands to clean up after the build process.
106-
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 KERNDIR=/usr/src/linux-headers-4.9.0-5-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-5-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
106+
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
107107

108108
dh_clean
109109

‎platform/broadcom/saibcm-modules/systemd/opennsl-modules-4.9.0-5-amd64.service renamed to ‎platform/broadcom/saibcm-modules/systemd/opennsl-modules-4.9.0-7-amd64.service

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Before=syncd.service
55

66
[Service]
77
Type=oneshot
8-
ExecStart=-/etc/init.d/opennsl-modules-4.9.0-5-amd64 start
9-
ExecStop=-/etc/init.d/opennsl-modules-4.9.0-5-amd64 stop
8+
ExecStart=-/etc/init.d/opennsl-modules-4.9.0-7-amd64 start
9+
ExecStop=-/etc/init.d/opennsl-modules-4.9.0-7-amd64 stop
1010
RemainAfterExit=yes
1111

1212
[Install]

‎platform/broadcom/sonic-platform-modules-arista

‎platform/broadcom/sonic-platform-modules-cel/debian/control

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ Standards-Version: 3.9.3
77

88
Package: platform-modules-dx010
99
Architecture: amd64
10-
Depends: linux-image-4.9.0-5-amd64
10+
Depends: linux-image-4.9.0-7-amd64
1111
Description: kernel modules for platform devices such as fan, led, sfp
1212

1313

1414
Package: platform-modules-haliburton
1515
Architecture: amd64
16-
Depends: linux-image-4.9.0-5-amd64
16+
Depends: linux-image-4.9.0-7-amd64
1717
Description: kernel modules for platform devices such as fan, led, sfp

‎platform/broadcom/sonic-platform-modules-dell/debian/control

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ Standards-Version: 3.9.3
77

88
Package: platform-modules-z9264f
99
Architecture: amd64
10-
Depends: linux-image-4.9.0-5-amd64
10+
Depends: linux-image-4.9.0-7-amd64
1111
Description: kernel modules for platform devices such as fan, led, sfp
1212

1313
Package: platform-modules-z9100
1414
Architecture: amd64
15-
Depends: linux-image-4.9.0-5-amd64
15+
Depends: linux-image-4.9.0-7-amd64
1616
Description: kernel modules for platform devices such as fan, led, sfp
1717

1818
Package: platform-modules-s6100
1919
Architecture: amd64
20-
Depends: linux-image-4.9.0-5-amd64
20+
Depends: linux-image-4.9.0-7-amd64
2121
Description: kernel modules for platform devices such as fan, led, sfp
2222

‎platform/broadcom/sonic-platform-modules-delta/debian/control

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@ Standards-Version: 3.9.3
77

88
Package: platform-modules-ag9032v1
99
Architecture: amd64
10-
Depends: linux-image-4.9.0-5-amd64
10+
Depends: linux-image-4.9.0-7-amd64
1111
Description: kernel modules for platform devices such as fan, led, sfp
1212

1313
Package: platform-modules-ag9064
1414
Architecture: amd64
15-
Depends: linux-image-4.9.0-5-amd64
15+
Depends: linux-image-4.9.0-7-amd64
1616
Description: kernel modules for platform devices such as fan, led, sfp
1717

1818
Package: platform-modules-ag5648
1919
Architecture: amd64
20-
Depends: linux-image-4.9.0-5-amd64
20+
Depends: linux-image-4.9.0-7-amd64
2121
Description: kernel modules for platform devices such as fan, led, sfp
2222

2323
Package: platform-modules-et-6248brb
2424
Architecture: amd64
25-
Depends: linux-image-4.9.0-5-amd64
25+
Depends: linux-image-4.9.0-7-amd64
2626
Description: kernel modules for platform devices such as fan, led, sfp
2727

‎platform/broadcom/sonic-platform-modules-delta/debian/platform-modules-et-6248brb.init

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ start)
2525
modprobe dni_gpio
2626
modprobe delta_et-6248brb_platform
2727

28-
if [ `uname -a | awk '{print $3}'` = "4.9.0-5-amd64" ]; then
28+
if [ `uname -a | awk '{print $3}'` = "4.9.0-7-amd64" ]; then
2929
echo "453" > "/sys/class/gpio/export"
3030
echo "454" > "/sys/class/gpio/export"
3131
echo "455" > "/sys/class/gpio/export"

‎platform/broadcom/sonic-platform-modules-delta/et-6248brb/scripts/led_status.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FAN2_RPM="/sys/bus/i2c/devices/0-002e/fan2_input"
77
FAN_TRAY1_LED="/sys/devices/platform/delta-et6248brb-gpio.0/FAN/fan1_led_ag"
88
FAN_TRAY2_LED="/sys/devices/platform/delta-et6248brb-gpio.0/FAN/fan2_led_ag"
99

10-
if [ `uname -a | awk '{print $3}'` = "4.9.0-5-amd64" ]; then
10+
if [ `uname -a | awk '{print $3}'` = "4.9.0-7-amd64" ]; then
1111
SYS_LED_G="/sys/class/gpio/gpio453/value"
1212
SYS_LED_R="/sys/class/gpio/gpio454/value"
1313
PWR_LED_G="/sys/class/gpio/gpio455/value"

‎platform/broadcom/sonic-platform-modules-s6000/debian/control

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
77

88
Package: platform-modules-s6000
99
Architecture: amd64
10-
Depends: linux-image-4.9.0-5-amd64
10+
Depends: linux-image-4.9.0-7-amd64
1111
Description: kernel modules for platform devices such as fan, led, sfp
1212

‎platform/mellanox/sdk.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/87823de172a593e070ff7e9f3e17d442c7cf1eac/sdk
1+
MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/16e0822d7077d8558e6ff92b3c6650df17a88219/sdk
22
MLNX_SDK_VERSION = 4.2.8103
33
MLNX_SDK_RDEBS += $(APPLIBS) $(IPROUTE2_MLNX) $(SX_ACL_RM) $(SX_COMPLIB) \
44
$(SX_EXAMPLES) $(SX_GEN_UTILS) $(SX_SCEW) $(SX_SDN_HAL) \

‎rules/linux-kernel.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# linux kernel package
22

3-
KVERSION_SHORT = 4.9.0-5
3+
KVERSION_SHORT = 4.9.0-7
44
KVERSION = $(KVERSION_SHORT)-amd64
5-
KERNEL_VERSION = 4.9.65
6-
KERNEL_SUBVERSION = 3+deb9u2
5+
KERNEL_VERSION = 4.9.110
6+
KERNEL_SUBVERSION = 3+deb9u1
77

88
export KVERSION_SHORT KVERSION KERNEL_VERSION KERNEL_SUBVERSION
99

‎src/sonic-linux-kernel

0 commit comments

Comments
 (0)