diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2020-04-06 08:59:25 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2020-04-06 09:06:41 +0200 |
| commit | 25d1e13ccc22c69f93710feebd1e919ff30bfd15 (patch) | |
| tree | 7117e7e1094cfdf3fc7695af1c4352f588900dee | |
| parent | 29532770d2c7bdef980a3c53a7ebe098b83291ff (diff) | |
packaging: use debian/not-installed to ignore snap-preseeddebian-sid-fix
The debian build failed because snap-preseed was not removed in the "_dh_install-indep" target. This made it fail during the amd64 build on Debian. Instead of removing the file in both the "_dh_install-{arch,indep}" target this commit uses debian/not-installed to avoid the duplication. This should have been caught in the nightly sbuild-* test but the test fails there since forever due to an incorrect setup.
| -rw-r--r-- | packaging/debian-sid/not-installed | 3 | ||||
| -rwxr-xr-x | packaging/debian-sid/rules | 7 |
2 files changed, 2 insertions, 8 deletions
diff --git a/packaging/debian-sid/not-installed b/packaging/debian-sid/not-installed index 523515aeaf..0ee0397444 100644 --- a/packaging/debian-sid/not-installed +++ b/packaging/debian-sid/not-installed @@ -2,4 +2,5 @@ usr/bin/snap-repair usr/bin/snap-failure usr/lib/snapd/system-shutdown usr/bin/snap-bootstrap -usr/bin/snap-recovery-chooser \ No newline at end of file +usr/bin/snap-recovery-chooser +usr/bin/snap-preseed diff --git a/packaging/debian-sid/rules b/packaging/debian-sid/rules index 81426ac252..933548a3ed 100755 --- a/packaging/debian-sid/rules +++ b/packaging/debian-sid/rules @@ -255,13 +255,6 @@ override_dh_install-arch: rm $(CURDIR)/debian/snapd/$(SYSTEMD_UNITS_DESTDIR)/snapd.system-shutdown.service rm $(CURDIR)/debian/snapd/usr/lib/snapd/snapd.run-from-snap - # snap-preseed is currently only useful on ubuntu and tailored for preseeding - # of ubuntu cloud images due to certain assumptions about runtime environment - # of the host and of the preseeded image. -ifneq ($(shell dpkg-vendor --query Vendor),Ubuntu) - rm -f ${CURDIR}/debian/tmp/usr/bin/snap-preseed -endif - dh_install override_dh_auto_install: snap.8 |