diff options
| author | Steve McIntyre <steve@einval.com> | 2021-04-30 19:24:54 +0100 |
|---|---|---|
| committer | Steve McIntyre <steve@einval.com> | 2021-04-30 19:43:48 +0100 |
| commit | de9184bb704e3e953e5881d752439366add5b47f (patch) | |
| tree | 5fd28b8d1729774e230931cc461165f292e6a05c | |
| parent | 2ccaa89dba309538c8398b4da6ba812d7b78a573 (diff) | |
| download | shim-signed-de9184bb704e3e953e5881d752439366add5b47f.tar.gz shim-signed-de9184bb704e3e953e5881d752439366add5b47f.zip | |
Don't include apport stuff in the Debian build, it's not useful
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | debian/rules | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 0ef1871..c791f5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ shim-signed (1.34) UNRELEASED; urgency=medium * Update build-deps and Standards-Version * Tweak Makefile setup - do our verification testing chained from the "all" target, not "clean". Closes: #936002 + * Don't include apport stuff in the Debian build, it's not useful. -- Steve McIntyre <93sam@debian.org> Thu, 29 Apr 2021 22:04:33 +0100 diff --git a/debian/rules b/debian/rules index 0276fa2..56e44ae 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,7 @@ VERSION := $(shell LC_ALL=C dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2) SHIM_VERSION := $(shell dpkg-query -f '$${Version}\n' -W shim-unsigned) +VENDOR := $(shell dpkg-vendor --query vendor) include /usr/share/dpkg/architecture.mk @@ -30,6 +31,13 @@ override_dh_installdocs: override_dh_installdebconf: dh_installdebconf -p shim-signed-common +override_dh_installdeb: +ifeq ($(VENDOR),Debian) + # Remove apport files from Debian builds, they're not useful + find debian/shim-signed-common -name '*apport*' | xargs rm -rvf +endif + dh_installdeb + override_dh_gencontrol: ifeq ($(DEB_HOST_ARCH),arm64) # On arm64, substitute our package description with "not |