Skip to content

Commit 358949b

Browse files
qiluo-msftqiluo-msft
authored
Upgrade linux-image version (sonic-net#1294)
* Upgrade linux-image version * Add missing dependency of igb * Fix mft build rule * Add missing dependency of ixgbe * [Broadcom]: Update OpenNSL modules to be compatible with kernel 3.16.0-5 (#3) * [Nephos] Update SDK version to support new kernel module 3.16.0-5 (#4) * [mellanox]: Update URL for SDK (#5)
1 parent a4a91cb commit 358949b

File tree

13 files changed

+24
-25
lines changed

13 files changed

+24
-25
lines changed

‎build_debian.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ echo '[INFO] Install SONiC linux kernel image'
114114
## Note: duplicate apt-get command to ensure every line return zero
115115
sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/initramfs-tools_*.deb || \
116116
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
117-
sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/linux-image-3.16.0-4-amd64_*.deb || \
117+
sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/linux-image-3.16.0-5-amd64_*.deb || \
118118
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
119119

120120
## Update initramfs for booting with squashfs+aufs
@@ -145,10 +145,10 @@ sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/union-fsck
145145
sudo chroot $FILESYSTEM_ROOT update-initramfs -u
146146

147147
## Install latest intel igb driver
148-
sudo cp target/debs/igb.ko $FILESYSTEM_ROOT/lib/modules/3.16.0-4-amd64/kernel/drivers/net/ethernet/intel/igb/igb.ko
148+
sudo cp target/debs/igb.ko $FILESYSTEM_ROOT/lib/modules/3.16.0-5-amd64/kernel/drivers/net/ethernet/intel/igb/igb.ko
149149

150150
## Install latest intel ixgbe driver
151-
sudo cp target/debs/ixgbe.ko $FILESYSTEM_ROOT/lib/modules/3.16.0-4-amd64/kernel/drivers/net/ethernet/intel/ixgbe/ixgbe.ko
151+
sudo cp target/debs/ixgbe.ko $FILESYSTEM_ROOT/lib/modules/3.16.0-5-amd64/kernel/drivers/net/ethernet/intel/ixgbe/ixgbe.ko
152152

153153
## Install docker
154154
echo '[INFO] Install docker'

‎files/Aboot/boot0.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
set -x
2020

21-
kernel=boot/vmlinuz-3.16.0-4-amd64
22-
initrd=boot/initrd.img-3.16.0-4-amd64
21+
kernel=boot/vmlinuz-3.16.0-5-amd64
22+
initrd=boot/initrd.img-3.16.0-5-amd64
2323
kernel_params=kernel-params
2424

2525
aboot_machine="arista_unknown"

‎files/build_templates/swss.service.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
Description=switch state service
33
Requires=database.service
44
{% if sonic_asic_platform == 'broadcom' %}
5-
Requires=opennsl-modules-3.16.0-4-amd64.service
5+
Requires=opennsl-modules-3.16.0-5-amd64.service
66
{% elif sonic_asic_platform == 'nephos' %}
77
Requires=nps-modules-3.16.0-4-amd64.service
88
{% endif %}
99
After=database.service
1010
After=interfaces-config.service
1111
{% if sonic_asic_platform == 'broadcom' %}
12-
After=opennsl-modules-3.16.0-4-amd64.service
12+
After=opennsl-modules-3.16.0-5-amd64.service
1313
{% elif sonic_asic_platform == 'nephos' %}
1414
After=nps-modules-3.16.0-4-amd64.service
1515
{% endif %}

‎installer/x86_64/install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -549,11 +549,11 @@ menuentry '$demo_grub_entry' {
549549
if [ x$grub_platform = xxen ]; then insmod xzio; insmod lzopio; fi
550550
insmod part_msdos
551551
insmod ext2
552-
linux /$image_dir/boot/vmlinuz-3.16.0-4-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
552+
linux /$image_dir/boot/vmlinuz-3.16.0-5-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
553553
loop=$image_dir/$FILESYSTEM_SQUASHFS loopfstype=squashfs \
554554
apparmor=1 security=apparmor varlog_size=$VAR_LOG_SIZE usbcore.autosuspend=-1 $ONIE_PLATFORM_EXTRA_CMDLINE_LINUX
555555
echo 'Loading $demo_volume_label $demo_type initial ramdisk ...'
556-
initrd /$image_dir/boot/initrd.img-3.16.0-4-amd64
556+
initrd /$image_dir/boot/initrd.img-3.16.0-5-amd64
557557
}
558558
EOF
559559

‎platform/broadcom/sdk.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
BRCM_OPENNSL_KERNEL = opennsl-modules-3.16.0-4-amd64_3.2.3.7-1_amd64.deb
2-
$(BRCM_OPENNSL_KERNEL)_URL = "https://sonicstorage.blob.core.windows.net/packages/opennsl-modules-3.16.0-4-amd64_3.2.3.7-1_amd64.deb?sv=2015-04-05&sr=b&sig=BJEFXfq2mgvSTIYZF8qF1Jj2ePkJaxBmA0HqhhAFPmQ%3D&se=2031-08-11T03%3A27%3A43Z&sp=r"
1+
BRCM_OPENNSL_KERNEL = opennsl-modules-3.16.0-5-amd64_3.2.3.7-1_amd64.deb
2+
$(BRCM_OPENNSL_KERNEL)_URL = "https://sonicstorage.blob.core.windows.net/packages/opennsl-modules-3.16.0-5-amd64_3.2.3.7-1_amd64.deb?sv=2015-04-05&sr=b&sig=R%2BQp4mHlNi489Q6HP7vFUdBDmDazbiL02hQFdxYkCI0%3D&se=2031-09-27T20%3A17%3A41Z&sp=r"
33

44
SONIC_ONLINE_DEBS += $(BRCM_OPENNSL_KERNEL)

‎platform/mellanox/mft.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ $(MFT)_SRC_PATH = $(PLATFORM_PATH)/mft
55
$(MFT)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
66
SONIC_MAKE_DEBS += $(MFT)
77

8-
KERNEL_MFT = kernel-mft-dkms_4.5.0-3.16.0-4-amd64_all.deb
8+
KERNEL_MFT = kernel-mft-dkms_4.5.0-$(KVERSION)_all.deb
99
$(eval $(call add_derived_package,$(MFT),$(KERNEL_MFT)))

‎platform/mellanox/mft/Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ SHELL = /bin/bash
33

44
MFT_NAME = mft-4.5.0-31-x86_64-deb
55
MFT_TGZ = $(MFT_NAME).tgz
6-
KERNELVER = 3.16.0-4-amd64
76
SRC_DEB = kernel-mft-dkms_4.5.0-31_all.deb
87

98
MAIN_TARGET = mft-4.5.0-31.amd64.deb
10-
DERIVED_TARGETS = kernel-mft-dkms_4.5.0-3.16.0-4-amd64_all.deb
9+
DERIVED_TARGETS = kernel-mft-dkms_4.5.0-$(KVERSION)_all.deb
1110

1211
$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
1312
rm -rf $(MFT_NAME)
@@ -22,7 +21,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
2221
fi
2322
done
2423

25-
tar xvf `sudo dkms mkdriverdisk kernel-mft-dkms/4.5.0 -a all -d ubuntu -k $(KERNELVER) --media tar | grep "Disk image location" | cut -d':' -f2`
24+
tar xvf `sudo dkms mkdriverdisk kernel-mft-dkms/4.5.0 -a all -d ubuntu -k $(KVERSION) --media tar | grep "Disk image location" | cut -d':' -f2`
2625
popd
2726

2827
# fix timestamp because we do not actually build tools, only kernel

‎platform/mellanox/sdk.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/564703412781016766b248b98266bd6f2c161431/sdk
1+
MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/645052b0a285b190082beb858ba43a8b33bb667a/sdk
22
MLNX_SDK_VERSION = 4.2.6011
33
MLNX_SDK_RDEBS += $(APPLIBS) $(IPROUTE2_MLNX) $(SX_ACL_RM) $(SX_COMPLIB) \
44
$(SX_EXAMPLES) $(SX_GEN_UTILS) $(SX_SCEW) $(SX_SDN_HAL) \

‎platform/nephos/sdk.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
NEPHOS_NPS_KERNEL = nps-modules-3.16.0-4-amd64_2.0.3a63-20180110_amd64.deb
2-
$(NEPHOS_NPS_KERNEL)_URL = "https://github.com/NephosInc/SONiC/raw/master/sdk/nps-modules-3.16.0-4-amd64_2.0.3a63-20180110_amd64.deb"
1+
NEPHOS_NPS_KERNEL = nps-modules-3.16.0-5-amd64_2.0.3_amd64.deb
2+
$(NEPHOS_NPS_KERNEL)_URL = "https://github.com/NephosInc/SONiC/raw/master/sdk/nps-modules-3.16.0-5-amd64_2.0.3_amd64.deb"
33

44
SONIC_ONLINE_DEBS += $(NEPHOS_NPS_KERNEL)

‎rules/linux-kernel.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# linux kernel package
22

3-
KVERSION_SHORT = 3.16.0-4
4-
KVERSION = $(KVERSION_SHORT)-amd64
5-
KERNEL_VERSION = 3.16.43
6-
KERNEL_SUBVERSION = 2+deb8u5
3+
KVERSION_SHORT = 3.16.0-5
4+
KVERSION ?= $(KVERSION_SHORT)-amd64
5+
KERNEL_VERSION = 3.16.51
6+
KERNEL_SUBVERSION = 3+deb8u1
77

88
export KVERSION_SHORT KVERSION KERNEL_VERSION KERNEL_SUBVERSION
99

‎src/igb/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
1515

1616
# Build the package
1717
pushd src
18-
export BUILD_KERNEL=3.16.0-4-amd64
18+
export BUILD_KERNEL=$(KVERSION)
1919
make
2020
popd
2121

‎src/ixgbe/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
1414

1515
# Build the package
1616
pushd src
17-
export BUILD_KERNEL=3.16.0-4-amd64
17+
export BUILD_KERNEL=$(KVERSION)
1818
make
1919
popd
2020

‎src/sonic-linux-kernel

0 commit comments

Comments
 (0)