[Pkg-xen-devel] [PATCH 01/12] Revert "debian/rules: Do not try to move EFI binaries on armhf"

[Elliott Mitchell]

On Thu, Sep 17, 2020 at 03:46:47PM +0100, Ian Jackson wrote:
> Elliott Mitchell writes ("[PATCH 01/12] Revert "debian/rules: Do not try to move EFI binaries on armhf""):
> > If EFI isn't being built the files simply won't be there and the line
> > accomplishes nothing.  If EFI is added to a new platform this adds an
> > extra spot which breaks.
> 
> Hi.  Thanks for all this work.  I'm reviewing your patches.
> (FYI I am involved both in Xen in Debian, and am also upstream.[1])

I'm well aware, even though you use a distinct address in MAINTAINERS it
is still pretty obvious you're the same person.

> > diff --git a/debian/rules b/debian/rules
> > index 543c735f3e..cd90e27038 100755
> > --- a/debian/rules
> > +++ b/debian/rules
> > @@ -224,10 +224,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
> > +	mv $t/usr/lib64/efi/* $t/boot/.
> >  	:
> 
> This looks to me like it will fail if the files do not exist.  The
> case was a way to work around this problem.  That is, I think the
> shell will execute the command with literally a `*' and then mv will
> complain.
> 
> We need a rune which doesn't fail if the file is absent.  But it
> *should* fail if the file exists but the rename fails.
> (Maybe we could do this with some debhelper thing instead.)

Ultimately the real test was simply trying to cross-build and finding
this was a spot causing problems.  When I'd tried, that appeared to work.

This would make it no longer a partial revert but:

find "$t/usr/lib64/efi" -mindepth 1 -maxdepth 1 -print0 | xargs -0 mv -t "$t/boot"

Matches what you're describing.


-- 
(\___(\___(\______          --=> 8-) EHM <=--          ______/)___/)___/)
 \BS (    |         ehem+sigmsg at m5p.com  PGP 87145445         |    )   /
  \_CS\   |  _____  -O #include <stddisclaimer.h> O-   _____  |   /  _/
8A19\___\_|_/58D2 7E3D DDF4 7BA6 <-PGP-> 41D1 B375 37D0 8714\_|_/___/5445