matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[kernel]: upgrade kernel to 4.9.0-7 (4.9.110-3+deb9u1) (#1922)

Browse Source 
* [kernel]: upgrade kernel to 4.9.0-7 (4.9.110-3+deb9u1)

Signed-off-by: Guohan Lu <gulv@microsoft.com>

* [mellanox]: Update SDK pointer for 4.9.0-7 kernel (#44)

Signed-off-by: Volodymyr Samotiy <volodymyrs@mellanox.com>

* Update arista drivers for 4.9.0-7 linux kernel (#43)
This commit is contained in:
lguohan 2018-08-16 08:56:56 -07:00 committed by GitHub
parent c1e17c33b5
commit 38f3eba695
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_debian.sh
View File

@ -30,7 +30,7 @@ set -x -e
## docker engine version (with platform) ## docker engine version (with platform)
DOCKER_VERSION=1.11.1-0~stretch_amd64 DOCKER_VERSION=1.11.1-0~stretch_amd64
LINUX_KERNEL_VERSION=4.9.0-5 LINUX_KERNEL_VERSION=4.9.0-7
## Working directory to prepare the file system ## Working directory to prepare the file system
FILESYSTEM_ROOT=./fsroot FILESYSTEM_ROOT=./fsroot

8
files/build_templates/swss.service.j2
View File

@ -2,16 +2,16 @@
Description=switch state service Description=switch state service
Requires=database.service updategraph.service Requires=database.service updategraph.service
{% if sonic_asic_platform == 'broadcom' %} {% if sonic_asic_platform == 'broadcom' %}
Requires=opennsl-modules-4.9.0-5-amd64.service Requires=opennsl-modules-4.9.0-7-amd64.service
{% elif sonic_asic_platform == 'nephos' %} {% elif sonic_asic_platform == 'nephos' %}
Requires=nps-modules-4.9.0-5-amd64.service Requires=nps-modules-4.9.0-7-amd64.service
{% endif %} {% endif %}
After=database.service updategraph.service After=database.service updategraph.service
After=interfaces-config.service After=interfaces-config.service
{% if sonic_asic_platform == 'broadcom' %} {% if sonic_asic_platform == 'broadcom' %}
After=opennsl-modules-4.9.0-5-amd64.service After=opennsl-modules-4.9.0-7-amd64.service
{% elif sonic_asic_platform == 'nephos' %} {% elif sonic_asic_platform == 'nephos' %}
After=nps-modules-4.9.0-5-amd64.service After=nps-modules-4.9.0-7-amd64.service
{% endif %} {% endif %}
[Service] [Service]

4
installer/x86_64/install.sh
View File

@ -570,12 +570,12 @@ menuentry '$demo_grub_entry' {
if [ x$grub_platform = xxen ]; then insmod xzio; insmod lzopio; fi if [ x$grub_platform = xxen ]; then insmod xzio; insmod lzopio; fi
insmod part_msdos insmod part_msdos
insmod ext2 insmod ext2
linux /$image_dir/boot/vmlinuz-4.9.0-5-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \ linux /$image_dir/boot/vmlinuz-4.9.0-7-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
net.ifnames=0 biosdevname=0 \ net.ifnames=0 biosdevname=0 \
loop=$image_dir/$FILESYSTEM_SQUASHFS loopfstype=squashfs \ loop=$image_dir/$FILESYSTEM_SQUASHFS loopfstype=squashfs \
apparmor=1 security=apparmor varlog_size=$VAR_LOG_SIZE usbcore.autosuspend=-1 $ONIE_PLATFORM_EXTRA_CMDLINE_LINUX 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 ...' echo 'Loading $demo_volume_label $demo_type initial ramdisk ...'
initrd /$image_dir/boot/initrd.img-4.9.0-5-amd64 initrd /$image_dir/boot/initrd.img-4.9.0-7-amd64
} }
EOF EOF

2
platform/barefoot/sonic-platform-modules-arista

@ -1 +1 @@
Subproject commit a4d1d8d2737cf49bd6cc802dbc6c8c0ff682fa87 Subproject commit 4904fbd01e6a4547c404d3694139b36e716cfe31

2
platform/broadcom/sai-modules.mk
View File

@ -1,6 +1,6 @@
# Broadcom SAI modules # Broadcom SAI modules
KVERSION = 4.9.0-5-amd64 KVERSION = 4.9.0-7-amd64
BRCM_OPENNSL_KERNEL_VERSION = 3.4.1.11-1 BRCM_OPENNSL_KERNEL_VERSION = 3.4.1.11-1
BRCM_OPENNSL_KERNEL = opennsl-modules-$(KVERSION)_$(BRCM_OPENNSL_KERNEL_VERSION)_amd64.deb BRCM_OPENNSL_KERNEL = opennsl-modules-$(KVERSION)_$(BRCM_OPENNSL_KERNEL_VERSION)_amd64.deb

4
platform/broadcom/saibcm-modules/debian/control
View File

@ -7,8 +7,8 @@ Standards-Version: 3.9.3
#Vcs-Git: git://git.debian.org/collab-maint/bcmsdk.git #Vcs-Git: git://git.debian.org/collab-maint/bcmsdk.git
#Vcs-Browser: http://git.debian.org/?p=collab-maint/bcmsdk.git;a=summary #Vcs-Browser: http://git.debian.org/?p=collab-maint/bcmsdk.git;a=summary
Package: opennsl-modules-4.9.0-5-amd64 Package: opennsl-modules-4.9.0-7-amd64
Architecture: amd64 Architecture: amd64
Section: main Section: main
Depends: linux-image-4.9.0-5-amd64 Depends: linux-image-4.9.0-7-amd64
Description: kernel modules for broadcom SAI Description: kernel modules for broadcom SAI

1
platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-5-amd64.dirs
View File

@ -1 +0,0 @@
lib/modules/4.9.0-5-amd64/extra

1
platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-7-amd64.dirs Normal file
View File

@ -0,0 +1 @@
lib/modules/4.9.0-7-amd64/extra

2
platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-5-amd64.init → platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-7-amd64.init
View File

@ -38,7 +38,7 @@ force-reload|restart)
;; ;;
*) *)
echo "Usage: /etc/init.d/opennsl-modules-4.9.0-5-amd64.init {start|stop}" echo "Usage: /etc/init.d/opennsl-modules-4.9.0-7-amd64.init {start|stop}"
exit 1 exit 1
;; ;;
esac esac

8
platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-5-amd64.install → platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-7-amd64.install
View File

@ -1,4 +1,4 @@
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.9.0-5-amd64/extra 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-5-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-5-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-5-amd64.service lib/systemd/system systemd/opennsl-modules-4.9.0-7-amd64.service lib/systemd/system

6
platform/broadcom/saibcm-modules/debian/rules
View File

@ -60,7 +60,7 @@ kdist_config: prep-deb-files
kdist_clean: clean kdist_clean: clean
dh_testdir dh_testdir
dh_clean dh_clean
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 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
# rm -f driver/*.o driver/*.ko # rm -f driver/*.o driver/*.ko
# #
### end KERNEL SETUP ### end KERNEL SETUP
@ -78,7 +78,7 @@ build-arch-stamp:
dh_testdir dh_testdir
# Add here command to compile/build the package. # 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-5-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-5-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-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-7-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6
touch $@ touch $@
@ -103,7 +103,7 @@ clean:
rm -f build-arch-stamp build-indep-stamp configure-stamp rm -f build-arch-stamp build-indep-stamp configure-stamp
# Add here commands to clean up after the build process. # 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-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 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
dh_clean dh_clean

4
platform/broadcom/saibcm-modules/systemd/opennsl-modules-4.9.0-5-amd64.service → platform/broadcom/saibcm-modules/systemd/opennsl-modules-4.9.0-7-amd64.service
View File

@ -5,8 +5,8 @@ Before=syncd.service
[Service] [Service]
Type=oneshot Type=oneshot
ExecStart=-/etc/init.d/opennsl-modules-4.9.0-5-amd64 start ExecStart=-/etc/init.d/opennsl-modules-4.9.0-7-amd64 start
ExecStop=-/etc/init.d/opennsl-modules-4.9.0-5-amd64 stop ExecStop=-/etc/init.d/opennsl-modules-4.9.0-7-amd64 stop
RemainAfterExit=yes RemainAfterExit=yes
[Install] [Install]

2
platform/broadcom/sonic-platform-modules-arista

@ -1 +1 @@
Subproject commit a4d1d8d2737cf49bd6cc802dbc6c8c0ff682fa87 Subproject commit 4904fbd01e6a4547c404d3694139b36e716cfe31

4
platform/broadcom/sonic-platform-modules-cel/debian/control
View File

@ -7,11 +7,11 @@ Standards-Version: 3.9.3
Package: platform-modules-dx010 Package: platform-modules-dx010
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-5-amd64 Depends: linux-image-4.9.0-7-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-haliburton Package: platform-modules-haliburton
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-5-amd64 Depends: linux-image-4.9.0-7-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp

6
platform/broadcom/sonic-platform-modules-dell/debian/control
View File

@ -7,16 +7,16 @@ Standards-Version: 3.9.3
Package: platform-modules-z9264f Package: platform-modules-z9264f
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-5-amd64 Depends: linux-image-4.9.0-7-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-z9100 Package: platform-modules-z9100
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-5-amd64 Depends: linux-image-4.9.0-7-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-s6100 Package: platform-modules-s6100
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-5-amd64 Depends: linux-image-4.9.0-7-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp

8
platform/broadcom/sonic-platform-modules-delta/debian/control
View File

@ -7,21 +7,21 @@ Standards-Version: 3.9.3
Package: platform-modules-ag9032v1 Package: platform-modules-ag9032v1
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-5-amd64 Depends: linux-image-4.9.0-7-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-ag9064 Package: platform-modules-ag9064
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-5-amd64 Depends: linux-image-4.9.0-7-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-ag5648 Package: platform-modules-ag5648
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-5-amd64 Depends: linux-image-4.9.0-7-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-et-6248brb Package: platform-modules-et-6248brb
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-5-amd64 Depends: linux-image-4.9.0-7-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp

2
platform/broadcom/sonic-platform-modules-delta/debian/platform-modules-et-6248brb.init
View File

@ -25,7 +25,7 @@ start)
modprobe dni_gpio modprobe dni_gpio
modprobe delta_et-6248brb_platform modprobe delta_et-6248brb_platform
if [ `uname -a | awk '{print $3}'` = "4.9.0-5-amd64" ]; then if [ `uname -a | awk '{print $3}'` = "4.9.0-7-amd64" ]; then
echo "453" > "/sys/class/gpio/export" echo "453" > "/sys/class/gpio/export"
echo "454" > "/sys/class/gpio/export" echo "454" > "/sys/class/gpio/export"
echo "455" > "/sys/class/gpio/export" echo "455" > "/sys/class/gpio/export"

2
platform/broadcom/sonic-platform-modules-delta/et-6248brb/scripts/led_status.sh
View File

@ -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_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" FAN_TRAY2_LED="/sys/devices/platform/delta-et6248brb-gpio.0/FAN/fan2_led_ag"
if [ `uname -a | awk '{print $3}'` = "4.9.0-5-amd64" ]; then if [ `uname -a | awk '{print $3}'` = "4.9.0-7-amd64" ]; then
SYS_LED_G="/sys/class/gpio/gpio453/value" SYS_LED_G="/sys/class/gpio/gpio453/value"
SYS_LED_R="/sys/class/gpio/gpio454/value" SYS_LED_R="/sys/class/gpio/gpio454/value"
PWR_LED_G="/sys/class/gpio/gpio455/value" PWR_LED_G="/sys/class/gpio/gpio455/value"

2
platform/broadcom/sonic-platform-modules-s6000/debian/control
View File

@ -7,6 +7,6 @@ Standards-Version: 3.9.3
Package: platform-modules-s6000 Package: platform-modules-s6000
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-5-amd64 Depends: linux-image-4.9.0-7-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp

2
platform/mellanox/sdk.mk
View File

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

6
rules/linux-kernel.mk
View File

@ -1,9 +1,9 @@
# linux kernel package # linux kernel package
KVERSION_SHORT = 4.9.0-5 KVERSION_SHORT = 4.9.0-7
KVERSION = $(KVERSION_SHORT)-amd64 KVERSION = $(KVERSION_SHORT)-amd64
KERNEL_VERSION = 4.9.65 KERNEL_VERSION = 4.9.110
KERNEL_SUBVERSION = 3+deb9u2 KERNEL_SUBVERSION = 3+deb9u1
export KVERSION_SHORT KVERSION KERNEL_VERSION KERNEL_SUBVERSION export KVERSION_SHORT KVERSION KERNEL_VERSION KERNEL_SUBVERSION

2
src/sonic-linux-kernel

@ -1 +1 @@
Subproject commit 28e99c0e76189e8ec5c46535cbd87145668262d8 Subproject commit 7c97ae923c9ec9b2006ed275e8780233b32b28f6