summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/.gitignore1
-rw-r--r--debian/control1
-rw-r--r--debian/control.modules.in1
-rwxr-xr-xdebian/rules5
4 files changed, 3 insertions, 5 deletions
diff --git a/debian/.gitignore b/debian/.gitignore
index 4c32c181..269a9fb4 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -6,7 +6,6 @@
*.dkms.debhelper
build/
control.modules
-control.orig
dpdk-dev/
dpdk-doc/
dpdk-igb-uio-dkms/
diff --git a/debian/control b/debian/control
index 2b59fedb..e77cece0 100644
--- a/debian/control
+++ b/debian/control
@@ -714,3 +714,4 @@ Description: Data Plane Development Kit (librte_pdump runtime library)
DPDK is a set of libraries for fast packet processing. Applications run
in user-space and communicate directly with dedicated network interfaces.
This package contains the runtime libraries for librte_pdump
+
diff --git a/debian/control.modules.in b/debian/control.modules.in
index 93148b60..28ace967 100644
--- a/debian/control.modules.in
+++ b/debian/control.modules.in
@@ -1,4 +1,3 @@
-
Package: dpdk-modules-#KVERS#
Section: kernel
Architecture: amd64 arm64 i386
diff --git a/debian/rules b/debian/rules
index b982b245..d4b09dfe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,8 +81,7 @@ build:
exit 1; \
fi
sh debian/prep-modules $(KSRC)
- test -f debian/control.orig || cp -v debian/control debian/control.orig
- cat debian/control.orig debian/control.modules > debian/control
+ cat debian/control.modules >> debian/control
dh $@ --with python2,dkms
endif
@@ -92,7 +91,7 @@ endif
override_dh_auto_clean:
rm -rf debian/build debian/tmp debian/dpdk-modules-* \
debian/control.modules debian/VERSION
- mv debian/control.orig debian/control || true
+ sed -i '/Package: dpdk-modules-/,/`tail -n1 debian/control.modules.in`/d' debian/control
override_dh_auto_configure:
# report dpkg-buildflags status to build log