Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kernel ABI update from version 6 to version 6-2 #4711

Merged
merged 11 commits into from
Jun 21, 2020
Merged

kernel ABI update from version 6 to version 6-2 #4711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4fed493
Disable kernel ABI check
olivier-singla Jun 4, 2020
a51aa8b
Disable kernel ABI check
olivier-singla Jun 4, 2020
c8ba9ba
Merge branch 'abi_update' of https://github.com/olivier-singla/sonic-…
olivier-singla Jun 4, 2020
f490fc3
Reverted a file commited by mistake
olivier-singla Jun 4, 2020
14f20db
Removed a file commited by mistake
olivier-singla Jun 4, 2020
44fead9
Disable kernel ABI check
olivier-singla Jun 4, 2020
34539ce
Reverted a file commited by mistake
olivier-singla Jun 4, 2020
ad49729
Removed a file commited by mistake
olivier-singla Jun 4, 2020
f75a88b
Merge branch 'abi_update' of https://github.com/olivier-singla/sonic-…
olivier-singla Jun 12, 2020
7e7b08e
Update sonic-linux-kernel to master branch
olivier-singla Jun 13, 2020
79fc138
merged with latest master
olivier-singla Jun 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build_debian.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
else
DOCKER_VERSION=5:18.09.8~3-0~debian-$IMAGE_DISTRO
fi
LINUX_KERNEL_VERSION=4.19.0-6
LINUX_KERNEL_VERSION=4.19.0-6-2

## Working directory to prepare the file system
FILESYSTEM_ROOT=./fsroot
Expand Down
4 changes: 2 additions & 2 deletions installer/x86_64/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,12 +609,12 @@ 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-4.19.0-6-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
linux /$image_dir/boot/vmlinuz-4.19.0-6-2-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
net.ifnames=0 biosdevname=0 \
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-4.19.0-6-amd64
initrd /$image_dir/boot/initrd.img-4.19.0-6-2-amd64
}
EOF

Expand Down
2 changes: 1 addition & 1 deletion platform/barefoot/bfn-modules/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Standards-Version: 3.9.3

Package: bfn-modules
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for bfn asic for mmap

2 changes: 1 addition & 1 deletion platform/barefoot/sonic-platform-modules-bfn-montara/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Standards-Version: 3.9.3

Package: sonic-platform-modules-bfn-montara
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

2 changes: 1 addition & 1 deletion platform/barefoot/sonic-platform-modules-bfn-newport/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Standards-Version: 3.9.3

Package: sonic-platform-modules-bfn-newport
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel module for bfn platform fpga and scripts for the devices such as fan, led, sfp

2 changes: 1 addition & 1 deletion platform/barefoot/sonic-platform-modules-bfn/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Standards-Version: 3.9.3

Package: sonic-platform-modules-bfn
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

2 changes: 1 addition & 1 deletion platform/barefoot/sonic-platform-modules-wnc-osw1800/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Standards-Version: 3.9.3

Package: platform-modules-wnc-osw1800
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

2 changes: 1 addition & 1 deletion platform/broadcom/saibcm-modules/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ Standards-Version: 3.9.3
Package: opennsl-modules
Architecture: amd64
Section: main
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for broadcom SAI
2 changes: 1 addition & 1 deletion platform/broadcom/saibcm-modules/debian/opennsl-modules.dirs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lib/modules/4.19.0-6-amd64/extra
lib/modules/4.19.0-6-2-amd64/extra
10 changes: 5 additions & 5 deletions platform/broadcom/saibcm-modules/debian/opennsl-modules.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.19.0-6-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.19.0-6-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.19.0-6-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.19.0-6-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/psample.ko lib/modules/4.19.0-6-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.19.0-6-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.19.0-6-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.19.0-6-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.19.0-6-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/psample.ko lib/modules/4.19.0-6-2-amd64/extra
systemd/opennsl-modules.service lib/systemd/system
2 changes: 1 addition & 1 deletion platform/broadcom/saibcm-modules/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ sname:=opennsl
PACKAGE=opennsl-modules
# modifieable for experiments or debugging m-a
MA_DIR ?= /usr/share/modass
KVERSION ?= 4.19.0-6-amd64
KVERSION ?= 4.19.0-6-2-amd64
# load generic variable handling
-include $(MA_DIR)/include/generic.make
# load default rules, including kdist, kdist_image, ...
Expand Down
4 changes: 2 additions & 2 deletions platform/broadcom/sonic-platform-modules-alphanetworks/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ Standards-Version: 3.9.3

Package: sonic-platform-alphanetworks-snh60a0-320fv2
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: sonic-platform-alphanetworks-snh60b0-640f
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

8 changes: 4 additions & 4 deletions platform/broadcom/sonic-platform-modules-cel/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@ Standards-Version: 3.9.3

Package: platform-modules-dx010
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp


Package: platform-modules-haliburton
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-seastone2
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as led, sfp

Package: platform-modules-silverstone
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as led, sfp.
14 changes: 7 additions & 7 deletions platform/broadcom/sonic-platform-modules-dell/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,35 +7,35 @@ Standards-Version: 3.9.3

Package: platform-modules-s6000
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-z9100
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-s6100
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-z9264f
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-s5232f
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-s5248f
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-z9332f
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
12 changes: 6 additions & 6 deletions platform/broadcom/sonic-platform-modules-delta/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,30 @@ Standards-Version: 3.9.3

Package: platform-modules-ag9032v1
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-ag9064
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-ag5648
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-et-6248brb
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-ag9032v2a
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as syseeprom, sfp

Package: platform-modules-agc032
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
12 changes: 6 additions & 6 deletions platform/broadcom/sonic-platform-modules-inventec/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,30 @@ Standards-Version: 3.9.3

Package: platform-modules-d7032q28b
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led

Package: platform-modules-d7054q28b
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led

Package: platform-modules-d6254qs
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led

Package: platform-modules-d6556
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led

Package: platform-modules-d6356
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led

Package: platform-modules-d7264q28b
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led
2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-mitac/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Standards-Version: 3.9.3

Package: sonic-platform-mitac-ly1200-32x
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

2 changes: 1 addition & 1 deletion platform/cavium/cavm_platform_modules/DEBIAN/control
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: cavm-platform-modules
Version: 1.0
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Maintainer: [email protected]
Description: kernel modules for platform devices such as fan, led, sfp
4 changes: 2 additions & 2 deletions platform/centec/sonic-platform-modules-e582/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ Standards-Version: 3.9.3

Package: platform-modules-e582-48x2q4z
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-e582-48x6q
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

2 changes: 1 addition & 1 deletion platform/centec/sonic-platform-modules-embedway/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Standards-Version: 3.9.3

Package: platform-modules-embedway-es6220
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

2 changes: 1 addition & 1 deletion platform/innovium/sonic-platform-modules-cel/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ Standards-Version: 3.9.3

Package: platform-modules-midstone-200i
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices
2 changes: 1 addition & 1 deletion platform/innovium/sonic-platform-modules-delta/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Standards-Version: 3.9.3

Package: platform-modules-et-c032if
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp


2 changes: 1 addition & 1 deletion platform/nephos/nephos-modules/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Standards-Version: 3.9.3

Package: nephos-modules
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for nephos asic

2 changes: 1 addition & 1 deletion platform/nephos/sonic-platform-modules-accton/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ Standards-Version: 3.9.3

Package: sonic-platform-accton-as7116-54x
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
6 changes: 3 additions & 3 deletions platform/nephos/sonic-platform-modules-cig/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ Standards-Version: 3.9.3

Package: sonic-platform-cig-cs6436-56p
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: sonic-platform-cig-cs6436-54p
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

Package: sonic-platform-cig-cs5435-54p
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp
2 changes: 1 addition & 1 deletion platform/nephos/sonic-platform-modules-pegatron/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Standards-Version: 3.9.3

Package: sonic-platform-pegatron-porsche
Architecture: amd64
Depends: linux-image-4.19.0-6-amd64-unsigned
Depends: linux-image-4.19.0-6-2-amd64-unsigned
Description: kernel modules for platform devices such as fan, led, sfp

2 changes: 1 addition & 1 deletion rules/linux-kernel.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# linux kernel package

KVERSION_SHORT = 4.19.0-6
KVERSION_SHORT = 4.19.0-6-2
KVERSION = $(KVERSION_SHORT)-$(CONFIGURED_ARCH)
KERNEL_VERSION = 4.19.67
KERNEL_SUBVERSION = 2+deb10u2
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-linux-kernel
Open in desktop
Submodule sonic-linux-kernel updated from 157376 to 0776e9