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

[submodule] update sonic-linux-kernel (#2985)

Browse Source 
* [submodule] update sonic-linux-kernel
* update linux kernel version
* Fix many version strings
* update mellanox components (built with new kernel)
* [mlnx] add make files for SDK WJH libs
* Update arista driver submodule (#8)
Make the debian packaging point to a newer kernel version.
This commit is contained in:
Qi Luo 2019-06-18 10:00:16 -07:00 committed by GitHub
parent d67c6d4bf7
commit e7b1988638
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
35 changed files with 102 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_debian.sh
View File

@ -30,7 +30,7 @@ set -x -e
## docker engine version (with platform) ## docker engine version (with platform)
DOCKER_VERSION=5:18.09.2~3-0~debian-stretch DOCKER_VERSION=5:18.09.2~3-0~debian-stretch
LINUX_KERNEL_VERSION=4.9.0-8-2 LINUX_KERNEL_VERSION=4.9.0-9-2
## Working directory to prepare the file system ## Working directory to prepare the file system
FILESYSTEM_ROOT=./fsroot FILESYSTEM_ROOT=./fsroot

2
files/build_templates/swss.service.j2
View File

@ -4,7 +4,7 @@ Requires=database.service updategraph.service
{% if sonic_asic_platform == 'broadcom' %} {% if sonic_asic_platform == 'broadcom' %}
Requires=opennsl-modules.service Requires=opennsl-modules.service
{% elif sonic_asic_platform == 'nephos' %} {% elif sonic_asic_platform == 'nephos' %}
Requires=nps-modules-4.9.0-8-2-amd64.service Requires=nps-modules-4.9.0-9-2-amd64.service
{% endif %} {% endif %}
After=database.service updategraph.service After=database.service updategraph.service
After=interfaces-config.service After=interfaces-config.service

4
files/build_templates/syncd.service.j2
View File

@ -4,14 +4,14 @@ Requires=database.service updategraph.service
{% if sonic_asic_platform == 'broadcom' %} {% if sonic_asic_platform == 'broadcom' %}
Requires=opennsl-modules.service Requires=opennsl-modules.service
{% elif sonic_asic_platform == 'nephos' %} {% elif sonic_asic_platform == 'nephos' %}
Requires=nps-modules-4.9.0-8-2-amd64.service Requires=nps-modules-4.9.0-9-2-amd64.service
{% endif %} {% endif %}
After=database.service updategraph.service After=database.service updategraph.service
After=interfaces-config.service After=interfaces-config.service
{% if sonic_asic_platform == 'broadcom' %} {% if sonic_asic_platform == 'broadcom' %}
After=opennsl-modules.service After=opennsl-modules.service
{% elif sonic_asic_platform == 'nephos' %} {% elif sonic_asic_platform == 'nephos' %}
After=nps-modules-4.9.0-8-2-amd64.service After=nps-modules-4.9.0-9-2-amd64.service
{% endif %} {% endif %}
After=swss.service After=swss.service
Before=ntp-config.service Before=ntp-config.service

4
installer/x86_64/install.sh
View File

@ -595,12 +595,12 @@ 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-4.9.0-8-2-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \ linux /$image_dir/boot/vmlinuz-4.9.0-9-2-amd64 root=$grub_cfg_root rw $GRUB_CMDLINE_LINUX \
net.ifnames=0 biosdevname=0 \ net.ifnames=0 biosdevname=0 \
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-4.9.0-8-2-amd64 initrd /$image_dir/boot/initrd.img-4.9.0-9-2-amd64
} }
EOF EOF

2
platform/barefoot/bfn-modules/debian/control
View File

@ -7,6 +7,6 @@ Standards-Version: 3.9.3
Package: bfn-modules Package: bfn-modules
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64 Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for bfn asic for mmap Description: kernel modules for bfn asic for mmap

2
platform/barefoot/sonic-platform-modules-arista

@ -1 +1 @@
Subproject commit 7b7c79ee463b43e570c48915215cdbf6ec250225 Subproject commit ad5abe1205c0bf6926d62a497a9b435aaeb174ee

2
platform/barefoot/sonic-platform-modules-bfn-montara/debian/control
View File

@ -7,6 +7,6 @@ Standards-Version: 3.9.3
Package: sonic-platform-modules-bfn-montara Package: sonic-platform-modules-bfn-montara
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64 Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp

2
platform/barefoot/sonic-platform-modules-bfn/debian/control
View File

@ -7,6 +7,6 @@ Standards-Version: 3.9.3
Package: sonic-platform-modules-bfn Package: sonic-platform-modules-bfn
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64 Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp

2
platform/broadcom/sai-modules.mk
View File

@ -1,6 +1,6 @@
# Broadcom SAI modules # Broadcom SAI modules
KVERSION = 4.9.0-8-2-amd64 KVERSION = 4.9.0-9-2-amd64
BRCM_OPENNSL_KERNEL_VERSION = 3.4.1.11-1 BRCM_OPENNSL_KERNEL_VERSION = 3.4.1.11-1
BRCM_OPENNSL_KERNEL = opennsl-modules_$(BRCM_OPENNSL_KERNEL_VERSION)_amd64.deb BRCM_OPENNSL_KERNEL = opennsl-modules_$(BRCM_OPENNSL_KERNEL_VERSION)_amd64.deb

2
platform/broadcom/saibcm-modules/debian/control
View File

@ -10,5 +10,5 @@ Standards-Version: 3.9.3
Package: opennsl-modules Package: opennsl-modules
Architecture: amd64 Architecture: amd64
Section: main Section: main
Depends: linux-image-4.9.0-8-2-amd64 Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for broadcom SAI Description: kernel modules for broadcom SAI

2
platform/broadcom/saibcm-modules/debian/opennsl-modules.dirs
View File

@ -1 +1 @@
lib/modules/4.9.0-8-2-amd64/extra lib/modules/4.9.0-9-2-amd64/extra

8
platform/broadcom/saibcm-modules/debian/opennsl-modules.install
View File

@ -1,5 +1,5 @@
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.9.0-8-2-amd64/extra systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.9.0-9-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.9.0-8-2-amd64/extra systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.9.0-9-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.9.0-8-2-amd64/extra systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.9.0-9-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.9.0-8-2-amd64/extra systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.9.0-9-2-amd64/extra
systemd/opennsl-modules.service lib/systemd/system systemd/opennsl-modules.service lib/systemd/system

6
platform/broadcom/saibcm-modules/debian/rules
View File

@ -60,7 +60,7 @@ kdist_config: prep-deb-files
kdist_clean: clean kdist_clean: clean
dh_testdir dh_testdir
dh_clean dh_clean
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-8-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-8-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-9-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-9-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
# rm -f driver/*.o driver/*.ko # rm -f driver/*.o driver/*.ko
# #
### end KERNEL SETUP ### end KERNEL SETUP
@ -78,7 +78,7 @@ build-arch-stamp:
dh_testdir dh_testdir
# Add here command to compile/build the package. # Add here command to compile/build the package.
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-8-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-8-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-9-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-9-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6
touch $@ touch $@
@ -103,7 +103,7 @@ clean:
rm -f build-arch-stamp build-indep-stamp configure-stamp rm -f build-arch-stamp build-indep-stamp configure-stamp
# Add here commands to clean up after the build process. # Add here commands to clean up after the build process.
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-8-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-8-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-9-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-9-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
dh_clean dh_clean

4
platform/broadcom/sonic-platform-modules-alphanetworks/debian/control
View File

@ -7,11 +7,11 @@ Standards-Version: 3.9.3
Package: sonic-platform-alphanetworks-snh60a0-320fv2 Package: sonic-platform-alphanetworks-snh60a0-320fv2
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64 Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp
Package: sonic-platform-alphanetworks-snh60b0-640f Package: sonic-platform-alphanetworks-snh60b0-640f
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64 Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp

2
platform/broadcom/sonic-platform-modules-arista

@ -1 +1 @@
Subproject commit 7b7c79ee463b43e570c48915215cdbf6ec250225 Subproject commit ad5abe1205c0bf6926d62a497a9b435aaeb174ee

4
platform/broadcom/sonic-platform-modules-cel/debian/control
View File

@ -7,11 +7,11 @@ Standards-Version: 3.9.3
Package: platform-modules-dx010 Package: platform-modules-dx010
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64 Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-haliburton Package: platform-modules-haliburton
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64 Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp

6
platform/broadcom/sonic-platform-modules-dell/debian/control
View File

@ -7,16 +7,16 @@ Standards-Version: 3.9.3
Package: platform-modules-z9264f Package: platform-modules-z9264f
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64 Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-z9100 Package: platform-modules-z9100
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64 Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-s6100 Package: platform-modules-s6100
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64 Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp

8
platform/broadcom/sonic-platform-modules-delta/debian/control
View File

@ -7,21 +7,21 @@ Standards-Version: 3.9.3
Package: platform-modules-ag9032v1 Package: platform-modules-ag9032v1
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64 Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-ag9064 Package: platform-modules-ag9064
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64 Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-ag5648 Package: platform-modules-ag5648
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64 Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-et-6248brb Package: platform-modules-et-6248brb
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64 Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp

2
platform/broadcom/sonic-platform-modules-delta/debian/platform-modules-et-6248brb.init
View File

@ -25,7 +25,7 @@ start)
modprobe dni_gpio modprobe dni_gpio
modprobe delta_et-6248brb_platform modprobe delta_et-6248brb_platform
if [ `uname -a | awk '{print $3}'` = "4.9.0-8-2-amd64" ]; then if [ `uname -a | awk '{print $3}'` = "4.9.0-9-2-amd64" ]; then
echo "453" > "/sys/class/gpio/export" echo "453" > "/sys/class/gpio/export"
echo "454" > "/sys/class/gpio/export" echo "454" > "/sys/class/gpio/export"
echo "455" > "/sys/class/gpio/export" echo "455" > "/sys/class/gpio/export"

2
platform/broadcom/sonic-platform-modules-delta/et-6248brb/scripts/led_status.sh
View File

@ -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_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" FAN_TRAY2_LED="/sys/devices/platform/delta-et6248brb-gpio.0/FAN/fan2_led_ag"
if [ `uname -a | awk '{print $3}'` = "4.9.0-8-2-amd64" ]; then if [ `uname -a | awk '{print $3}'` = "4.9.0-9-2-amd64" ]; then
SYS_LED_G="/sys/class/gpio/gpio453/value" SYS_LED_G="/sys/class/gpio/gpio453/value"
SYS_LED_R="/sys/class/gpio/gpio454/value" SYS_LED_R="/sys/class/gpio/gpio454/value"
PWR_LED_G="/sys/class/gpio/gpio455/value" PWR_LED_G="/sys/class/gpio/gpio455/value"

10
platform/broadcom/sonic-platform-modules-inventec/debian/control
View File

@ -7,25 +7,25 @@ Standards-Version: 3.9.3
Package: platform-modules-d7032q28b Package: platform-modules-d7032q28b
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64 Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led Description: kernel modules for platform devices such as fan, led
Package: platform-modules-d7054q28b Package: platform-modules-d7054q28b
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64 Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led Description: kernel modules for platform devices such as fan, led
Package: platform-modules-d6254qs Package: platform-modules-d6254qs
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64 Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led Description: kernel modules for platform devices such as fan, led
Package: platform-modules-d6556 Package: platform-modules-d6556
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64 Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led Description: kernel modules for platform devices such as fan, led
Package: platform-modules-d7264q28b Package: platform-modules-d7264q28b
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64 Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led Description: kernel modules for platform devices such as fan, led

2
platform/broadcom/sonic-platform-modules-s6000/debian/control
View File

@ -7,6 +7,6 @@ Standards-Version: 3.9.3
Package: platform-modules-s6000 Package: platform-modules-s6000
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64 Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp

4
platform/centec/sonic-platform-modules-e582/debian/control
View File

@ -7,11 +7,11 @@ Standards-Version: 3.9.3
Package: platform-modules-e582-48x2q4z Package: platform-modules-e582-48x2q4z
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64 Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp
Package: platform-modules-e582-48x6q Package: platform-modules-e582-48x6q
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64 Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp

4
platform/mellanox/fw.mk
View File

@ -2,12 +2,12 @@
MLNX_FW_BASE_URL = $(MLNX_SDK_BASE_URL) MLNX_FW_BASE_URL = $(MLNX_SDK_BASE_URL)
MLNX_SPC_FW_VERSION = 13.2000.1140 MLNX_SPC_FW_VERSION = 13.2000.1420
MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
$(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE) $(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
SONIC_ONLINE_FILES += $(MLNX_SPC_FW_FILE) SONIC_ONLINE_FILES += $(MLNX_SPC_FW_FILE)
MLNX_SPC2_FW_VERSION = 29.2000.1140 MLNX_SPC2_FW_VERSION = 29.2000.1420
MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
$(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE) $(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
SONIC_ONLINE_FILES += $(MLNX_SPC2_FW_FILE) SONIC_ONLINE_FILES += $(MLNX_SPC2_FW_FILE)

2
platform/mellanox/mlnx-sai.mk
View File

@ -1,6 +1,6 @@
# Mellanox SAI # Mellanox SAI
MLNX_SAI_VERSION = SAIRel1.14.0-master MLNX_SAI_VERSION = SAIRel1.14.1-master
export MLNX_SAI_VERSION export MLNX_SAI_VERSION

2
platform/mellanox/mlnx-sai/SAI-Implementation

@ -1 +1 @@
Subproject commit ed2f0d2765773bde8ee2d3ae552c96edd1d4859e Subproject commit ee4aab2c7e90c10c52925ba72d43eda393b50634

28
platform/mellanox/sdk-src/wjh-libs/Makefile Normal file
View File

@ -0,0 +1,28 @@
.ONESHELL:
SHELL = /bin/bash
MAIN_TARGET = wjh-libs_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
DERIVED_TARGETS = wjh-libs-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb \
wjh-libs-dev-static_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
PACKAGE_NAME = wjh_libs
$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
# get sources
rm -rf $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
wget -c $(MLNX_SDK_SOURCE_BASE_URL)/$(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION).tar.gz -O - | tar -xz
# build
pushd $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)
if [ -f autogen.sh ]; then
./autogen.sh
fi
debuild -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
popd
mv $(DERIVED_TARGETS) $* $(DEST)/
$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)

17
platform/mellanox/sdk.mk
View File

@ -1,6 +1,6 @@
MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/e7da154ddf8447c04b852195f43c83802c6934c9/sdk MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/ee4aab2c7e90c10c52925ba72d43eda393b50634/sdk
MLNX_SDK_VERSION = 4.3.1104 MLNX_SDK_VERSION = 4.3.1420
MLNX_SDK_ISSU_VERSION = 100 MLNX_SDK_ISSU_VERSION = 101
MLNX_SDK_DEB_VERSION = $(subst _,.,$(MLNX_SDK_VERSION)) MLNX_SDK_DEB_VERSION = $(subst _,.,$(MLNX_SDK_VERSION))
@ -10,12 +10,12 @@ MLNX_SDK_SOURCE_BASE_URL =
export MLNX_SDK_SOURCE_BASE_URL MLNX_SDK_VERSION MLNX_SDK_ISSU_VERSION MLNX_SDK_DEB_VERSION export MLNX_SDK_SOURCE_BASE_URL MLNX_SDK_VERSION MLNX_SDK_ISSU_VERSION MLNX_SDK_DEB_VERSION
MLNX_SDK_RDEBS += $(APPLIBS) $(IPROUTE2_MLNX) $(SX_ACL_RM) $(SX_COMPLIB) \ MLNX_SDK_RDEBS += $(APPLIBS) $(IPROUTE2_MLNX) $(SX_ACL_RM) $(SX_COMPLIB) \
$(SX_EXAMPLES) $(SX_GEN_UTILS) $(SX_SCEW) $(SXD_LIBS) $(SX_EXAMPLES) $(SX_GEN_UTILS) $(SX_SCEW) $(SXD_LIBS) $(WJH_LIBS)
MLNX_SDK_DEBS += $(APPLIBS_DEV) $(IPROUTE2_MLNX_DEV) $(SX_ACL_RM_DEV) \ MLNX_SDK_DEBS += $(APPLIBS_DEV) $(IPROUTE2_MLNX_DEV) $(SX_ACL_RM_DEV) \
$(SX_COMPLIB_DEV) $(SX_COMPLIB_DEV_STATIC) $(SX_EXAMPLES_DEV) \ $(SX_COMPLIB_DEV) $(SX_COMPLIB_DEV_STATIC) $(SX_EXAMPLES_DEV) \
$(SX_GEN_UTILS_DEV) $(SX_SCEW_DEV) $(SX_SCEW_DEV_STATIC) \ $(SX_GEN_UTILS_DEV) $(SX_SCEW_DEV) $(SX_SCEW_DEV_STATIC) \
$(SXD_LIBS_DEV) $(SXD_LIBS_DEV_STATIC) $(SXD_LIBS_DEV) $(SXD_LIBS_DEV_STATIC) $(WJH_LIBS_DEV)
APPLIBS = applibs_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb APPLIBS = applibs_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
$(APPLIBS)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/applibs $(APPLIBS)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/applibs
@ -71,6 +71,13 @@ $(SX_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel
SX_KERNEL_DEV = sx-kernel-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb SX_KERNEL_DEV = sx-kernel-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
$(eval $(call add_derived_package,$(SX_KERNEL),$(SX_KERNEL_DEV))) $(eval $(call add_derived_package,$(SX_KERNEL),$(SX_KERNEL_DEV)))
WJH_LIBS = wjh-libs_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
$(WJH_LIBS)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/wjh-libs
$(WJH_LIBS)_DEPENDS += $(SX_COMPLIB_DEV) $(SXD_LIBS_DEV) $(APPLIBS_DEV)
$(WJH_LIBS)_RDEPENDS += $(SX_COMPLIB) $(PYTHON_SDK_API)
WJH_LIBS_DEV = wjh-libs-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
$(eval $(call add_derived_package,$(WJH_LIBS),$(WJH_LIBS_DEV)))
define make_url define make_url
$(1)_URL = $(MLNX_SDK_BASE_URL)/$(1) $(1)_URL = $(MLNX_SDK_BASE_URL)/$(1)

2
platform/nephos/nephos-modules/debian/control
View File

@ -7,6 +7,6 @@ Standards-Version: 3.9.3
Package: nephos-modules Package: nephos-modules
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64 Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for nephos asic Description: kernel modules for nephos asic

2
platform/nephos/nephos-modules/modules/init.d/nps-modules-4.9.0-8-2-amd64
View File

@ -45,7 +45,7 @@ force-reload|restart)
;; ;;
*) *)
echo "Usage: /etc/init.d/nps-modules-4.9.0-8-2-amd64.init {start|stop}" echo "Usage: /etc/init.d/nps-modules-4.9.0-9-2-amd64.init {start|stop}"
exit 1 exit 1
;; ;;
esac esac

4
platform/nephos/nephos-modules/modules/service/nps-modules-4.9.0-8-2-amd64.service
View File

@ -5,8 +5,8 @@ Before=syncd.service
[Service] [Service]
Type=oneshot Type=oneshot
ExecStart=-/etc/init.d/nps-modules-4.9.0-8-2-amd64 start ExecStart=-/etc/init.d/nps-modules-4.9.0-9-2-amd64 start
ExecStop=-/etc/init.d/nps-modules-4.9.0-8-2-amd64 stop ExecStop=-/etc/init.d/nps-modules-4.9.0-9-2-amd64 stop
RemainAfterExit=yes RemainAfterExit=yes
[Install] [Install]

2
platform/nephos/sonic-platform-modules-accton/debian/control
View File

@ -7,5 +7,5 @@ Standards-Version: 3.9.3
Package: sonic-platform-accton-as7116-54x Package: sonic-platform-accton-as7116-54x
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64 Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp

2
platform/nephos/sonic-platform-modules-cig/debian/control
View File

@ -7,5 +7,5 @@ Standards-Version: 3.9.3
Package: sonic-platform-cig-cs6436-56p Package: sonic-platform-cig-cs6436-56p
Architecture: amd64 Architecture: amd64
Depends: linux-image-4.9.0-8-amd64 Depends: linux-image-4.9.0-9-amd64
Description: kernel modules for platform devices such as fan, led, sfp Description: kernel modules for platform devices such as fan, led, sfp

6
rules/linux-kernel.mk
View File

@ -1,9 +1,9 @@
# linux kernel package # linux kernel package
KVERSION_SHORT = 4.9.0-8-2 KVERSION_SHORT = 4.9.0-9-2
KVERSION = $(KVERSION_SHORT)-amd64 KVERSION = $(KVERSION_SHORT)-amd64
KERNEL_VERSION = 4.9.110 KERNEL_VERSION = 4.9.168
KERNEL_SUBVERSION = 3+deb9u6 KERNEL_SUBVERSION = 1+deb9u2
export KVERSION_SHORT KVERSION KERNEL_VERSION KERNEL_SUBVERSION export KVERSION_SHORT KVERSION KERNEL_VERSION KERNEL_SUBVERSION

2
src/sonic-linux-kernel

@ -1 +1 @@
Subproject commit 6fc9850e83d0cba3f8eff7c98ea371e131be8d8a Subproject commit e57148b92d1eb54784177df9e816bb15b98e6a03