[kernel-snaps-uc20,1/2] Add kernel.efi handle.
diff mbox series

Message ID 20191122155352.73841-1-xnox@ubuntu.com
State New
Headers show
Series
  • [kernel-snaps-uc20,1/2] Add kernel.efi handle.
Related show

Commit Message

Dimitri John Ledkov Nov. 22, 2019, 3:53 p.m. UTC
If a kernel.efi image is produced by the initramfs tooling, include it
in the snap.

Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

Comments

Andy Whitcroft Nov. 28, 2019, 10:27 a.m. UTC | #1
On Fri, Nov 22, 2019 at 03:53:51PM +0000, Dimitri John Ledkov wrote:
> If a kernel.efi image is produced by the initramfs tooling, include it
> in the snap.
> 
> Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
> ---
>  Makefile | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/Makefile b/Makefile
> index 7ea96b0..7c292de 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -129,6 +129,9 @@ install:
>  	else \
>  	  mv chroot/boot/vmlinu?-* $(DESTDIR)/kernel.img; \
>  	fi
> +	if [ -f chroot/boot/kernel.efi ]; then \
> +	  mv chroot/boot/kernel.efi $(DESTDIR)/kernel.efi; \
> +	fi
>  	mv chroot/boot/initrd.img-* $(DESTDIR)/initrd.img
>  	# Copy meta data into the snap. The ABI file itself actually was
>  	# not used for anything and just done for completeness. Since new
> -- 
> 2.24.0
> 

Acked-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft Nov. 28, 2019, 10:28 a.m. UTC | #2
Applied to uc20 snap master branch.

-apw

Patch
diff mbox series

diff --git a/Makefile b/Makefile
index 7ea96b0..7c292de 100644
--- a/Makefile
+++ b/Makefile
@@ -129,6 +129,9 @@  install:
 	else \
 	  mv chroot/boot/vmlinu?-* $(DESTDIR)/kernel.img; \
 	fi
+	if [ -f chroot/boot/kernel.efi ]; then \
+	  mv chroot/boot/kernel.efi $(DESTDIR)/kernel.efi; \
+	fi
 	mv chroot/boot/initrd.img-* $(DESTDIR)/initrd.img
 	# Copy meta data into the snap. The ABI file itself actually was
 	# not used for anything and just done for completeness. Since new