From ea92c90cd2a28edf7e9f077282a8476c045a2a12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 3 Jun 2019 15:11:29 +0200 Subject: DEB: Resolve FTBFS in support for using the $(DEB_HOST_MULTIARCH) variable if the package does not contain any install and links files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 6e6210f3042a985d937a1e354a3fa6f83259b2b5) --- ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'ubuntu/_base/dependencies/akode') diff --git a/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk index 7c67fc9ca..4eeb672b0 100644 --- a/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk +++ b/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk @@ -141,8 +141,11 @@ common-binary-arch:: done; \ rm -f $$tmpf ) # update multi-arch path in install files - for a in debian/*install debian/*links; do \ + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ [ -d $$a ] || [ -f $$a.arch ] || \ + ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \ done @@ -152,7 +155,9 @@ clean:: rm -f debian/stamp-man-pages rm -rf debian/shlibs-check # revert multi-arch path in install files - for a in debian/*install debian/*links; do \ + ls -d debian/* | \ + grep -E "(install|links)$$" | \ + while read a; do \ [ ! -f $$a.arch ] || \ mv $$a.arch $$a; \ done -- cgit v1.2.1