Skip to content

Commit

Permalink
[libnl]: Debian Packaging libnl version 3.5.0 (sonic-net#3967)
Browse files Browse the repository at this point in the history
Packaging libnl 3.5.0 based off libnl 3.2.27 packaging. libnl contains various bug fixes that are nice to have.

pull-request: sonic-net#3967
signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
  • Loading branch information
tahmed-dev authored and tiantianlv committed Apr 24, 2020
1 parent f4985e1 commit 35385bc
Show file tree
Hide file tree
Showing 39 changed files with 5,934 additions and 7 deletions.
16 changes: 16 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ src/isc-dhcp/*
!src/isc-dhcp/Makefile
!src/isc-dhcp/patch/
src/libnl3/*
!src/libnl3/debian
src/libnl3/debian/libnl-*/
!src/libnl3/Makefile
src/libteam/*
!src/libteam/Makefile
Expand Down Expand Up @@ -146,3 +148,17 @@ src/sonic-daemon-base/sonic_daemon_base.egg-info
# Misc. files
files/initramfs-tools/arista-convertfs
files/initramfs-tools/union-mount

# Debian byproduct files
src/**/debian/stamp-*/
src/**/debian/*.log
src/**/debian/*.substvars
src/**/debian/.debhelper/
src/**/debian/tmp/
src/**/debian/autoreconf.*
src/**/debian/build/
src/**/debian/files
src/**/debian/stamp-autotools-files

# .o files
src/**/*.o
4 changes: 2 additions & 2 deletions rules/libnl3.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# libnl3

LIBNL3_VERSION_BASE = 3.2.27
LIBNL3_VERSION = $(LIBNL3_VERSION_BASE)-2
LIBNL3_VERSION_BASE = 3.5.0
LIBNL3_VERSION = $(LIBNL3_VERSION_BASE)-1

export LIBNL3_VERSION_BASE
export LIBNL3_VERSION
Expand Down
9 changes: 4 additions & 5 deletions src/libnl3/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,11 @@ DERIVED_TARGETS = libnl-3-dev_$(LIBNL3_VERSION)_$(CONFIGURED_ARCH).deb \
$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
# Obtaining the libnl3
rm -rf ./libnl3-$(LIBNL3_VERSION_BASE)
wget -O libnl3_$(LIBNL3_VERSION_BASE).orig.tar.gz -N "https://sonicstorage.blob.core.windows.net/packages/libnl3_$(LIBNL3_VERSION_BASE).orig.tar.gz?sv=2015-04-05&sr=b&sig=b4DnqrIsyVBDLmYhw7qwfaUJWqGCX2lDVMmmx7ihfrU%3D&se=2028-06-16T21%3A06%3A00Z&sp=r"
wget -O libnl3_$(LIBNL3_VERSION).dsc -N "https://sonicstorage.blob.core.windows.net/packages/libnl3_$(LIBNL3_VERSION).dsc?sv=2015-04-05&sr=b&sig=AWTX45oDbeGA%2BRJZyiCcHmeIfCAgSeNV3IqopOBaRDg%3D&se=2028-06-16T21%3A05%3A30Z&sp=r"
wget -O libnl3_$(LIBNL3_VERSION).debian.tar.xz -N "https://sonicstorage.blob.core.windows.net/packages/libnl3_$(LIBNL3_VERSION).debian.tar.xz?sv=2015-04-05&sr=b&sig=upIZ9dp5WEcLqp3ODeWKJXq5pJWCfeT0TIM0bx76wxM%3D&se=2028-06-16T21%3A04%3A44Z&sp=r"
dpkg-source -x libnl3_$(LIBNL3_VERSION).dsc
git clone https://github.com/thom311/libnl libnl3-$(LIBNL3_VERSION_BASE)
pushd libnl3-$(LIBNL3_VERSION_BASE)
git checkout tags/libnl$(subst .,_,$(LIBNL3_VERSION_BASE))

pushd ./libnl3-$(LIBNL3_VERSION_BASE)
ln -s ../debian debian
dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
popd

Expand Down
17 changes: 17 additions & 0 deletions src/libnl3/debian/README.Debian
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@

libnl versions explained
========================

Once libnl3 hits the archive there will exist 3 versions of libnl.
libnl1 with libnl-dev - up until March 2011 the stable version
libnl2 with libnl2-dev - development version that resulted in
libnl3 with libnl3-dev - the new stable (API and ABI wise) version

libnl1 has currently a lot of users in the archive and a lot of changes
happened since its last upstream release in 2008-01.

The plan is therefore to introduce libnl3, port the two users of libnl2
(freesmartphone.org libs and powertop) to it, remove libnl2 and don't touch
libnl1 and libnl-dev for now.

-- Heiko Stuebner <mmind@debian.org> Sat, 21 May 2011 19:25:13 +0200
10 changes: 10 additions & 0 deletions src/libnl3/debian/README.source
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
This package uses the simple-patchsys of cdbs.

The following patches are used:
0001: Fixes the header inclusion in the Makefiles.
This for example make distcheck
0002: Includes all generated libraries as linktargets in the pkg-config file.
Reason: Currently libnl3 generates a bunch of child libraries.
These don't get individual .pc files from upstream at the moment but
programs linking against libnl3 using the .pc file mostly need these
additional libraries too.
Loading

0 comments on commit 35385bc

Please sign in to comment.