[Pkg-xen-devel] [PATCH 03/16] Rework "debian/rules: Do not try to move EFI binaries on armhf"

Hans van Kranenburg hans at knorrie.org
Fri Jan 15 21:10:38 GMT 2021


On 7/17/20 7:39 AM, Elliott Mitchell wrote:
> 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 <ehem+debian at m5p.com>

It's always nice to have one less of those case things with explicit
exceptions.

Acked-by: Hans van Kranenburg <hans at knorrie.org>

> ---
>  debian/rules | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/debian/rules b/debian/rules
> index 959542c25a..60d99e6dc2 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -258,10 +258,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
> 




More information about the Pkg-xen-devel mailing list