[Pkg-xen-devel] [PATCH 2/9] debian/rules: Correct shim install step for current Xen

[Hans van Kranenburg]

Hi,

On 7/17/20 7:16 AM, Elliott Mitchell wrote:
> When originally implemented, the separated shim install step relied on
> the shim install being a NOP on shimless architectures.  Either this is
> no longer the case, or else cross-building confuses the architecture
> detection.

Ooh, is this the same thing that I worked around by using a bigger
hammer and reverting upstream commit a516bddbd3
("tools/firmware/Makefile: CONFIG_PV_SHIM: enable only on x86_64") and
cherry-pick our previous commits 0b898ccc2 ("tools/firmware/Makfile:
Respect caller's CONFIG_PV_SHIM") and a516bddbd3
("tools/firmware/Makefile: CONFIG_PV_SHIM: enable only on x86_64")?

> Take out a typo while at it.
> 
> Signed-off-by: Elliott Mitchell <ehem+debian at m5p.com>
> ---
>  debian/rules | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/debian/rules b/debian/rules
> index 29a561b99f..e6c51b4ede 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -223,11 +223,13 @@ override_dh_auto_install: $(TEMPLATED_FILES)
>  	:
>  	@# shim install target needs to be run separately because we
>  	@# need to pass it the make_args_xen settings, in particular
> -	@# on i386 bwe need to pass x86_64 here to actually build it.
> -	@# Luckily this target, unlike the build, is a noop on
> -	@# shimless arches, so it does not need to be conditional.
> -	$(MAKE) $(make_args_xen) DESTDIR=$t $(make_args_xen) \
> -		-C tools/firmware install-shim
> +	@# on i386 we need to pass x86_64 here to actually build it.
> +	case $(flavour) in \
> +	amd64|i386) \
> +		$(MAKE) $(make_args_xen) DESTDIR=$t $(make_args_xen) \
> +			-C tools/firmware install-shim \
> +	;; \
> +	esac
>  	:
>  	@# Inexplicably, upstream puts the efi binares in usr/lib64
>  	find "$t/usr/lib64/efi" -mindepth 1 -maxdepth 1 -print0 | xargs -r -0 mv -t "$t/boot"
> 

I think it might be.

I will try to revert those reverts and apply this and test the build.

Hans