From da1af9ba4305c71f18a11e9206cdbdfc5eb36cbd Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Fri, 2 Nov 2018 16:50:27 +0000 Subject: Drop libdpdk-dbgsym - not really used and broken in sid debhelper tools got stricter on acting on packages missing from debian/control, so the generation of libdpdk-dbgsym is broken. It was always a hack anyway since dbgsym are not supposed to be created manually Change-Id: I423e7006049a48085686dfea5c3dc106ec86217a Signed-off-by: Luca Boccassi --- debian/dh-dbgsym-metapkg | 24 ------------------------ debian/rules | 17 +---------------- 2 files changed, 1 insertion(+), 40 deletions(-) delete mode 100755 debian/dh-dbgsym-metapkg diff --git a/debian/dh-dbgsym-metapkg b/debian/dh-dbgsym-metapkg deleted file mode 100755 index fecbed18..00000000 --- a/debian/dh-dbgsym-metapkg +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -e - -PACKAGE=${1:?Missing parameter} - -dh_installdocs -p${PACKAGE} -dh_installchangelogs -p${PACKAGE} -dh_compress -p${PACKAGE} - -install -d debian/${PACKAGE}/DEBIAN - -echo -n 'misc:Depends=' > debian/${PACKAGE}.substvars -grep -E 'lib.*-dbgsym' debian/files | tr '_' ' ' | \ - awk '{ print $1,"(=",$2 ")" }' | paste -sd ',' - | \ - sed -e 's/,/, /g' >> debian/${PACKAGE}.substvars - -dh_gencontrol -p libdpdk-dev -- \ - -Pdebian/${PACKAGE} \ - -Tdebian/${PACKAGE}.substvars \ - -UPre-Depends -URecommends -USuggests -UEnhances -UProvides \ - -UEssential -UConflicts -UReplaces -UBreaks \ - -DSection=debug -DPriority=extra \ - -DAuto-Built-Package=debug-symbols \ - -DPackage=${PACKAGE} "-DDepends=\${misc:Depends}" \ - "-DDescription=Debug symbols for libdpdk-dev (meta-package)" diff --git a/debian/rules b/debian/rules index 3ce83b9e..723c7130 100755 --- a/debian/rules +++ b/debian/rules @@ -72,7 +72,7 @@ endif override_dh_gencontrol: dh_gencontrol # debian/files will not exist until dh_gencontrol has ran at least once, - # so we need to run gencontrol for libdpdk-dev and libdpdk-dbgsym after. + # so we need to run gencontrol for libdpdk-dev after. # The list of libraries and PMDs is everchanging, so generate the dependency # list for libdpdk-dev to avoid having to maintain it manually. # Same for the recommends list for dpdk, were we want the PMDs and the mempools. @@ -83,21 +83,6 @@ ifneq (,$(findstring kernel_modules,$(DEB_BUILD_OPTIONS))) -v`cat debian/VERSION` \ -V'built:using:kernel=$(call get_built_using,linux-headers-$(KVERS))' endif -ifneq (,$(findstring dbgsym_meta,$(DEB_BUILD_OPTIONS))) - ./debian/dh-dbgsym-metapkg libdpdk$(DPDK_ABI)-dbgsym -endif - -# dbgsym_meta can be passed via DEB_BUILD_OPTIONS to enable building the -# optional dbgsym meta package libdpdk-dbgsym. -# This is not built by default as it would go in main but depend on -# packages in the debian-debug archive. -# Debian Developers and FTP masters strongly discourage this. -# We provide this optional flag as a convenience for rebuilders. -ifneq (,$(findstring dbgsym_meta,$(DEB_BUILD_OPTIONS))) -override_dh_builddeb: - dh_builddeb - dh_builddeb -plibdpdk$(DPDK_ABI)-dbgsym -endif override_dh_auto_clean: rm -rf debian/build debian/tmp debian/dpdk-modules-* \ -- cgit 1.2.3-korg