Control: tags -1 + patch
On Wed, 15 Nov 2017 at 18:16:17 +0100, Helmut Grohne wrote:
> | cp `pwd`/debian/mbr/sbin/install-mbr `pwd`/debian/mbr-udeb/sbin/
> | cp: cannot create regular file '/<<PKGBUILDDIR>>/debian/mbr-udeb/sbin/': No
> such file or directory
>
> https://tests.reproducible-builds.org/debian/rb-pkg/unstable/arm64/mbr.html
> https://tests.reproducible-builds.org/debian/rb-pkg/unstable/armhf/mbr.html
>
> This is likely because debhelper became more strict recently. You cannot
> reproduce this on amd64 or i386 (except by cross building).
The attached patch seems to fix this in a cross-build with -aarm64.
Regards,
smcv
>From 172c4f28fb3f1bf4ab38e7b69378415bca951705 Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Mon, 2 Jul 2018 08:27:13 +0100
Subject: [PATCH] Only copy install-mbr into mbr-udeb if we will build that
package
This fixes FTBFS on non-x86 architectures. In recent debhelper versions,
dh_installdirs does not create directories for binary packages that are
not applicable to the current architecture.
---
debian/changelog | 11 +++++++++++
debian/rules | 4 ++++
2 files changed, 15 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 90fe3c1..e83dd11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+mbr (1.1.11-5.2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Only copy install-mbr to debian/mbr-udeb/sbin if we are going to
+ build the mbr-udeb package, fixing FTBFS on non-x86 architectures.
+ In recent debhelper versions, dh_installdirs does not create
+ directories for binary packages that are not applicable to the
+ current architecture.
+
+ -- Simon McVittie <s...@debian.org> Mon, 02 Jul 2018 08:24:52 +0100
+
mbr (1.1.11-5.1) unstable; urgency=medium
* Non-maintainer upload.
diff --git a/debian/rules b/debian/rules
index cebafe2..6761009 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+binaries := $(shell dh_listpackages)
+
CC := gcc -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
CFLAGS := -g -Wall -W
@@ -38,7 +40,9 @@ install: build
dh_installdocs -p mbr debian/README-1st.Debian NEWS README AUTHORS
dh_installchangelogs
$(MAKE) install INSTALL_PROGRAM="$(INSTALL_PROGRAM)"
+ifneq ($(filter mbr-udeb,$(binaries)),)
cp `pwd`/debian/mbr/sbin/install-mbr `pwd`/debian/mbr-udeb/sbin/
+endif
binary-indep: build
dh_testdir
--
2.18.0
