Skip to content

Commit 4ccd35b

Browse files
authored
[kernel]: update sonic kernel to 4.9.0-8-2 (#2468)
* [kernel]: update sonic kernel to 4.9.0-8-2 * 3b2114d 2019-01-20 | [sonic-linux-kernel] add udp_l3mdev_accept kernel upstream patch (#70) (HEAD, azure/master) [Harish Venkatraman] * 37734aa 2019-01-10 | L3mdev cgroup (#73) [lguohan] * d631eeb 2018-12-15 | yet another uart race condition fix (#75) [lguohan] Signed-off-by: Guohan Lu <gulv@microsoft.com> * Update Mellanox SDK Signed-off-by: Guohan Lu <gulv@microsoft.com> * Update arista platform driver to match 4.9.0-8-2 kernel Signed-off-by: Guohan Lu <gulv@microsoft.com>
1 parent ffbe39e commit 4ccd35b

File tree

33 files changed

+66
-66
lines changed

33 files changed

+66
-66
lines changed

build_debian.sh

Lines changed: 1 addition & 1 deletion
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=5:18.09.0~3-0~debian-stretch
33-
LINUX_KERNEL_VERSION=4.9.0-8
33+
LINUX_KERNEL_VERSION=4.9.0-8-2
3434

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

files/build_templates/swss.service.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
Description=switch state service
33
Requires=database.service updategraph.service
44
{% if sonic_asic_platform == 'broadcom' %}
5-
Requires=opennsl-modules-4.9.0-8-amd64.service
5+
Requires=opennsl-modules.service
66
{% elif sonic_asic_platform == 'nephos' %}
7-
Requires=nps-modules-4.9.0-8-amd64.service
7+
Requires=nps-modules-4.9.0-8-2-amd64.service
88
{% endif %}
99
After=database.service updategraph.service
1010
After=interfaces-config.service

files/build_templates/syncd.service.j2

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
Description=syncd service
33
Requires=database.service updategraph.service
44
{% if sonic_asic_platform == 'broadcom' %}
5-
Requires=opennsl-modules-4.9.0-8-amd64.service
5+
Requires=opennsl-modules.service
66
{% elif sonic_asic_platform == 'nephos' %}
7-
Requires=nps-modules-4.9.0-8-amd64.service
7+
Requires=nps-modules-4.9.0-8-2-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-8-amd64.service
12+
After=opennsl-modules.service
1313
{% elif sonic_asic_platform == 'nephos' %}
14-
After=nps-modules-4.9.0-8-amd64.service
14+
After=nps-modules-4.9.0-8-2-amd64.service
1515
{% endif %}
1616
Before=ntp-config.service
1717

installer/x86_64/install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -595,12 +595,12 @@ menuentry '$demo_grub_entry' {
595595
if [ x$grub_platform = xxen ]; then insmod xzio; insmod lzopio; fi
596596
insmod part_msdos
597597
insmod ext2
598-
linux /$image_dir/boot/vmlinuz-4.9.0-8-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
598+
linux /$image_dir/boot/vmlinuz-4.9.0-8-2-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
599599
net.ifnames=0 biosdevname=0 \
600600
loop=$image_dir/$FILESYSTEM_SQUASHFS loopfstype=squashfs \
601601
apparmor=1 security=apparmor varlog_size=$VAR_LOG_SIZE usbcore.autosuspend=-1 $ONIE_PLATFORM_EXTRA_CMDLINE_LINUX
602602
echo 'Loading $demo_volume_label $demo_type initial ramdisk ...'
603-
initrd /$image_dir/boot/initrd.img-4.9.0-8-amd64
603+
initrd /$image_dir/boot/initrd.img-4.9.0-8-2-amd64
604604
}
605605
EOF
606606

platform/barefoot/bfn-modules/debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
77

88
Package: bfn-modules
99
Architecture: amd64
10-
Depends: linux-image-4.9.0-8-amd64
10+
Depends: linux-image-4.9.0-8-2-amd64
1111
Description: kernel modules for bfn asic for mmap
1212

platform/barefoot/sonic-platform-modules-bfn-montara/debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
77

88
Package: sonic-platform-modules-bfn-montara
99
Architecture: amd64
10-
Depends: linux-image-4.9.0-8-amd64
10+
Depends: linux-image-4.9.0-8-2-amd64
1111
Description: kernel modules for platform devices such as fan, led, sfp
1212

platform/barefoot/sonic-platform-modules-bfn/debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
77

88
Package: sonic-platform-modules-bfn
99
Architecture: amd64
10-
Depends: linux-image-4.9.0-8-amd64
10+
Depends: linux-image-4.9.0-8-2-amd64
1111
Description: kernel modules for platform devices such as fan, led, sfp
1212

platform/broadcom/sai-modules.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Broadcom SAI modules
22

3-
KVERSION = 4.9.0-8-amd64
3+
KVERSION = 4.9.0-8-2-amd64
44
BRCM_OPENNSL_KERNEL_VERSION = 3.4.1.11-1
55

6-
BRCM_OPENNSL_KERNEL = opennsl-modules-$(KVERSION)_$(BRCM_OPENNSL_KERNEL_VERSION)_amd64.deb
6+
BRCM_OPENNSL_KERNEL = opennsl-modules_$(BRCM_OPENNSL_KERNEL_VERSION)_amd64.deb
77
$(BRCM_OPENNSL_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/saibcm-modules
88
$(BRCM_OPENNSL_KERNEL)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
99
SONIC_DPKG_DEBS += $(BRCM_OPENNSL_KERNEL)

platform/broadcom/saibcm-modules/debian/control

Lines changed: 2 additions & 2 deletions
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-8-amd64
10+
Package: opennsl-modules
1111
Architecture: amd64
1212
Section: main
13-
Depends: linux-image-4.9.0-8-amd64
13+
Depends: linux-image-4.9.0-8-2-amd64
1414
Description: kernel modules for broadcom SAI

0 commit comments

Comments
 (0)