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

[submodule] update sonic-linux-kernel #2985

Merged
merged 5 commits into from
Jun 18, 2019
Merged

[submodule] update sonic-linux-kernel #2985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7e88010
[submodule] update sonic-linux-kernel
qiluo-msft Jun 10, 2019
b767949
update linux kernel version
Jun 11, 2019
bb61ce3
Fix many version strings
qiluo-msft Jun 12, 2019
193c433
update mellanox components (built with new kernel) (#7)
stepanblyschak Jun 13, 2019
ff1d552
Update arista driver submodule (#8)
Staphylo Jun 17, 2019
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
6 changes: 3 additions & 3 deletions build_debian.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ set -x -e

## docker engine version (with platform)
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
FILESYSTEM_ROOT=./fsroot
Expand Down Expand Up @@ -121,7 +121,7 @@ sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/initramfs-tools_*.deb || \
sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/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 acl
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install dmidecode
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install dmidecode

## Update initramfs for booting with squashfs+overlay
cat files/initramfs-tools/modules | sudo tee -a $FILESYSTEM_ROOT/etc/initramfs-tools/modules > /dev/null
Expand Down Expand Up @@ -409,7 +409,7 @@ fi
## Organization specific extensions such as Configuration & Scripts for features like AAA, ZTP...
if [ "${enable_organization_extensions}" = "y" ]; then
if [ -f files/build_templates/organization_extensions.sh ]; then
sudo chmod 755 files/build_templates/organization_extensions.sh
sudo chmod 755 files/build_templates/organization_extensions.sh
./files/build_templates/organization_extensions.sh -f $FILESYSTEM_ROOT -h $HOSTNAME
fi
fi
Expand Down
2 changes: 1 addition & 1 deletion files/build_templates/swss.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Requires=database.service updategraph.service
{% if sonic_asic_platform == 'broadcom' %}
Requires=opennsl-modules.service
{% 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 %}
After=database.service updategraph.service
After=interfaces-config.service
Expand Down
4 changes: 2 additions & 2 deletions files/build_templates/syncd.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ Requires=database.service updategraph.service
{% if sonic_asic_platform == 'broadcom' %}
Requires=opennsl-modules.service
{% 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 %}
After=database.service updategraph.service
After=interfaces-config.service
{% if sonic_asic_platform == 'broadcom' %}
After=opennsl-modules.service
{% 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 %}
After=swss.service
Before=ntp-config.service
Expand Down
10 changes: 5 additions & 5 deletions installer/x86_64/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ if [ "$install_env" = "onie" ]; then
fi

# Creates a new partition for the DEMO OS.
#
#
# arg $1 -- base block device
#
# Returns the created partition number in $demo_part
Expand All @@ -177,7 +177,7 @@ create_demo_gpt_partition()
tmpfifo=$(mktemp -u)
trap_push "rm $tmpfifo || true"
mkfifo -m 600 "$tmpfifo"

# See if demo partition already exists
demo_part=$(sgdisk -p $blk_dev | grep -e "$demo_volume_label" -e "$legacy_volume_label" | awk '{print $1}')
if [ -n "$demo_part" ] ; then
Expand Down Expand Up @@ -438,7 +438,7 @@ if [ "$install_env" = "onie" ]; then
echo "Error: Unable to mount $demo_dev on $demo_mnt"
exit 1
}

elif [ "$install_env" = "sonic" ]; then
demo_mnt="/host"
eval running_sonic_revision=$(cat /etc/sonic/sonic_version.yml | grep build_version | cut -f2 -d" ")
Expand Down 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-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 \
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-8-2-amd64
initrd /$image_dir/boot/initrd.img-4.9.0-9-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.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for bfn asic for mmap

2 changes: 1 addition & 1 deletion platform/barefoot/sonic-platform-modules-arista
Open in desktop
Submodule sonic-platform-modules-arista updated 1 files
+1 −1 debian/control
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.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

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.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

2 changes: 1 addition & 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,6 @@
# 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 = opennsl-modules_$(BRCM_OPENNSL_KERNEL_VERSION)_amd64.deb
Expand Down
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.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
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.9.0-8-2-amd64/extra
lib/modules/4.9.0-9-2-amd64/extra
8 changes: 4 additions & 4 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,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-kernel-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-8-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-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-9-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-9-2-amd64/extra
systemd/opennsl-modules.service lib/systemd/system
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 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
#
### 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 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 $@

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 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

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-8-2-amd64
Depends: linux-image-4.9.0-9-2-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-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-arista
Open in desktop
Submodule sonic-platform-modules-arista updated 1 files
+1 −1 debian/control
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-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp


Package: platform-modules-haliburton
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
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-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-z9100
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

Package: platform-modules-s6100
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

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-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-ag9064
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

Package: platform-modules-ag5648
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

Package: platform-modules-et-6248brb
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

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-8-2-amd64" ]; then
if [ `uname -a | awk '{print $3}'` = "4.9.0-9-2-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-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_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-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led

Package: platform-modules-d7054q28b
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

Package: platform-modules-d6254qs
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

Package: platform-modules-d6556
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

Package: platform-modules-d7264q28b
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
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-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
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.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

Package: platform-modules-e582-48x6q
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

4 changes: 2 additions & 2 deletions platform/mellanox/fw.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

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)_URL = $(MLNX_FW_BASE_URL)/$(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)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
SONIC_ONLINE_FILES += $(MLNX_SPC2_FW_FILE)
Expand Down
2 changes: 1 addition & 1 deletion platform/mellanox/mlnx-sai.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Mellanox SAI

MLNX_SAI_VERSION = SAIRel1.14.0-master
MLNX_SAI_VERSION = SAIRel1.14.1-master

export MLNX_SAI_VERSION

Expand Down
2 changes: 1 addition & 1 deletion platform/mellanox/mlnx-sai/SAI-Implementation
Open in desktop
Submodule SAI-Implementation updated 58 files
+1 −1 mlnx_sai/debian/changelog
+17 −2 mlnx_sai/inc/fx_base_api.h
+10 −7 mlnx_sai/inc/mlnx_flex_bitmap.h
+38 −2 mlnx_sai/inc/mlnx_sai.h
+60 −0 mlnx_sai/src/dbgdump/mlnx_sai_dbg_mirror.c
+1 −0 mlnx_sai/src/dbgdump/mlnx_sai_dbg_policer.c
+196 −144 mlnx_sai/src/fx_base_api.c
+1,167 −309 mlnx_sai/src/mlnx_sai_acl.c
+113 −92 mlnx_sai/src/mlnx_sai_bmtor.c
+1 −1 mlnx_sai/src/mlnx_sai_bridge.c
+42 −11 mlnx_sai/src/mlnx_sai_hash.c
+211 −2 mlnx_sai/src/mlnx_sai_mirror.c
+147 −0 mlnx_sai/src/mlnx_sai_policer.c
+121 −4 mlnx_sai/src/mlnx_sai_port.c
+11 −5 mlnx_sai/src/mlnx_sai_switch.c
+222 −48 mlnx_sai/src/mlnx_sai_tunnel.c
+12 −4 release notes.txt
+7 −4 sdk/README.md
+ − sdk/applibs-dev_1.mlnx.4.3.1104_amd64.deb
+ − sdk/applibs-dev_1.mlnx.4.3.1420_amd64.deb
+ − sdk/applibs_1.mlnx.4.3.1104_amd64.deb
+ − sdk/applibs_1.mlnx.4.3.1420_amd64.deb
+ − sdk/fw-SPC-rel-13_2000_1140-EVB.mfa
+ − sdk/fw-SPC-rel-13_2000_1420-EVB.mfa
+ − sdk/fw-SPC2-rel-29_2000_1140-EVB.mfa
+ − sdk/fw-SPC2-rel-29_2000_1420-EVB.mfa
+ − sdk/iproute2-dev_1.mlnx.4.3.1420_amd64.deb
+ − sdk/iproute2_1.mlnx.4.3.1420_amd64.deb
+ − sdk/python-sdk-api_1.mlnx.4.3.1104_amd64.deb
+ − sdk/python-sdk-api_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sx-complib-dev-static_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sx-complib-dev_1.mlnx.4.3.1104_amd64.deb
+ − sdk/sx-complib-dev_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sx-complib_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sx-examples-dev_1.mlnx.4.3.1104_amd64.deb
+ − sdk/sx-examples-dev_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sx-examples_1.mlnx.4.3.1104_amd64.deb
+ − sdk/sx-examples_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sx-gen-utils-dev_1.mlnx.4.3.1104_amd64.deb
+ − sdk/sx-gen-utils-dev_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sx-gen-utils_1.mlnx.4.3.1104_amd64.deb
+ − sdk/sx-gen-utils_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sx-kernel-dev_1.mlnx.4.3.1104_amd64.deb
+ − sdk/sx-kernel-dev_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sx-kernel_1.mlnx.4.3.1104_amd64.deb
+ − sdk/sx-kernel_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sx-scew-dev-static_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sx-scew-dev_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sx-scew_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sxd-libs-dev-static_1.mlnx.4.3.1104_amd64.deb
+ − sdk/sxd-libs-dev-static_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sxd-libs-dev_1.mlnx.4.3.1104_amd64.deb
+ − sdk/sxd-libs-dev_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sxd-libs_1.mlnx.4.3.1104_amd64.deb
+ − sdk/sxd-libs_1.mlnx.4.3.1420_amd64.deb
+ − sdk/wjh-libs-dev-static_1.mlnx.4.3.1420_amd64.deb
+ − sdk/wjh-libs-dev_1.mlnx.4.3.1420_amd64.deb
+ − sdk/wjh-libs_1.mlnx.4.3.1420_amd64.deb
28 changes: 28 additions & 0 deletions platform/mellanox/sdk-src/wjh-libs/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Loading