From: Elliott Mitchell Date: Fri, 17 Jul 2020 05:39:45 +0000 (-0700) Subject: Rework "debian/rules: Do not try to move EFI binaries on armhf" X-Git-Tag: archive/raspbian/4.14.1+11-gb0b734a8b3-1+rpi1^2~51 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c309f301803074804ceb0144cd9b40099392c1cd;p=xen.git Rework "debian/rules: Do not try to move EFI binaries on armhf" What is actually needed is a move command which fails if the move fails (i386/amd64, the EFI files were created, but the move failed), but succeeds if no files are moved (armhf, no EFI files are created). A combination of find/xargs matches this. This reworks commit 8ff478af61fa8a87806a89bbd618cd9da2354302. Signed-off-by: Elliott Mitchell Acked-by: Hans van Kranenburg --- diff --git a/debian/rules b/debian/rules index 78aad5eeda..222e012cf8 100755 --- a/debian/rules +++ b/debian/rules @@ -247,10 +247,7 @@ override_dh_auto_install: $(TEMPLATED_FILES) -C tools/firmware install-shim : @# Inexplicably, upstream puts the efi binares in usr/lib64 - case $(flavour) in \ - armhf) ;; \ - *) mv $t/usr/lib64/efi/* $t/boot/. ;; \ - esac + find "$t"/usr/lib*/efi -mindepth 1 -maxdepth 1 -print0 | xargs -r -0 mv -t "$t/boot" : @# This file contains an arch-specific path and we put it @# in xen-utils-common, an arch-all package. But the