X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=debian%2Frules;h=bd5ec0b59df124446e4d3c808c1c5ab240580216;hb=84fc024c38dc0277dd25776fdc99670ef00b39cb;hp=b2a059ad728a05ea8abce3c6370a7675d483312e;hpb=784bf02aa60bcb6db6cdc57af06a0ec4e6c8add8;p=deb_dpdk.git

diff --git a/debian/rules b/debian/rules
index b2a059ad..bd5ec0b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@ export DH_VERBOSE=1
 export DH_OPTIONS=-v
 
 VERSION := $(shell dpkg-parsechangelog | sed -nr '/^Version:/s/Version: (.*:)?(.*)-(.*)/\2/p')
+DPDK_ABI := $(shell echo $(VERSION) | cut -d '.'  -f1-2)
 
 # see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
 include /usr/share/dpkg/default.mk
@@ -71,11 +72,10 @@ DPDK_SHARED_DIR = "debian/build/shared-root"
 # now stable with parallel comilation, so support -j
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
     PAR := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-else
-    PAR := "1"
+    MAKEFLAGS += -j$(PAR)
 endif
 
-ifneq (,$(findstring nodocs,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS)))
 BUILD_DOCS=n
 else
 BUILD_DOCS=y
@@ -118,6 +118,11 @@ override_dh_gencontrol:
 	dh_gencontrol -p dpdk-modules-$(KVERS) -- \
 		-v`cat debian/VERSION` \
 		-V'built:using:kernel=$(call get_built_using,linux-headers-$(KVERS))'
+	./debian/dh-dbgsym-metapkg libdpdk$(DPDK_ABI)-dbgsym
+
+override_dh_builddeb:
+	dh_builddeb
+	dh_builddeb -plibdpdk$(DPDK_ABI)-dbgsym
 
 build:
 	@if [ x"$(KVERS)" = x ] ; then \
@@ -172,7 +177,7 @@ endif
 
 override_dh_auto_build-indep:
 ifeq (y,$(BUILD_DOCS))
-	$(MAKE) -j $(PAR) V=$(DH_VERBOSE) O=$(DPDK_STATIC_DIR) doc-api-html doc-guides-html
+	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_STATIC_DIR) doc-api-html doc-guides-html
 endif
 
 override_dh_auto_install-indep:
@@ -185,7 +190,7 @@ endif
 
 override_dh_auto_build-arch:
 ifeq (y,$(BUILD_STATIC_LIB))
-	$(MAKE) -j $(PAR) V=$(DH_VERBOSE) O=$(DPDK_STATIC_DIR) RTE_KERNELDIR=$(KSRC) build
+	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_STATIC_DIR) RTE_KERNELDIR=$(KSRC) build
 endif
 	# Unfortunately the decision about having static or shared libraries is
 	# made for the whole build, which then produces only .a or .so files
@@ -199,10 +204,10 @@ endif
 	cp -a $(DPDK_STATIC_DIR) $(DPDK_SHARED_DIR)
 	sed -ri 's,(RTE_BUILD_SHARED_LIB=).*,\1y,' \
 		$(DPDK_SHARED_DIR)/.config
-	$(MAKE) -j $(PAR) V=$(DH_VERBOSE) O=$(DPDK_SHARED_DIR) RTE_KERNELDIR=$(KSRC) build
+	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_SHARED_DIR) RTE_KERNELDIR=$(KSRC) build
 ifeq (y,$(BUILD_DOCS))
 	# need to be around for dh_installman to be picked up
-	$(MAKE) -j $(PAR) V=$(DH_VERBOSE) O=$(DPDK_SHARED_DIR) RTE_KERNELDIR=$(KSRC) doc-guides-man
+	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_SHARED_DIR) RTE_KERNELDIR=$(KSRC) doc-guides-man
 endif
 
 override_dh_auto_install-arch: LIBDIR=/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -274,6 +279,11 @@ endif
 	    echo "PMD: linking $${LIBF} into RTE_EAL_PMD_PATH at $${LIBD}/dpdk-pmds/"; \
 	    ln -s --relative --target-directory=$${LIBD}/dpdk-pmds/ $${LIBD}/$${LIBF}; \
 	  fi; \
+	  if [ "$${LIBF#librte_mempool_}x" != "$${LIBF}x" ]; then \
+	    mkdir -p $${LIBD}/dpdk-pmds; \
+	    echo "MEMPOOL: linking $${LIBF} into RTE_EAL_PMD_PATH at $${LIBD}/dpdk-pmds/"; \
+	    ln -s --relative --target-directory=$${LIBD}/dpdk-pmds/ $${LIBD}/$${LIBF}; \
+	  fi; \
 	  if [ "$${LIBF#librte_eal}x" != "$${LIBF}x" ]; then \
 	    mkdir -p $${LIBD}/dpdk-pmds; \
 	  fi; \