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

Jump to bottom

[sonic-buildimage] Kernel abiname change #2171

Closed
wants to merge 1 commit into from
Closed

[sonic-buildimage] Kernel abiname change #2171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion build_debian.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ set -x -e

## docker engine version (with platform)
DOCKER_VERSION=1.11.1-0~stretch_amd64
LINUX_KERNEL_VERSION=4.9.0-7
LINUX_KERNEL_ABI_MINOR_VERSION=1
LINUX_KERNEL_VERSION=4.9.0-7-$LINUX_KERNEL_ABI_MINOR_VERSION

## Working directory to prepare the file system
FILESYSTEM_ROOT=./fsroot
Expand Down
4 changes: 2 additions & 2 deletions files/build_templates/swss.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
Description=switch state service
Requires=database.service updategraph.service
{% if sonic_asic_platform == 'broadcom' %}
Requires=opennsl-modules-4.9.0-7-amd64.service
Requires=opennsl-modules-4.9.0-7-1-amd64.service
{% elif sonic_asic_platform == 'nephos' %}
Requires=nps-modules-4.9.0-7-amd64.service
Requires=nps-modules-4.9.0-7-1-amd64.service
{% endif %}
After=database.service updategraph.service
After=interfaces-config.service
Expand Down
8 changes: 4 additions & 4 deletions files/build_templates/syncd.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
Description=syncd service
Requires=database.service updategraph.service
{% if sonic_asic_platform == 'broadcom' %}
Requires=opennsl-modules-4.9.0-7-amd64.service
Requires=opennsl-modules-4.9.0-7-1-amd64.service
{% elif sonic_asic_platform == 'nephos' %}
Requires=nps-modules-4.9.0-7-amd64.service
Requires=nps-modules-4.9.0-7-1-amd64.service
{% endif %}
After=database.service updategraph.service
After=interfaces-config.service
{% if sonic_asic_platform == 'broadcom' %}
After=opennsl-modules-4.9.0-7-amd64.service
After=opennsl-modules-4.9.0-7-1-amd64.service
{% elif sonic_asic_platform == 'nephos' %}
After=nps-modules-4.9.0-7-amd64.service
After=nps-modules-4.9.0-7-1-amd64.service
{% endif %}

[Service]
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 @@ -595,12 +595,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.9.0-7-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
linux /$image_dir/boot/vmlinuz-4.9.0-7-1-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.9.0-7-amd64
initrd /$image_dir/boot/initrd.img-4.9.0-7-1-amd64
}
EOF

Expand Down
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: platform-modules-bfn-montara
Architecture: amd64
Depends: linux-image-4.9.0-7-amd64
Depends: linux-image-4.9.0-7-1-amd64
Description: kernel modules for platform 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: platform-modules-bfn
Architecture: amd64
Depends: linux-image-4.9.0-7-amd64
Depends: linux-image-4.9.0-7-1-amd64
Description: kernel modules for platform devices such as fan, led, sfp

3 changes: 2 additions & 1 deletion platform/broadcom/sai-modules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Broadcom SAI modules

KVERSION = 4.9.0-7-amd64
KERNEL_ABI_MINOR_VERSION=1
KVERSION = 4.9.0-7-$(KERNEL_ABI_MINOR_VERSION)-amd64
BRCM_OPENNSL_KERNEL_VERSION = 3.4.1.11-1

BRCM_OPENNSL_KERNEL = opennsl-modules-$(KVERSION)_$(BRCM_OPENNSL_KERNEL_VERSION)_amd64.deb
Expand Down
4 changes: 2 additions & 2 deletions platform/broadcom/saibcm-modules/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ Standards-Version: 3.9.3
#Vcs-Git: git://git.debian.org/collab-maint/bcmsdk.git
#Vcs-Browser: http://git.debian.org/?p=collab-maint/bcmsdk.git;a=summary

Package: opennsl-modules-4.9.0-7-amd64
Package: opennsl-modules-4.9.0-7-1-amd64
Architecture: amd64
Section: main
Depends: linux-image-4.9.0-7-amd64
Depends: linux-image-4.9.0-7-1-amd64
Description: kernel modules for broadcom SAI
1 change: 0 additions & 1 deletion platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-7-amd64.dirs
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-7-amd64.init
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions platform/broadcom/saibcm-modules/debian/opennsl-modules-4.9.0-7-amd64.install
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions platform/broadcom/saibcm-modules/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ kdist_config: prep-deb-files
kdist_clean: clean
dh_testdir
dh_clean
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 KERNDIR=/usr/src/linux-headers-4.9.0-7-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-7-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 KERNDIR=/usr/src/linux-headers-4.9.0-7-1-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-7-1-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
# rm -f driver/*.o driver/*.ko
#
### end KERNEL SETUP
Expand All @@ -78,7 +78,7 @@ build-arch-stamp:
dh_testdir

# Add here command to compile/build the package.
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 KERNDIR=/usr/src/linux-headers-4.9.0-7-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-7-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 KERNDIR=/usr/src/linux-headers-4.9.0-7-1-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-7-1-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6

touch $@

Expand All @@ -103,7 +103,7 @@ clean:
rm -f build-arch-stamp build-indep-stamp configure-stamp

# Add here commands to clean up after the build process.
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 KERNDIR=/usr/src/linux-headers-4.9.0-7-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-7-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 KERNDIR=/usr/src/linux-headers-4.9.0-7-1-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-7-1-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean

dh_clean

Expand Down
4 changes: 2 additions & 2 deletions ...emd/opennsl-modules-4.9.0-7-amd64.service → ...d/opennsl-modules-4.9.0-7-1-amd64.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Before=syncd.service

[Service]
Type=oneshot
ExecStart=-/etc/init.d/opennsl-modules-4.9.0-7-amd64 start
ExecStop=-/etc/init.d/opennsl-modules-4.9.0-7-amd64 stop
ExecStart=-/etc/init.d/opennsl-modules-4.9.0-7-1-amd64 start
ExecStop=-/etc/init.d/opennsl-modules-4.9.0-7-1-amd64 stop
RemainAfterExit=yes

[Install]
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.9.0-7-amd64
Depends: linux-image-4.9.0-7-1-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Package: sonic-platform-alphanetworks-snh60b0-640f
Architecture: amd64
Depends: linux-image-4.9.0-7-amd64
Depends: linux-image-4.9.0-7-1-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Empty file modified platform/broadcom/sonic-platform-modules-alphanetworks/debian/rules
100644 → 100755
View file
Open in desktop
Empty file.
4 changes: 2 additions & 2 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,11 +7,11 @@ Standards-Version: 3.9.3

Package: platform-modules-dx010
Architecture: amd64
Depends: linux-image-4.9.0-7-amd64
Depends: linux-image-4.9.0-7-1-amd64
Description: kernel modules for platform devices such as fan, led, sfp


Package: platform-modules-haliburton
Architecture: amd64
Depends: linux-image-4.9.0-7-amd64
Depends: linux-image-4.9.0-7-1-amd64
Description: kernel modules for platform devices such as fan, led, sfp
6 changes: 3 additions & 3 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,16 +7,16 @@ Standards-Version: 3.9.3

Package: platform-modules-z9264f
Architecture: amd64
Depends: linux-image-4.9.0-7-amd64
Depends: linux-image-4.9.0-7-1-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-z9100
Architecture: amd64
Depends: linux-image-4.9.0-7-amd64
Depends: linux-image-4.9.0-7-1-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-s6100
Architecture: amd64
Depends: linux-image-4.9.0-7-amd64
Depends: linux-image-4.9.0-7-1-amd64
Description: kernel modules for platform devices such as fan, led, sfp

8 changes: 4 additions & 4 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,21 +7,21 @@ Standards-Version: 3.9.3

Package: platform-modules-ag9032v1
Architecture: amd64
Depends: linux-image-4.9.0-7-amd64
Depends: linux-image-4.9.0-7-1-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-ag9064
Architecture: amd64
Depends: linux-image-4.9.0-7-amd64
Depends: linux-image-4.9.0-7-1-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-ag5648
Architecture: amd64
Depends: linux-image-4.9.0-7-amd64
Depends: linux-image-4.9.0-7-1-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-et-6248brb
Architecture: amd64
Depends: linux-image-4.9.0-7-amd64
Depends: linux-image-4.9.0-7-1-amd64
Description: kernel modules for platform devices such as fan, led, sfp

2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-delta/debian/platform-modules-et-6248brb.init
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ start)
modprobe dni_gpio
modprobe delta_et-6248brb_platform

if [ `uname -a | awk '{print $3}'` = "4.9.0-7-amd64" ]; then
if [ `uname -a | awk '{print $3}'` = "4.9.0-7-1-amd64" ]; then
echo "453" > "/sys/class/gpio/export"
echo "454" > "/sys/class/gpio/export"
echo "455" > "/sys/class/gpio/export"
Expand Down
2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-delta/et-6248brb/scripts/led_status.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ FAN2_RPM="/sys/bus/i2c/devices/0-002e/fan2_input"
FAN_TRAY1_LED="/sys/devices/platform/delta-et6248brb-gpio.0/FAN/fan1_led_ag"
FAN_TRAY2_LED="/sys/devices/platform/delta-et6248brb-gpio.0/FAN/fan2_led_ag"

if [ `uname -a | awk '{print $3}'` = "4.9.0-7-amd64" ]; then
if [ `uname -a | awk '{print $3}'` = "4.9.0-7-1-amd64" ]; then
SYS_LED_G="/sys/class/gpio/gpio453/value"
SYS_LED_R="/sys/class/gpio/gpio454/value"
PWR_LED_G="/sys/class/gpio/gpio455/value"
Expand Down
10 changes: 5 additions & 5 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,25 +7,25 @@ Standards-Version: 3.9.3

Package: platform-modules-d7032q28b
Architecture: amd64
Depends: linux-image-4.9.0-7-amd64
Depends: linux-image-4.9.0-7-1-amd64
Description: kernel modules for platform devices such as fan, led

Package: platform-modules-d7054q28b
Architecture: amd64
Depends: linux-image-4.9.0-7-amd64
Depends: linux-image-4.9.0-7-1-amd64
Description: kernel modules for platform devices such as fan, led

Package: platform-modules-d6254qs
Architecture: amd64
Depends: linux-image-4.9.0-7-amd64
Depends: linux-image-4.9.0-7-1-amd64
Description: kernel modules for platform devices such as fan, led

Package: platform-modules-d6556
Architecture: amd64
Depends: linux-image-4.9.0-7-amd64
Depends: linux-image-4.9.0-7-1-amd64
Description: kernel modules for platform devices such as fan, led

Package: platform-modules-d7264q28b
Architecture: amd64
Depends: linux-image-4.9.0-7-amd64
Depends: linux-image-4.9.0-7-1-amd64
Description: kernel modules for platform devices such as fan, led
2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-s6000/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-s6000
Architecture: amd64
Depends: linux-image-4.9.0-7-amd64
Depends: linux-image-4.9.0-7-1-amd64
Description: kernel modules for platform devices such as fan, led, sfp

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

KVERSION_SHORT = 4.9.0-7
KERNEL_ABI_MINOR_VERSION = 1
KVERSION_SHORT = 4.9.0-7-$(KERNEL_ABI_MINOR_VERSION)
KVERSION = $(KVERSION_SHORT)-amd64
KERNEL_VERSION = 4.9.110
KERNEL_SUBVERSION = 3+deb9u2
Expand Down