X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=debian%2Frules;h=2953c406d282674da337a23ede12d82c2c2f0da3;hb=9a92e68265613f8beb66e0591ec940fd613f8758;hp=2493f5365e8447fccaaaed224b9383726a2fc72b;hpb=d576b9dbe68f9f2aa1348926d5b34a35e567c8db;p=deb_dpdk.git

diff --git a/debian/rules b/debian/rules
index 2493f536..2953c406 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,14 +4,10 @@
 export DH_VERBOSE=1
 export DH_OPTIONS=-v
 
-VERSION := $(shell dpkg-parsechangelog --show-field Version | sed -nr 's/(.*:)?([^-])(-.*)/\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
 
-DEB_HOST_GNU_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
-DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DPDK_ABI := $(shell echo $(DEB_VERSION_UPSTREAM) | cut -d '-' -f1 | cut -d '.'  -f1-2)
 
 # see FEATURE AREAS in dpkg-buildflags(1)
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie
@@ -125,11 +121,11 @@ build:
 	fi
 	sh debian/prep-modules $(KSRC)
 	cat debian/control.modules >> debian/control
-	dh $@ --with python2,dkms
+	dh $@ --with python2,dkms,systemd
 endif
 
 %:
-	dh $@ --with python2,dkms
+	dh $@ --with python2,dkms,systemd
 
 override_dh_gencontrol:
 	dh_gencontrol
@@ -338,17 +334,17 @@ endif
 	mkdir -p debian/libdpdk-dev/$(LIBDIR)/pkgconfig
 	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)/" \
+	sed -e "s/@DPDK_LIBS@/$${LIBS}/" -e "s/@VERSION@/$(DEB_VERSION_UPSTREAM)/" \
 		-e "s|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g" \
 		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)
+	mkdir -p debian/dpdk-igb-uio-dkms/usr/src/dpdk-igb-uio-$(DEB_VERSION_UPSTREAM)
 	cp lib/librte_eal/linuxapp/igb_uio/* \
-		debian/dpdk-igb-uio-dkms/usr/src/dpdk-igb-uio-$(VERSION)
+		debian/dpdk-igb-uio-dkms/usr/src/dpdk-igb-uio-$(DEB_VERSION_UPSTREAM)
 	# Package: dpdk-rte-kni-dkms
-	mkdir -p debian/dpdk-rte-kni-dkms/usr/src/dpdk-rte-kni-$(VERSION)
+	mkdir -p debian/dpdk-rte-kni-dkms/usr/src/dpdk-rte-kni-$(DEB_VERSION_UPSTREAM)
 	cp -a lib/librte_eal/linuxapp/kni/* \
-		debian/dpdk-rte-kni-dkms/usr/src/dpdk-rte-kni-$(VERSION)
+		debian/dpdk-rte-kni-dkms/usr/src/dpdk-rte-kni-$(DEB_VERSION_UPSTREAM)
 ifneq (,$(KVERS))
 	# Package: dpdk-modules-<kernel version>
 	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_SHARED_DIR) \
@@ -357,13 +353,13 @@ ifneq (,$(KVERS))
 endif
 
 override_dh_dkms:
-	dh_dkms -V $(VERSION)
+	dh_dkms -V $(DEB_VERSION_UPSTREAM)
 
 override_dh_installinit:
-	dh_installinit --no-start --no-restart-on-upgrade
+	dh_installinit --no-start --no-stop-on-upgrade
 
 override_dh_systemd_start:
-	dh_systemd_start --no-start --no-restart-on-upgrade
+	dh_systemd_start --no-start --no-stop-on-upgrade
 
 override_dh_auto_test: