Merge pull request sonic-net#50 from mssonicbld/sonicbld/202205-merge

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205

Author: mssonicbld

platform/broadcom/sai.mk

@@ -1,5 +1,5 @@
-LIBSAIBCM_XGS_VERSION = 7.1.50.4
-LIBSAIBCM_DNX_VERSION = 7.1.50.4
+LIBSAIBCM_XGS_VERSION = 7.1.36.4
+LIBSAIBCM_DNX_VERSION = 7.1.42.4
 LIBSAIBCM_BRANCH_NAME = REL_7.0_202205
 LIBSAIBCM_XGS_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_XGS_VERSION)"
 LIBSAIBCM_DNX_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_DNX_VERSION)"

rules/hiredis.mk

@@ -1,7 +1,7 @@
 # libhiredis package
 
-HIREDIS_VERSION = 0.14.0
-HIREDIS_VERSION_FULL = $(HIREDIS_VERSION)-3~bpo9+1
+HIREDIS_VERSION = 0.14.1
+HIREDIS_VERSION_FULL = ${HIREDIS_VERSION}-1
 
 export HIREDIS_VERSION HIREDIS_VERSION_FULL
 
@@ -12,6 +12,7 @@ SONIC_MAKE_DEBS += $(LIBHIREDIS)
 LIBHIREDIS_DEV = libhiredis-dev_$(HIREDIS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(LIBHIREDIS),$(LIBHIREDIS_DEV)))
 
-LIBHIREDIS_DBG = libhiredis-dbg_$(HIREDIS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
 LIBHIREDIS_DBG = libhiredis0.14-dbgsym_$(HIREDIS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(LIBHIREDIS),$(LIBHIREDIS_DBG)))
+
+export LIBHIREDIS LIBHIREDIS_DEV LIBHIREDIS_DBG

src/hiredis/Makefile

@@ -2,21 +2,23 @@
 SHELL = /bin/bash
 .SHELLFLAGS += -e
 
-MAIN_TARGET = libhiredis0.14_$(HIREDIS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
-DERIVED_TARGETS = libhiredis0.14-dbgsym_$(HIREDIS_VERSION_FULL)_$(CONFIGURED_ARCH).deb libhiredis-dev_$(HIREDIS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
+MAIN_TARGET = $(LIBHIREDIS)
+DERIVED_TARGETS = $(LIBHIREDIS_DBG) $(LIBHIREDIS_DEV)
 
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
-	rm -rf hiredis-$(HIREDIS_VERSION)
+	# Remove any stale files
+	rm -rf ./hiredis-$(HIREDIS_VERSION)
 
-	wget -O hiredis_$(HIREDIS_VERSION).orig.tar.gz http://http.debian.net/debian/pool/main/h/hiredis/hiredis_$(HIREDIS_VERSION).orig.tar.gz
-	wget -O hiredis_$(HIREDIS_VERSION_FULL).debian.tar.xz http://http.debian.net/debian/pool/main/h/hiredis/hiredis_$(HIREDIS_VERSION_FULL).debian.tar.xz
-	wget -O hiredis_$(HIREDIS_VERSION_FULL).dsc http://http.debian.net/debian/pool/main/h/hiredis/hiredis_$(HIREDIS_VERSION_FULL).dsc
+	# Get hiredis release, debian files
+	dget -u http://http.debian.net/debian/pool/main/h/hiredis/hiredis_$(HIREDIS_VERSION_FULL).dsc
+
+	# Build source and Debian packages
+	pushd ./hiredis-$(HIREDIS_VERSION)
 
-	dpkg-source -x hiredis_$(HIREDIS_VERSION_FULL).dsc
-	pushd hiredis-$(HIREDIS_VERSION)
 	dpkg-buildpackage -rfakeroot -d -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 	popd
 
+	# Move the newly-built .deb packages to the destination directory
 	mv $* $(DERIVED_TARGETS) $(DEST)/
 
 $(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)