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

[baseimage]: use debian 4.9.0-3 kernel

Browse Source
This commit is contained in:
Guohan Lu 2017-09-01 07:35:36 +00:00
parent 4d701ad037
commit ff1f508f33
6 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -3,7 +3,8 @@
url = https://github.com/Azure/sonic-swss-common url = https://github.com/Azure/sonic-swss-common
[submodule "sonic-linux-kernel"] [submodule "sonic-linux-kernel"]
path = src/sonic-linux-kernel path = src/sonic-linux-kernel
url = https://github.com/Azure/sonic-linux-kernel url = https://github.com/lguohan/sonic-linux-kernel
branch = stretch
[submodule "sonic-sairedis"] [submodule "sonic-sairedis"]
path = src/sonic-sairedis path = src/sonic-sairedis
url = https://github.com/Azure/sonic-sairedis url = https://github.com/Azure/sonic-sairedis

5
build_debian.sh
View File

@ -30,6 +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
## Working directory to prepare the file system ## Working directory to prepare the file system
FILESYSTEM_ROOT=./fsroot FILESYSTEM_ROOT=./fsroot
@ -110,7 +111,7 @@ echo '[INFO] Install SONiC linux kernel image'
## Note: duplicate apt-get command to ensure every line return zero ## Note: duplicate apt-get command to ensure every line return zero
sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/initramfs-tools_*.deb || \ 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 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-5-amd64_*.deb || \ sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/linux-image-${LINUX_KERNEL_VERSION}-amd64_*.deb || \
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
## Update initramfs for booting with squashfs+aufs ## Update initramfs for booting with squashfs+aufs
@ -148,7 +149,7 @@ sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/union-fsck
sudo chroot $FILESYSTEM_ROOT update-initramfs -u sudo chroot $FILESYSTEM_ROOT update-initramfs -u
## Install latest intel igb driver ## Install latest intel igb driver
sudo cp target/debs/igb.ko $FILESYSTEM_ROOT/lib/modules/3.16.0-5-amd64/kernel/drivers/net/ethernet/intel/igb/igb.ko sudo cp target/debs/igb.ko $FILESYSTEM_ROOT/lib/modules/${LINUX_KERNEL_VERSION}-amd64/kernel/drivers/net/ethernet/intel/igb/igb.ko
## Install latest intel ixgbe driver ## Install latest intel ixgbe driver
sudo cp target/debs/ixgbe.ko $FILESYSTEM_ROOT/lib/modules/3.16.0-5-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

4
installer/x86_64/install.sh
View File

@ -570,11 +570,11 @@ 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-3.16.0-5-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \ linux /$image_dir/boot/vmlinuz-4.9.0-3-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
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-3.16.0-5-amd64 initrd /$image_dir/boot/initrd.img-4.9.0-3-amd64
} }
EOF EOF

8
rules/linux-kernel.mk
View File

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

2
slave.mk
View File

@ -447,6 +447,8 @@ $(DOCKER_LOAD_TARGETS) : $(TARGET_PATH)/%.gz-load : .platform docker-start $$(TA
$(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
.platform \ .platform \
onie-image.conf \ onie-image.conf \
build_debian.sh \
build_image.sh \
$$(addsuffix -install,$$(addprefix $(DEBS_PATH)/,$$($$*_DEPENDS))) \ $$(addsuffix -install,$$(addprefix $(DEBS_PATH)/,$$($$*_DEPENDS))) \
$$(addprefix $(DEBS_PATH)/,$$($$*_INSTALLS)) \ $$(addprefix $(DEBS_PATH)/,$$($$*_INSTALLS)) \
$$(addprefix $(DEBS_PATH)/,$$($$*_LAZY_INSTALLS)) \ $$(addprefix $(DEBS_PATH)/,$$($$*_LAZY_INSTALLS)) \

2
src/igb/Makefile
View File

@ -15,7 +15,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
# Build the package # Build the package
pushd src pushd src
export BUILD_KERNEL=$(KVERSION) export BUILD_KERNEL=4.9.0-3-amd64
make make
popd popd