[201904] Change submodule path from Azure to sonic-net (#12320 )

Why I did it Change the path of sonic submodules that point to "Azure" to point to "sonic-net" How I did it Replace "Azure" with "sonic-net" on all relevant paths of sonic submodules
[201904] add submodule for telemetry avoiding breaking in previous release (#3997 )
2022-10-12 21:06:22 +08:00 · 2020-01-09 09:25:09 -08:00 · 2019-07-16 08:43:32 -07:00 · 2019-07-06 20:45:11 +00:00 · 2019-07-03 06:51:17 -07:00 · 2019-06-19 07:28:22 +00:00
41 changed files with 129 additions and 82 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,15 +1,15 @@
 [submodule "sonic-swss-common"]
 	path = src/sonic-swss-common
-	url = https://github.com/Azure/sonic-swss-common
+	url = https://github.com/sonic-net/sonic-swss-common
 [submodule "sonic-linux-kernel"]
 	path = src/sonic-linux-kernel
-	url = https://github.com/Azure/sonic-linux-kernel
+	url = https://github.com/sonic-net/sonic-linux-kernel
 [submodule "sonic-sairedis"]
 	path = src/sonic-sairedis
-	url = https://github.com/Azure/sonic-sairedis
+	url = https://github.com/sonic-net/sonic-sairedis
 [submodule "sonic-swss"]
 	path = src/sonic-swss
-	url = https://github.com/Azure/sonic-swss
+	url = https://github.com/sonic-net/sonic-swss
 [submodule "src/p4c-bm/p4c-bm"]
 	path = platform/p4/p4c-bm/p4c-bm
 	url = https://github.com/krambn/p4c-bm
@ -18,35 +18,35 @@
 	url = https://github.com/p4lang/p4-hlir
 [submodule "quagga"]
 	path = src/sonic-quagga
-	url = https://github.com/Azure/sonic-quagga
+	url = https://github.com/sonic-net/sonic-quagga
 	branch = debian/0.99.24.1
 [submodule "sonic-dbsyncd"]
 	path = src/sonic-dbsyncd
-	url = https://github.com/Azure/sonic-dbsyncd
+	url = https://github.com/sonic-net/sonic-dbsyncd
 [submodule "src/sonic-py-swsssdk"]
 	path = src/sonic-py-swsssdk
-	url = https://github.com/Azure/sonic-py-swsssdk.git
+	url = https://github.com/sonic-net/sonic-py-swsssdk.git
 [submodule "src/sonic-snmpagent"]
 	path = src/sonic-snmpagent
-	url = https://github.com/Azure/sonic-snmpagent
+	url = https://github.com/sonic-net/sonic-snmpagent
 [submodule "src/ptf"]
 	path = src/ptf
 	url = https://github.com/p4lang/ptf.git
 [submodule "src/sonic-utilities"]
 	path = src/sonic-utilities
-	url = https://github.com/Azure/sonic-utilities
+	url = https://github.com/sonic-net/sonic-utilities
 [submodule "platform/broadcom/sonic-platform-modules-arista"]
 	path = platform/broadcom/sonic-platform-modules-arista
 	url = https://github.com/aristanetworks/sonic
 [submodule "src/sonic-platform-common"]
 	path = src/sonic-platform-common
-	url = https://github.com/Azure/sonic-platform-common
+	url = https://github.com/sonic-net/sonic-platform-common
 [submodule "src/sonic-platform-daemons"]
 	path = src/sonic-platform-daemons
-	url = https://github.com/Azure/sonic-platform-daemons
+	url = https://github.com/sonic-net/sonic-platform-daemons
 [submodule "src/sonic-frr/frr"]
 	path = src/sonic-frr/frr
-	url = https://github.com/Azure/sonic-frr.git
+	url = https://github.com/sonic-net/sonic-frr.git
 	branch = frr/7.0
 [submodule "platform/p4/p4-hlir/p4-hlir-v1.1"]
 	path = platform/p4/p4-hlir/p4-hlir-v1.1
@ -66,3 +66,6 @@
 [submodule "platform/mellanox/mlnx-sai/SAI-Implementation"]
 	path = platform/mellanox/mlnx-sai/SAI-Implementation
 	url = https://github.com/Mellanox/SAI-Implementation
+[submodule "src/telemetry/sonic-telemetry"]
+	path = src/telemetry/sonic-telemetry
+	url = https://github.com/sonic-net/sonic-telemetry.git
--- a/build_debian.sh
+++ b/build_debian.sh
@ -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
@ -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
@ -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
--- a/files/build_templates/swss.service.j2
+++ b/files/build_templates/swss.service.j2
@ -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
--- a/files/build_templates/syncd.service.j2
+++ b/files/build_templates/syncd.service.j2
@ -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
--- a/files/image_config/environment/motd
+++ b/files/image_config/environment/motd
@ -10,5 +10,5 @@ You are on
 Unauthorized access and/or use are prohibited.
 All access and/or use are subject to monitoring.

-Help:    http://azure.github.io/SONiC/
+Help:    https://sonic-net.github.io/SONiC/

--- a/installer/x86_64/install.sh
+++ b/installer/x86_64/install.sh
@ -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
@ -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
@ -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" ")
@ -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

--- a/platform/barefoot/bfn-modules/debian/control
+++ b/platform/barefoot/bfn-modules/debian/control
@ -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

--- a/platform/barefoot/sonic-platform-modules-arista
+++ b/platform/barefoot/sonic-platform-modules-arista
@ -1 +1 @@
-Subproject commit 7b7c79ee463b43e570c48915215cdbf6ec250225
+Subproject commit 530f9707a2c3d06bb50a9b60b24a4bf4eb8a9735
--- a/platform/barefoot/sonic-platform-modules-bfn-montara/debian/control
+++ b/platform/barefoot/sonic-platform-modules-bfn-montara/debian/control
@ -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

--- a/platform/barefoot/sonic-platform-modules-bfn/debian/control
+++ b/platform/barefoot/sonic-platform-modules-bfn/debian/control
@ -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

--- a/platform/broadcom/sai-modules.mk
+++ b/platform/broadcom/sai-modules.mk
@ -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
--- a/platform/broadcom/saibcm-modules/debian/control
+++ b/platform/broadcom/saibcm-modules/debian/control
@ -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
--- a/platform/broadcom/saibcm-modules/debian/opennsl-modules.dirs
+++ b/platform/broadcom/saibcm-modules/debian/opennsl-modules.dirs
@ -1 +1 @@
-lib/modules/4.9.0-8-2-amd64/extra
+lib/modules/4.9.0-9-2-amd64/extra
--- a/platform/broadcom/saibcm-modules/debian/opennsl-modules.install
+++ b/platform/broadcom/saibcm-modules/debian/opennsl-modules.install
@ -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
--- a/platform/broadcom/saibcm-modules/debian/rules
+++ b/platform/broadcom/saibcm-modules/debian/rules
@ -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
@ -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 $@

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

--- a/platform/broadcom/sonic-platform-modules-alphanetworks/debian/control
+++ b/platform/broadcom/sonic-platform-modules-alphanetworks/debian/control
@ -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

--- a/platform/broadcom/sonic-platform-modules-arista
+++ b/platform/broadcom/sonic-platform-modules-arista
@ -1 +1 @@
-Subproject commit 7b7c79ee463b43e570c48915215cdbf6ec250225
+Subproject commit 530f9707a2c3d06bb50a9b60b24a4bf4eb8a9735
--- a/platform/broadcom/sonic-platform-modules-cel/debian/control
+++ b/platform/broadcom/sonic-platform-modules-cel/debian/control
@ -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
--- a/platform/broadcom/sonic-platform-modules-dell/debian/control
+++ b/platform/broadcom/sonic-platform-modules-dell/debian/control
@ -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

--- a/platform/broadcom/sonic-platform-modules-delta/debian/control
+++ b/platform/broadcom/sonic-platform-modules-delta/debian/control
@ -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

--- a/platform/broadcom/sonic-platform-modules-delta/debian/platform-modules-et-6248brb.init
+++ b/platform/broadcom/sonic-platform-modules-delta/debian/platform-modules-et-6248brb.init
@ -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"
--- a/platform/broadcom/sonic-platform-modules-delta/et-6248brb/scripts/led_status.sh
+++ b/platform/broadcom/sonic-platform-modules-delta/et-6248brb/scripts/led_status.sh
@ -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"
--- a/platform/broadcom/sonic-platform-modules-inventec/debian/control
+++ b/platform/broadcom/sonic-platform-modules-inventec/debian/control
@ -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
--- a/platform/broadcom/sonic-platform-modules-s6000/debian/control
+++ b/platform/broadcom/sonic-platform-modules-s6000/debian/control
@ -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

--- a/platform/centec/sonic-platform-modules-e582/debian/control
+++ b/platform/centec/sonic-platform-modules-e582/debian/control
@ -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

--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@ -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)
--- a/platform/mellanox/mlnx-sai.mk
+++ b/platform/mellanox/mlnx-sai.mk
@ -1,6 +1,6 @@
 # Mellanox SAI

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

 export MLNX_SAI_VERSION

--- a/platform/mellanox/mlnx-sai/SAI-Implementation
+++ b/platform/mellanox/mlnx-sai/SAI-Implementation
@ -1 +1 @@
-Subproject commit ed2f0d2765773bde8ee2d3ae552c96edd1d4859e
+Subproject commit ee4aab2c7e90c10c52925ba72d43eda393b50634
--- a/platform/mellanox/sdk-src/wjh-libs/Makefile
+++ b/platform/mellanox/sdk-src/wjh-libs/Makefile
@ -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)
--- a/platform/mellanox/sdk.mk
+++ b/platform/mellanox/sdk.mk
@ -1,21 +1,21 @@
-MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/e7da154ddf8447c04b852195f43c83802c6934c9/sdk
-MLNX_SDK_VERSION = 4.3.1104
-MLNX_SDK_ISSU_VERSION = 100
+MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/ee4aab2c7e90c10c52925ba72d43eda393b50634/sdk
+MLNX_SDK_VERSION = 4.3.1420
+MLNX_SDK_ISSU_VERSION = 101

 MLNX_SDK_DEB_VERSION = $(subst _,.,$(MLNX_SDK_VERSION))

 # Place here URL where SDK sources exist
-MLNX_SDK_SOURCE_BASE_URL = 
+MLNX_SDK_SOURCE_BASE_URL =

 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) \
-		  $(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) \
 		 $(SX_COMPLIB_DEV) $(SX_COMPLIB_DEV_STATIC) $(SX_EXAMPLES_DEV) \
 		 $(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)_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
 $(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
 	$(1)_URL = $(MLNX_SDK_BASE_URL)/$(1)

--- a/platform/nephos/nephos-modules/debian/control
+++ b/platform/nephos/nephos-modules/debian/control
@ -7,6 +7,6 @@ Standards-Version: 3.9.3

 Package: nephos-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 nephos asic

--- a/platform/nephos/nephos-modules/modules/init.d/nps-modules-4.9.0-9-2-amd64
+++ b/platform/nephos/nephos-modules/modules/init.d/nps-modules-4.9.0-9-2-amd64
@ -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
        ;;
 esac
--- a/platform/nephos/nephos-modules/modules/service/nps-modules-4.9.0-9-2-amd64.service
+++ b/platform/nephos/nephos-modules/modules/service/nps-modules-4.9.0-9-2-amd64.service
@ -5,8 +5,8 @@ Before=syncd.service

 [Service]
 Type=oneshot
-ExecStart=-/etc/init.d/nps-modules-4.9.0-8-2-amd64 start
-ExecStop=-/etc/init.d/nps-modules-4.9.0-8-2-amd64 stop
+ExecStart=-/etc/init.d/nps-modules-4.9.0-9-2-amd64 start
+ExecStop=-/etc/init.d/nps-modules-4.9.0-9-2-amd64 stop
 RemainAfterExit=yes

 [Install]
--- a/platform/nephos/sonic-platform-modules-accton/debian/control
+++ b/platform/nephos/sonic-platform-modules-accton/debian/control
@ -7,5 +7,5 @@ Standards-Version: 3.9.3

 Package: sonic-platform-accton-as7116-54x
 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
--- a/platform/nephos/sonic-platform-modules-cig/debian/control
+++ b/platform/nephos/sonic-platform-modules-cig/debian/control
@ -7,5 +7,5 @@ Standards-Version: 3.9.3

 Package: sonic-platform-cig-cs6436-56p
 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
--- a/rules/linux-kernel.mk
+++ b/rules/linux-kernel.mk
@ -1,9 +1,9 @@
 # linux kernel package

-KVERSION_SHORT = 4.9.0-8-2
+KVERSION_SHORT = 4.9.0-9-2
 KVERSION = $(KVERSION_SHORT)-amd64
-KERNEL_VERSION = 4.9.110
-KERNEL_SUBVERSION = 3+deb9u6
+KERNEL_VERSION = 4.9.168
+KERNEL_SUBVERSION = 1+deb9u3

 export KVERSION_SHORT KVERSION KERNEL_VERSION KERNEL_SUBVERSION

--- a/src/iproute2/Makefile
+++ b/src/iproute2/Makefile
@ -8,6 +8,9 @@ IPROUTE2_VERSION_FULL = $(IPROUTE2_VERSION)-1
 MAIN_TARGET = iproute2_$(IPROUTE2_VERSION_FULL)_amd64.deb

 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
+	# Remove any stale files
+	rm -rf iproute2-$(IPROUTE2_VERSION)
+
 	wget -O iproute2_$(IPROUTE2_VERSION).orig.tar.xz -N "https://sonicstorage.blob.core.windows.net/packages/iproute2_4.9.0.orig.tar.xz?sv=2015-04-05&sr=b&sig=9nvybd1xkXyRQbaG6Fy6wBazPA8IbZV0AO41GWXPEP8%3D&se=2154-10-23T11%3A59%3A00Z&sp=r"
 	wget -O iproute2_$(IPROUTE2_VERSION_FULL).dsc -N "https://sonicstorage.blob.core.windows.net/packages/iproute2_4.9.0-1.dsc?sv=2015-04-05&sr=b&sig=m6FcMH9dOh8ggipBgOsONiXvDxoi6bfUO%2BxvidsMNMQ%3D&se=2154-10-23T11%3A59%3A53Z&sp=r"
 	wget -O iproute2_$(IPROUTE2_VERSION_FULL).debian.tar.xz -N "https://sonicstorage.blob.core.windows.net/packages/iproute2_4.9.0-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=U5NFuwG5C3vZXlUUNvoPMnKDtMKk66zbweA9rQYbEVY%3D&se=2154-10-23T12%3A00%3A15Z&sp=r"
--- a/src/python3/Makefile
+++ b/src/python3/Makefile
@ -15,6 +15,9 @@ DERIVED_TARGETS = lib$(PYTHON_PNAME)-stdlib_$(PYTHON_VER)-$(PYTHON_DEB_VER)_amd6
 				  #$(PYTHON_PNAME)-dev_$(PYTHON_VER)-$(PYTHON_DEB_VER)_amd64.deb

 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
+	# Remove any stale files
+	rm -rf $(PYTHON_PNAME)-$(PYTHON_VER)
+
 	## Obtaining the python3
 	wget 'https://sonicstorage.blob.core.windows.net/packages/$(PYTHON_PNAME)_$(PYTHON_VER).orig.tar.xz?sv=2015-04-05&sr=b&sig=d42Wh1CA9NZvlskhW4fpWcHVgc7N3IKhdFzyeO2zbRA%3D&se=2027-02-02T01%3A00%3A57Z&sp=r' -O $(PYTHON_PNAME)_$(PYTHON_VER).orig.tar.xz
 	wget 'https://sonicstorage.blob.core.windows.net/packages/$(PYTHON_PNAME)_$(PYTHON_VER)-$(PYTHON_DEB_VER).debian.tar.xz?sv=2015-04-05&sr=b&sig=KLX9pMJ3zpQvGBo6ZjzoZXgooMJRUUwMx8ZaTJtywK0%3D&se=2027-02-02T00%3A59%3A34Z&sp=r' -O $(PYTHON_PNAME)_$(PYTHON_VER)-$(PYTHON_DEB_VER).debian.tar.xz
--- a/src/sonic-linux-kernel
+++ b/src/sonic-linux-kernel
@ -1 +1 @@
-Subproject commit 6fc9850e83d0cba3f8eff7c98ea371e131be8d8a
+Subproject commit 51f4ece36d2436d624dcf5f9441bb17cd38cb108
--- a/src/telemetry/Makefile
+++ b/src/telemetry/Makefile
@ -2,9 +2,11 @@ export GOPATH=/tmp/go

 INSTALL := /usr/bin/install

-all: sonic-telemetry
+all: telemetry

-sonic-telemetry:
+telemetry:
+	mkdir -p ${GOPATH}/src/github.com/Azure/
+	cp -a sonic-telemetry ${GOPATH}/src/github.com/Azure/
 	/usr/local/go/bin/go get -v github.com/Azure/sonic-telemetry/telemetry
 	/usr/local/go/bin/go get -v github.com/Azure/sonic-telemetry/dialout/dialout_client_cli

--- a/src/telemetry/sonic-telemetry
+++ b/src/telemetry/sonic-telemetry
@ -0,0 +1 @@
+Subproject commit d8e5adf8cb9f810624f61daf6d343dfe8b3fa4b0
Author	SHA1	Message	Date
xumia	16e869b839	[201904] Change submodule path from Azure to sonic-net (#12320 ) Why I did it Change the path of sonic submodules that point to "Azure" to point to "sonic-net" How I did it Replace "Azure" with "sonic-net" on all relevant paths of sonic submodules	2022-10-12 21:06:22 +08:00
Dong Zhang	9336859ccd	[201904] add submodule for telemetry avoiding breaking in previous release (#3997 )	2020-01-09 09:25:09 -08:00
Samuel Angebault	b62e120c88	[device/arista] Update arista-drivers submodules (#3157 )	2019-07-16 08:43:32 -07:00
Qi Luo	9d4d80338f	[submodule] update sonic-linux-kernel to 4.9.168-1+deb9u3 (#3034 )	2019-07-06 20:45:11 +00:00
simonJi2018	942dc0caea	[nephos]: upgrade sdk to support linux kernel 4.9.0-9-2 (#3074 )	2019-07-03 06:51:17 -07:00
Qi Luo	0dc6711683	[submodule] update sonic-linux-kernel (#2985 ) * [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.	2019-06-19 07:28:22 +00:00
Greg Paussa	5be2f2fa5a	[build]: Add missing 'rm -rf' to component Makefiles for clean rebuild (#3028 ) * src/iproute2/Makefile * src/python3/Makefile These Makefiles do not properly clean out the src build subdirectory prior to downloading the source code contents. This causes an error during a rebuild following a 'make clean'. Signed-off-by: Greg Paussa <greg.paussa@broadcom.com>	2019-06-19 07:26:36 +00:00
Shu0T1an ChenG	e9de16391c	Merge branch 'github' into 201904	2019-06-17 12:10:10 -07:00
Shu0T1an ChenG	3ca6711c0a	Merge remote-tracking branch 'github/master' into 201904	2019-06-11 12:21:05 -07:00
Shu0T1an ChenG	f0cfa85059	Merge remote-tracking branch 'github/master' into 201904	2019-05-29 16:19:04 -07:00
Shu0T1an ChenG	9c6b0dccea	Merge remote-tracking branch 'github/master' into 201904	2019-05-29 15:55:28 -07:00
Andriy Kokhan	23fb00c21b	[bfn] fixed build failure (#2885 ) * fixed barefoot platform build * added TNA config * updated port_config.ini Signed-off-by: Andriy Kokhan <akokhan@barefootnetworks.com>	2019-05-11 11:54:47 -07:00
				`@ -0,0 +1 @@`
				`Subproject commit d8e5adf8cb9f810624f61daf6d343dfe8b3fa4b0`