From a8a7b795dbdb5f5f79a4c9088174391274ca6d05 Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Tue, 19 Jun 2018 13:12:28 -0700 Subject: [PATCH] [libnl3]: Upgrade libnl3 version to 3.2.27-2, same version as in Debian Stretch (#1795) Signed-off-by: Qi Luo --- rules/libnl3.mk | 4 +++- src/libnl3/Makefile | 17 ++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/rules/libnl3.mk b/rules/libnl3.mk index 70ffa87963d0..30e27c5c5157 100644 --- a/rules/libnl3.mk +++ b/rules/libnl3.mk @@ -1,7 +1,9 @@ # libnl3 -LIBNL3_VERSION = 3.2.27-1 +LIBNL3_VERSION_BASE = 3.2.27 +LIBNL3_VERSION = $(LIBNL3_VERSION_BASE)-2 +export LIBNL3_VERSION_BASE export LIBNL3_VERSION LIBNL3 = libnl-3-200_$(LIBNL3_VERSION)_amd64.deb diff --git a/src/libnl3/Makefile b/src/libnl3/Makefile index 6f50e4e389fa..3ebe885ea5dd 100644 --- a/src/libnl3/Makefile +++ b/src/libnl3/Makefile @@ -15,18 +15,13 @@ DERIVED_TARGETS = libnl-3-dev_$(LIBNL3_VERSION)_amd64.deb \ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : # Obtaining the libnl3 - rm -rf ./libnl3 - git clone https://github.com/qiluo-msft/libnl3.git - pushd ./libnl3 - git checkout -f b77c0e49cb + rm -rf ./libnl3-$(LIBNL3_VERSION_BASE) + wget -O libnl3_$(LIBNL3_VERSION_BASE).orig.tar.gz -N "http://http.debian.net/debian/pool/main/libn/libnl3/libnl3_$(LIBNL3_VERSION_BASE).orig.tar.gz" + wget -O libnl3_$(LIBNL3_VERSION).dsc -N "http://http.debian.net/debian/pool/main/libn/libnl3/libnl3_$(LIBNL3_VERSION).dsc" + wget -O libnl3_$(LIBNL3_VERSION).debian.tar.xz -N "http://http.debian.net/debian/pool/main/libn/libnl3/libnl3_$(LIBNL3_VERSION).debian.tar.xz" + dpkg-source -x libnl3_$(LIBNL3_VERSION).dsc - # Patch - export QUILT_PATCHES=debian/patches - quilt push - quilt push - quilt push - quilt push - quilt push + pushd ./libnl3-$(LIBNL3_VERSION_BASE) dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) popd