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

[kernel]: upgrade linux kernel to 4.9.0-5 (4.9.65-3+deb9u2) (#8)

Browse Source
This commit is contained in:
lguohan 2018-01-10 01:34:46 -08:00 committed by Guohan Lu
parent 13c83ac6f9
commit 35ab7a6e09
5 changed files with 12 additions and 12 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-3 LINUX_KERNEL_VERSION=4.9.0-5
## 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-3-amd64.service Requires=opennsl-modules-4.9.0-5-amd64.service
{% elif sonic_asic_platform == 'nephos' %} {% elif sonic_asic_platform == 'nephos' %}
Requires=nps-modules-4.9.0-3-amd64.service Requires=nps-modules-4.9.0-5-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-3-amd64.service After=opennsl-modules-4.9.0-5-amd64.service
{% elif sonic_asic_platform == 'nephos' %} {% elif sonic_asic_platform == 'nephos' %}
After=nps-modules-4.9.0-3-amd64.service After=nps-modules-4.9.0-5-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-3-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \ linux /$image_dir/boot/vmlinuz-4.9.0-5-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-3-amd64 initrd /$image_dir/boot/initrd.img-4.9.0-5-amd64
} }
EOF EOF

4
platform/broadcom/sdk.mk
View File

@ -1,4 +1,4 @@
BRCM_OPENNSL_KERNEL = opennsl-modules-4.9.0-3-amd64_3.2.3.3-2_amd64.deb BRCM_OPENNSL_KERNEL = opennsl-modules-4.9.0-5-amd64_3.2.3.7-1_amd64.deb
$(BRCM_OPENNSL_KERNEL)_URL = "https://sonicstorage.blob.core.windows.net/packages/opennsl-modules-4.9.0-3-amd64_3.2.3.3-2_amd64.deb?sv=2015-04-05&sr=b&sig=HieTgULvva7WlMRegUhfoRFqkj2Oe9sAVxU%2FgCGj9Ys%3D&se=2154-09-28T04%3A46%3A03Z&sp=r" $(BRCM_OPENNSL_KERNEL)_URL = "https://sonicstorage.blob.core.windows.net/packages/opennsl-modules-4.9.0-5-amd64_3.2.3.7-1_amd64.deb?sv=2015-04-05&sr=b&sig=nju9vaqIjRlzV7V0wirMP6%2FNCJRsNqC%2FdqdqgxA0wrQ%3D&se=2154-12-03T07%3A37%3A17Z&sp=r"
SONIC_ONLINE_DEBS += $(BRCM_OPENNSL_KERNEL) SONIC_ONLINE_DEBS += $(BRCM_OPENNSL_KERNEL)

6
rules/linux-kernel.mk
View File

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