From 358949b4e5d245e5fc50942bb177c5fa96a7fbce Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Wed, 31 Jan 2018 11:39:48 -0800 Subject: [PATCH] Upgrade linux-image version (#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) --- build_debian.sh | 6 +++--- files/Aboot/boot0.j2 | 4 ++-- files/build_templates/swss.service.j2 | 4 ++-- installer/x86_64/install.sh | 4 ++-- platform/broadcom/sdk.mk | 4 ++-- platform/mellanox/mft.mk | 2 +- platform/mellanox/mft/Makefile | 5 ++--- platform/mellanox/sdk.mk | 2 +- platform/nephos/sdk.mk | 4 ++-- rules/linux-kernel.mk | 8 ++++---- src/igb/Makefile | 2 +- src/ixgbe/Makefile | 2 +- src/sonic-linux-kernel | 2 +- 13 files changed, 24 insertions(+), 25 deletions(-) diff --git a/build_debian.sh b/build_debian.sh index 6a27bd5d237f..2e0f7f152b51 100755 --- a/build_debian.sh +++ b/build_debian.sh @@ -114,7 +114,7 @@ echo '[INFO] Install SONiC linux kernel image' ## Note: duplicate apt-get command to ensure every line return zero sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/initramfs-tools_*.deb || \ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f -sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/linux-image-3.16.0-4-amd64_*.deb || \ +sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/linux-image-3.16.0-5-amd64_*.deb || \ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f ## Update initramfs for booting with squashfs+aufs @@ -145,10 +145,10 @@ sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/union-fsck sudo chroot $FILESYSTEM_ROOT update-initramfs -u ## Install latest intel igb driver -sudo cp target/debs/igb.ko $FILESYSTEM_ROOT/lib/modules/3.16.0-4-amd64/kernel/drivers/net/ethernet/intel/igb/igb.ko +sudo cp target/debs/igb.ko $FILESYSTEM_ROOT/lib/modules/3.16.0-5-amd64/kernel/drivers/net/ethernet/intel/igb/igb.ko ## Install latest intel ixgbe driver -sudo cp target/debs/ixgbe.ko $FILESYSTEM_ROOT/lib/modules/3.16.0-4-amd64/kernel/drivers/net/ethernet/intel/ixgbe/ixgbe.ko +sudo cp target/debs/ixgbe.ko $FILESYSTEM_ROOT/lib/modules/3.16.0-5-amd64/kernel/drivers/net/ethernet/intel/ixgbe/ixgbe.ko ## Install docker echo '[INFO] Install docker' diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2 index a2c683b20c91..3f2d2cdecc3c 100644 --- a/files/Aboot/boot0.j2 +++ b/files/Aboot/boot0.j2 @@ -18,8 +18,8 @@ set -x -kernel=boot/vmlinuz-3.16.0-4-amd64 -initrd=boot/initrd.img-3.16.0-4-amd64 +kernel=boot/vmlinuz-3.16.0-5-amd64 +initrd=boot/initrd.img-3.16.0-5-amd64 kernel_params=kernel-params aboot_machine="arista_unknown" diff --git a/files/build_templates/swss.service.j2 b/files/build_templates/swss.service.j2 index ebfb5027b297..bf847dba77c3 100644 --- a/files/build_templates/swss.service.j2 +++ b/files/build_templates/swss.service.j2 @@ -2,14 +2,14 @@ Description=switch state service Requires=database.service {% if sonic_asic_platform == 'broadcom' %} -Requires=opennsl-modules-3.16.0-4-amd64.service +Requires=opennsl-modules-3.16.0-5-amd64.service {% elif sonic_asic_platform == 'nephos' %} Requires=nps-modules-3.16.0-4-amd64.service {% endif %} After=database.service After=interfaces-config.service {% if sonic_asic_platform == 'broadcom' %} -After=opennsl-modules-3.16.0-4-amd64.service +After=opennsl-modules-3.16.0-5-amd64.service {% elif sonic_asic_platform == 'nephos' %} After=nps-modules-3.16.0-4-amd64.service {% endif %} diff --git a/installer/x86_64/install.sh b/installer/x86_64/install.sh index c7f184bf0242..517485ba03ea 100755 --- a/installer/x86_64/install.sh +++ b/installer/x86_64/install.sh @@ -549,11 +549,11 @@ menuentry '$demo_grub_entry' { if [ x$grub_platform = xxen ]; then insmod xzio; insmod lzopio; fi insmod part_msdos insmod ext2 - linux /$image_dir/boot/vmlinuz-3.16.0-4-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \ + linux /$image_dir/boot/vmlinuz-3.16.0-5-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \ loop=$image_dir/$FILESYSTEM_SQUASHFS loopfstype=squashfs \ 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 ...' - initrd /$image_dir/boot/initrd.img-3.16.0-4-amd64 + initrd /$image_dir/boot/initrd.img-3.16.0-5-amd64 } EOF diff --git a/platform/broadcom/sdk.mk b/platform/broadcom/sdk.mk index dbabf8aaba15..0b64033b93d8 100644 --- a/platform/broadcom/sdk.mk +++ b/platform/broadcom/sdk.mk @@ -1,4 +1,4 @@ -BRCM_OPENNSL_KERNEL = opennsl-modules-3.16.0-4-amd64_3.2.3.7-1_amd64.deb -$(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" +BRCM_OPENNSL_KERNEL = opennsl-modules-3.16.0-5-amd64_3.2.3.7-1_amd64.deb +$(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" SONIC_ONLINE_DEBS += $(BRCM_OPENNSL_KERNEL) diff --git a/platform/mellanox/mft.mk b/platform/mellanox/mft.mk index 966cb48c013f..2fb3af338d75 100644 --- a/platform/mellanox/mft.mk +++ b/platform/mellanox/mft.mk @@ -5,5 +5,5 @@ $(MFT)_SRC_PATH = $(PLATFORM_PATH)/mft $(MFT)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON) SONIC_MAKE_DEBS += $(MFT) -KERNEL_MFT = kernel-mft-dkms_4.5.0-3.16.0-4-amd64_all.deb +KERNEL_MFT = kernel-mft-dkms_4.5.0-$(KVERSION)_all.deb $(eval $(call add_derived_package,$(MFT),$(KERNEL_MFT))) diff --git a/platform/mellanox/mft/Makefile b/platform/mellanox/mft/Makefile index a5b1e8609b70..eea78cd76031 100644 --- a/platform/mellanox/mft/Makefile +++ b/platform/mellanox/mft/Makefile @@ -3,11 +3,10 @@ SHELL = /bin/bash MFT_NAME = mft-4.5.0-31-x86_64-deb MFT_TGZ = $(MFT_NAME).tgz -KERNELVER = 3.16.0-4-amd64 SRC_DEB = kernel-mft-dkms_4.5.0-31_all.deb MAIN_TARGET = mft-4.5.0-31.amd64.deb -DERIVED_TARGETS = kernel-mft-dkms_4.5.0-3.16.0-4-amd64_all.deb +DERIVED_TARGETS = kernel-mft-dkms_4.5.0-$(KVERSION)_all.deb $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : rm -rf $(MFT_NAME) @@ -22,7 +21,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : fi done - 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` + 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` popd # fix timestamp because we do not actually build tools, only kernel diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk index 5aaee09fdb1d..9dd8ff7703fa 100644 --- a/platform/mellanox/sdk.mk +++ b/platform/mellanox/sdk.mk @@ -1,4 +1,4 @@ -MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/564703412781016766b248b98266bd6f2c161431/sdk +MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/645052b0a285b190082beb858ba43a8b33bb667a/sdk MLNX_SDK_VERSION = 4.2.6011 MLNX_SDK_RDEBS += $(APPLIBS) $(IPROUTE2_MLNX) $(SX_ACL_RM) $(SX_COMPLIB) \ $(SX_EXAMPLES) $(SX_GEN_UTILS) $(SX_SCEW) $(SX_SDN_HAL) \ diff --git a/platform/nephos/sdk.mk b/platform/nephos/sdk.mk index 1bc7fe35c0d1..743512366db6 100644 --- a/platform/nephos/sdk.mk +++ b/platform/nephos/sdk.mk @@ -1,4 +1,4 @@ -NEPHOS_NPS_KERNEL = nps-modules-3.16.0-4-amd64_2.0.3a63-20180110_amd64.deb -$(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" +NEPHOS_NPS_KERNEL = nps-modules-3.16.0-5-amd64_2.0.3_amd64.deb +$(NEPHOS_NPS_KERNEL)_URL = "https://github.com/NephosInc/SONiC/raw/master/sdk/nps-modules-3.16.0-5-amd64_2.0.3_amd64.deb" SONIC_ONLINE_DEBS += $(NEPHOS_NPS_KERNEL) diff --git a/rules/linux-kernel.mk b/rules/linux-kernel.mk index 1e7fad0fd840..b7c1263990f5 100644 --- a/rules/linux-kernel.mk +++ b/rules/linux-kernel.mk @@ -1,9 +1,9 @@ # linux kernel package -KVERSION_SHORT = 3.16.0-4 -KVERSION = $(KVERSION_SHORT)-amd64 -KERNEL_VERSION = 3.16.43 -KERNEL_SUBVERSION = 2+deb8u5 +KVERSION_SHORT = 3.16.0-5 +KVERSION ?= $(KVERSION_SHORT)-amd64 +KERNEL_VERSION = 3.16.51 +KERNEL_SUBVERSION = 3+deb8u1 export KVERSION_SHORT KVERSION KERNEL_VERSION KERNEL_SUBVERSION diff --git a/src/igb/Makefile b/src/igb/Makefile index e814ce0a7db7..cafa96aba772 100644 --- a/src/igb/Makefile +++ b/src/igb/Makefile @@ -15,7 +15,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : # Build the package pushd src - export BUILD_KERNEL=3.16.0-4-amd64 + export BUILD_KERNEL=$(KVERSION) make popd diff --git a/src/ixgbe/Makefile b/src/ixgbe/Makefile index 133fc7db0570..90d20e606ef6 100644 --- a/src/ixgbe/Makefile +++ b/src/ixgbe/Makefile @@ -14,7 +14,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : # Build the package pushd src - export BUILD_KERNEL=3.16.0-4-amd64 + export BUILD_KERNEL=$(KVERSION) make popd diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel index ff5a3b588cc7..02b5c0b08f58 160000 --- a/src/sonic-linux-kernel +++ b/src/sonic-linux-kernel @@ -1 +1 @@ -Subproject commit ff5a3b588cc7dbd763fb13c1125710134c8cdd12 +Subproject commit 02b5c0b08f5812d1d7af98f77dfdb2bb11ad1991