X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=debian%2Frules;h=04a9d0249b0f1a3c0caa0a121c212819887c3b26;hb=1f784092de6f79612c6b1a4a4208f3abb03e7084;hp=ccd61406195a19317f1445f4972a6a14a43ab4ec;hpb=341d9ed5cf2aa5da89397e62c900e2d325b8d634;p=deb_dpdk.git diff --git a/debian/rules b/debian/rules old mode 100755 new mode 100644 index ccd61406..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 @@ -15,20 +16,26 @@ DEB_HOST_GNU_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie # see ENVIRONMENT in dpkg-buildflags(1) -# package maintainers to append CFLAGS -export DEB_CFLAGS_MAINT_APPEND = -fPIC -# package maintainers to append LDFLAGS -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - +DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk -export EXTRA_CFLAGS=$(CFLAGS) -export EXTRA_CPPFLAGS=$(CPPFLAGS) -export HOST_EXTRA_CFLAGS=$(CFLAGS) -export HOST_EXTRA_CPPFLAGS=$(CPPFLAGS) -# need to be stripped as DPDK build system adds them and it would be -Wl,-Wl,opt -export EXTRA_LDFLAGS=$(shell echo $(LDFLAGS) | sed 's/-Wl,//g') -# HOST_CC build system does not add -Wl ... -export EXTRA_HOST_LDFLAGS=$(LDFLAGS) + +# Support backporting to jessie +dpkg_version_lt = $(shell dpkg --compare-versions $$(dpkg --status dpkg-dev | grep Version | cut -d' ' -f2) lt-nl "1.18.11" && echo yes) +ifeq (yes, $(dpkg_version_lt)) + # package maintainers to append CFLAGS + # For Debian, dpkg-dev >= 1.18.11 and gcc 6.x, dpkg-buildflags and gcc + # handle -fPIC and related flags relying on specs files + # (/usr/share/dpkg/*specs) + export DEB_CFLAGS_MAINT_APPEND = -fPIC + export EXTRA_CFLAGS=$(CFLAGS) + export EXTRA_CPPFLAGS=$(CPPFLAGS) + export HOST_EXTRA_CFLAGS=$(CFLAGS) + export HOST_EXTRA_CPPFLAGS=$(CPPFLAGS) + # need to be stripped as DPDK build system adds them and it would be -Wl,-Wl,opt + export EXTRA_LDFLAGS=$(shell echo $(LDFLAGS) | sed 's/-Wl,//g') + # HOST_CC build system does not add -Wl ... + export EXTRA_HOST_LDFLAGS=$(LDFLAGS) +endif export RTE_DEVEL_BUILD=n @@ -62,6 +69,13 @@ endif DPDK_STATIC_DIR = "debian/build/static-root" 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" +endif + # kernel_modules can be passed via DEB_BUILD_OPTIONS to enable building the # optional binary kernel modules package. By default it will be built against # the current kernel, or ksrc can be passed with a path to the target kernel @@ -78,6 +92,7 @@ endif KVERS := $(shell perl debian/kernel-version $(KSRC)) export KVERS +export MODULE_CFLAGS=-fno-PIE DPDK_CONFIG_BUILD_KMOD=y @@ -112,6 +127,12 @@ override_dh_auto_clean: sed -i '/Package: dpdk-modules-/,/`tail -n1 debian/control.modules.in`/d' debian/control test -L config/defconfig_$(DPDK_CONFIG) && rm -f config/defconfig_$(DPDK_CONFIG) || true +override_dh_clean: + dh_clean + rm -f debian/libethdev4.links + rm -f debian/librte-cryptodev1.links + rm -f debian/librte-eal2.links + override_dh_auto_configure: # Add support for a custom defconfig file in the debian directory. ifneq (,$(filter dpdk_config=%,$(DEB_BUILD_OPTIONS))) @@ -125,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,' \ @@ -139,7 +161,7 @@ endif dh_auto_configure override_dh_auto_build-indep: - $(MAKE) V=$(DH_VERBOSE) O=$(DPDK_STATIC_DIR) doc-api-html doc-guides-html \ + $(MAKE) -j $(PAR) V=$(DH_VERBOSE) O=$(DPDK_STATIC_DIR) doc-api-html doc-guides-html \ doc-guides-man override_dh_auto_install-indep: @@ -149,7 +171,7 @@ override_dh_auto_install-indep: DESTDIR=debian/dpdk-doc install-doc override_dh_auto_build-arch: - $(MAKE) V=$(DH_VERBOSE) O=$(DPDK_STATIC_DIR) RTE_KERNELDIR=$(KSRC) build + $(MAKE) -j $(PAR) V=$(DH_VERBOSE) O=$(DPDK_STATIC_DIR) RTE_KERNELDIR=$(KSRC) build # Unfortunately the decision about having static or shared libraries is # made for the whole build, which then produces only .a or .so files # (but not both). @@ -162,14 +184,15 @@ override_dh_auto_build-arch: cp -a $(DPDK_STATIC_DIR) $(DPDK_SHARED_DIR) sed -ri 's,(RTE_BUILD_SHARED_LIB=).*,\1y,' \ $(DPDK_SHARED_DIR)/.config - $(MAKE) V=$(DH_VERBOSE) O=$(DPDK_SHARED_DIR) RTE_KERNELDIR=$(KSRC) build + $(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: LIBDIR=/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH) override_dh_auto_install-arch: # Package: dpdk (runtime) - $(MAKE) V=$(DH_VERBOSE) O=$(DPDK_STATIC_DIR) prefix=/usr \ + $(MAKE) V=$(DH_VERBOSE) O=$(DPDK_STATIC_DIR) prefix=/usr libdir=$(LIBDIR) \ DESTDIR=debian/dpdk install-runtime - $(MAKE) V=$(DH_VERBOSE) O=$(DPDK_SHARED_DIR) prefix=/usr \ + $(MAKE) V=$(DH_VERBOSE) O=$(DPDK_SHARED_DIR) prefix=/usr libdir=$(LIBDIR) \ DESTDIR=debian/dpdk install-runtime mkdir -p debian/dpdk/etc/dpdk cp debian/dpdk.interfaces debian/dpdk/etc/dpdk/interfaces @@ -178,38 +201,51 @@ override_dh_auto_install-arch: ln -s /usr/share/dpdk/tools/dpdk-devbind.py \ debian/dpdk/sbin/dpdk-devbind # Package: dpdk-dev (build environment) - $(MAKE) V=$(DH_VERBOSE) O=$(DPDK_SHARED_DIR) prefix=/usr \ + # workaround to fix symbolic link creation + mkdir -p debian/dpdk-dev/$(LIBDIR) + $(MAKE) V=$(DH_VERBOSE) O=$(DPDK_SHARED_DIR) prefix=/usr libdir=$(LIBDIR) \ DESTDIR=debian/dpdk-dev install-sdk + # remove workaround + rm -fr debian/dpdk-dev/usr/lib cp $(DPDK_SHARED_DIR)/.config debian/dpdk-dev/usr/share/dpdk/config sed -e 's/SDK_TARGET/$(RTE_TARGET)/' debian/dpdk-sdk-env.sh.in > \ 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 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)/ \ + debian/dpdk-dev/usr/share/dpdk/$(RTE_TARGET)/lib # Package: libdpdk-dev (bare headers, static devel libs and linker # script) mkdir -p debian/libdpdk-dev/$(LIBDIR) # linker script - mv debian/dpdk/usr/lib/libdpdk.so debian/libdpdk-dev/$(LIBDIR)/ + mv debian/dpdk/$(LIBDIR)/libdpdk.so debian/libdpdk-dev/$(LIBDIR)/ # includes mkdir -p debian/libdpdk-dev/usr/include mv debian/dpdk-dev/usr/include/dpdk debian/libdpdk-dev/usr/include/ # all static libs are in the dev package - mv debian/dpdk/usr/lib/lib*.a debian/libdpdk-dev/$(LIBDIR)/ + mv debian/dpdk/$(LIBDIR)/lib*.a debian/libdpdk-dev/$(LIBDIR)/ # symlinks to last .so's are in the non versioned libdpdk-dev as well # this allows multiple libdpdk- at different VER concurrently # libdpdk-dev depends on all sublibs so symlinks are never broken - mv debian/dpdk/usr/lib/*.so debian/libdpdk-dev/$(LIBDIR)/ + mv debian/dpdk/$(LIBDIR)/*.so debian/libdpdk-dev/$(LIBDIR)/ # Package(s): libdpdk- (bare runtime libs) - for lib in $$(ls -1 debian/dpdk/usr/lib/*.so.*); do \ + 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 \ @@ -226,6 +262,7 @@ override_dh_auto_install-arch: LIBS=$$(sed -e 's/GROUP ( \(.*\) )/\1/' -e 's/lib/-l/g' -e 's/\.so//g' \ $(CURDIR)/debian/libdpdk-dev/$(LIBDIR)/libdpdk.so); \ sed -e "s/@DPDK_LIBS@/$${LIBS}/" -e "s/@VERSION@/$(VERSION)/" \ + -e "s|@LIBDIR@|$(LIBDIR)|" \ debian/libdpdk.pc.in > debian/libdpdk-dev/$(LIBDIR)/pkgconfig/libdpdk.pc # Package: dpdk-igb-uio-dkms mkdir -p debian/dpdk-igb-uio-dkms/usr/src/dpdk-igb-uio-$(VERSION) @@ -237,11 +274,20 @@ override_dh_auto_install-arch: debian/dpdk-rte-kni-dkms/usr/src/dpdk-rte-kni-$(VERSION) ifneq (,$(KVERS)) # Package: dpdk-modules- - 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 + sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' < $< > $@ +debian/librte-cryptodev1.links: debian/librte-cryptodev1.links.in + sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' < $< > $@ +debian/librte-eal2.links: debian/librte-eal2.links.in + sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' < $< > $@ +override_dh_link: debian/libethdev4.links debian/librte-cryptodev1.links debian/librte-eal2.links + dh_link + override_dh_dkms: dh_dkms -V $(VERSION)