X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=debian%2Frules;h=04a9d0249b0f1a3c0caa0a121c212819887c3b26;hb=840ac9b641a21b560bb6a58d43af8cd70db120e5;hp=2b7db7573353296b314faa3cfb2e8b64077ab6dd;hpb=84adab31e2d11153f8f83eafc4cc54af5deb7806;p=deb_dpdk.git

diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index 2b7db757..04a9d024
--- 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')
+ABIVERSION := "$(VERSION).0"
 
 # see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
 include /usr/share/dpkg/default.mk
@@ -145,6 +146,7 @@ endif
 ifeq (,$(filter dpdk_config=%,$(DEB_BUILD_OPTIONS)))
 	sed -ri -e 's,(RTE_MACHINE=).*,\1$(RTE_MACHINE),' \
 		-e 's,(RTE_NEXT_ABI=).*,\1n,' \
+		-e 's,(CONFIG_RTE_MAJOR_ABI=).*,\1$(ABIVERSION),' \
 		-e 's,(CONFIG_RTE_EAL_IGB_UIO=).*,\1$(DPDK_CONFIG_BUILD_KMOD),' \
 		-e 's,(CONFIG_RTE_KNI_KMOD=).*,\1$(DPDK_CONFIG_BUILD_KMOD),' \
 		-e 's,(LIBRTE_PMD_PCAP=).*,\1y,' \
@@ -183,6 +185,7 @@ override_dh_auto_build-arch:
 	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) -j $(PAR) V=$(DH_VERBOSE) O=$(DPDK_SHARED_DIR) RTE_KERNELDIR=$(KSRC) test-build
 
 override_dh_auto_install-arch: LIBDIR=/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 override_dh_auto_install-arch:
@@ -209,8 +212,10 @@ override_dh_auto_install-arch:
 		debian/dpdk-dev/usr/share/dpdk/dpdk-sdk-env.sh
 	# include the bundled autotest suite to be usable from the dpdk-dev package
 	mkdir -p debian/dpdk-dev/usr/share/dpdk/test
-	cp -a app/test/autotest* debian/dpdk-dev/usr/share/dpdk/test
+	cp -a test/test/autotest* debian/dpdk-dev/usr/share/dpdk/test
 	cp $(DPDK_SHARED_DIR)/app/test debian/dpdk-dev/usr/share/dpdk/test/
+	cp $(DPDK_SHARED_DIR)/app/testacl debian/dpdk-dev/usr/share/dpdk/test/
+	cp $(DPDK_SHARED_DIR)/app/testpipeline debian/dpdk-dev/usr/share/dpdk/test/
 	# since we move libs to multiarch dirs update the non aware symlink
 	rm debian/dpdk-dev/usr/share/dpdk/$(RTE_TARGET)/lib
 	ln -rs debian/dpdk-dev/$(LIBDIR)/ \
@@ -232,16 +237,15 @@ override_dh_auto_install-arch:
 	# Package(s): libdpdk-<NAME><VER> (bare runtime libs)
 	for lib in $$(ls -1 debian/dpdk/$(LIBDIR)/*.so.*); do \
 	  BN=$$(basename $${lib}); \
-	  VER=$$(echo $${BN} | sed -e 's/^.*\.so\.//'); \
-	  LN=$$(echo $${BN} | sed -e 's/\.so\.[0-9]*$$//' | tr '_' '-'); \
+	  LN=$$(echo $${BN} | sed -e 's/\.so\.[0-9\.]*$$//' | tr '_' '-'); \
 	  if echo $${LN} | grep -q ".*[0-9]$$"; then \
-	    PKG=$${LN}-$${VER}; \
+	    PKG=$${LN}-$(VERSION); \
 	  else \
-	    PKG=$${LN}$${VER}; \
+	    PKG=$${LN}$(VERSION); \
 	  fi; \
 	  LIBF="$$(basename $${lib})"; \
 	  LIBD="debian/$${PKG}/$(LIBDIR)"; \
-	  echo "moving $${lib} for library $${PKG}"; \
+	  echo "moving $${lib} to dir $${LIBD} (PKG=$${PKG} BN=$${BN} LN={$${LN} LIBF=$${LIBF} LIBD=$${LIBD})"; \
 	  mkdir -p $${LIBD}; \
 	  mv $${lib} $${LIBD}; \
 	  if [ "$${LIBF#librte_pmd_}x" != "$${LIBF}x" ]; then \
@@ -270,9 +274,9 @@ override_dh_auto_install-arch:
 		debian/dpdk-rte-kni-dkms/usr/src/dpdk-rte-kni-$(VERSION)
 ifneq (,$(KVERS))
 	# Package: dpdk-modules-<kernel version>
-	mkdir -p debian/dpdk-modules-$(KVERS)/lib/modules/$(KVERS)/kernel/drivers/net
-	cp -a debian/build/shared-root/kmod/* \
-		debian/dpdk-modules-$(KVERS)/lib/modules/$(KVERS)/kernel/drivers/net
+	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_SHARED_DIR) \
+		kerneldir=/lib/modules/$(KVERS)/extra/dpdk \
+		DESTDIR=debian/dpdk-modules-$(KVERS) install-kmod
 endif
 
 debian/libethdev4.links: debian/libethdev4.links.in