aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Salveti <ricardo.salveti@linaro.org>2016-07-18 21:23:02 -0300
committerRicardo Salveti <ricardo.salveti@linaro.org>2016-07-19 09:01:43 -0300
commitc5a342bdfc01f89bc04423cdad503373cdaca0e5 (patch)
treeb069938f2383f5a1c5a1d19ba7edf8a00d86ff3e
parent24f38da71b1922505e78bdecb496c882cd060402 (diff)
Renaming package librte-pmd-e10001 to librte-pmd-e1000-1
Needed to avoid mixing package name with soversion (lintian package-name-doesnt-match-sonames). Change-Id: Ic00208cf8b0568d027306d487abae827b03dbabd Signed-off-by: Ricardo Salveti <ricardo.salveti@linaro.org>
-rw-r--r--debian/changelog2
-rw-r--r--debian/control4
-rw-r--r--debian/librte-pmd-e1000-1.symbols2
-rw-r--r--debian/librte-pmd-e10001.symbols2
-rwxr-xr-xdebian/rules11
5 files changed, 14 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 2acfdf8d..cf2913ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ dpdk (16.07-rc3-1) UNRELEASED; urgency=medium
* debian/rules:
- Allow all make commands to be verbose
- Fix libdpdk-dev headers path
+ * Renaming package librte-pmd-e10001 to librte-pmd-e1000-1, to avoid mixing
+ package name with soversion (lintian package-name-doesnt-match-sonames)
-- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 19 Jul 2016 08:32:06 +0200
diff --git a/debian/control b/debian/control
index 93535ccf..017f4b56 100644
--- a/debian/control
+++ b/debian/control
@@ -113,7 +113,7 @@ Depends: ${misc:Depends},
librte-pmd-af-packet1 (= ${binary:Version}),
librte-pmd-bond1 (= ${binary:Version}),
librte-pmd-cxgbe1 (= ${binary:Version}),
- librte-pmd-e10001 (= ${binary:Version}),
+ librte-pmd-e1000-1 (= ${binary:Version}),
librte-pmd-ena1 (= ${binary:Version}),
librte-pmd-enic1 (= ${binary:Version}),
librte-pmd-fm10k1 (= ${binary:Version}) [amd64 i386],
@@ -401,7 +401,7 @@ Description: Data Plane Development Kit (librte-pmd-cxgbe runtime library)
in user-space and communicate directly with dedicated network interfaces.
This package contains the runtime libraries for librte_pmd_cxgbe
-Package: librte-pmd-e10001
+Package: librte-pmd-e1000-1
Architecture: amd64 arm64 i386
Section: libs
Multi-Arch: same
diff --git a/debian/librte-pmd-e1000-1.symbols b/debian/librte-pmd-e1000-1.symbols
new file mode 100644
index 00000000..1c8eeb4b
--- /dev/null
+++ b/debian/librte-pmd-e1000-1.symbols
@@ -0,0 +1,2 @@
+librte_pmd_e1000.so.1 librte-pmd-e1000-1 #MINVER#
+ DPDK_2.0@DPDK_2.0 16.04
diff --git a/debian/librte-pmd-e10001.symbols b/debian/librte-pmd-e10001.symbols
deleted file mode 100644
index b7465d07..00000000
--- a/debian/librte-pmd-e10001.symbols
+++ /dev/null
@@ -1,2 +0,0 @@
-librte_pmd_e1000.so.1 librte-pmd-e10001 #MINVER#
- DPDK_2.0@DPDK_2.0 16.04
diff --git a/debian/rules b/debian/rules
index 42e58bad..23e7b075 100755
--- a/debian/rules
+++ b/debian/rules
@@ -155,9 +155,14 @@ binary-arch:
BN=$$(basename $${lib}); \
VER=$$(echo $${BN} | sed -e 's/^.*\.so\.//'); \
LN=$$(echo $${BN} | sed -e 's/\.so\.[0-9]*$$//' | tr '_' '-'); \
- echo "moving $${lib} for library $${LN}$${VER}"; \
- mkdir -p debian/$${LN}$${VER}/$(LIBDIR); \
- mv $${lib} debian/$${LN}$${VER}/$(LIBDIR); \
+ if echo $${LN} | grep -q ".*[0-9]$$"; then \
+ PKG=$${LN}-$${VER}; \
+ else \
+ PKG=$${LN}$${VER}; \
+ fi; \
+ echo "moving $${lib} for library $${PKG}"; \
+ mkdir -p debian/$${PKG}/$(LIBDIR); \
+ mv $${lib} debian/$${PKG}/$(LIBDIR); \
done
# Package: dpdk-igb-uio-dkms
mkdir -p debian/dpdk-igb-uio-dkms/usr/src/dpdk-igb-uio-$(VERSION)