| Message ID | 20191128103323.121767-1-xnox@ubuntu.com |
|---|---|
| State | New |
| Headers | show |
| Series | Ship UC20 initrd in the kernel snap. | expand |
On Thu, Nov 28, 2019 at 10:33:23AM +0000, Dimitri John Ledkov wrote: > If a kernel.efi and standard embeded initrd images are produced by the > initramfs tooling, include it in the snap. > > Previous initramfs-tools-ubuntu-core based initrd.img is still > generated, and made available as well. > > Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com> > --- > Makefile | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/Makefile b/Makefile > index 114c16c..142d467 100644 > --- a/Makefile > +++ b/Makefile > @@ -121,6 +121,10 @@ 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/ubuntu-core-initramfs.img-* $(DESTDIR)/ubuntu-core-initramfs.img > 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 > @@ -167,6 +171,8 @@ install: > cd $(DESTDIR); ln -s kernel.img vmlinuz-$(KVERS) > cd $(DESTDIR); ln -s kernel.img vmlinuz > cd $(DESTDIR); ln -s initrd.img initrd.img-$(KVERS) > + cd $(DESTDIR); ln -s ubuntu-core-initramfs.img ubuntu-core-initramfs.img-$(KVERS) > + if [ -e $(DESTDIR)/kernel.efi ]; then cd $(DESTDIR); ln -s kernel.efi kernel.img-$(KVERS); fi > > version-check: prepare-kernel > { \ > -- Acked-by: Andy Whitcroft <apw@canonical.com> -apw
On 28.11.19 11:33, Dimitri John Ledkov wrote: > If a kernel.efi and standard embeded initrd images are produced by the > initramfs tooling, include it in the snap. > > Previous initramfs-tools-ubuntu-core based initrd.img is still > generated, and made available as well. > > Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com> > --- see below but either way Acked-by: Stefan Bader <stefan.bader@canonical.com> > Makefile | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/Makefile b/Makefile > index 114c16c..142d467 100644 > --- a/Makefile > +++ b/Makefile > @@ -121,6 +121,10 @@ install: > else \ > mv chroot/boot/vmlinu?-* $(DESTDIR)/kernel.img; \ > fi > + if [ -f chroot/boot/kernel.efi-* ]; then \ would ^this be kernel.efi-$(KVERS) and if so, maybe using that would be more robust than the wildcard? > + mv chroot/boot/kernel.efi-* $(DESTDIR)/kernel.efi; \ > + fi > + mv chroot/boot/ubuntu-core-initramfs.img-* $(DESTDIR)/ubuntu-core-initramfs.img > 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 > @@ -167,6 +171,8 @@ install: > cd $(DESTDIR); ln -s kernel.img vmlinuz-$(KVERS) > cd $(DESTDIR); ln -s kernel.img vmlinuz > cd $(DESTDIR); ln -s initrd.img initrd.img-$(KVERS) > + cd $(DESTDIR); ln -s ubuntu-core-initramfs.img ubuntu-core-initramfs.img-$(KVERS) > + if [ -e $(DESTDIR)/kernel.efi ]; then cd $(DESTDIR); ln -s kernel.efi kernel.img-$(KVERS); fi > > version-check: prepare-kernel > { \ >
Applied to master. -apw
diff --git a/Makefile b/Makefile index 114c16c..142d467 100644 --- a/Makefile +++ b/Makefile @@ -121,6 +121,10 @@ 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/ubuntu-core-initramfs.img-* $(DESTDIR)/ubuntu-core-initramfs.img 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 @@ -167,6 +171,8 @@ install: cd $(DESTDIR); ln -s kernel.img vmlinuz-$(KVERS) cd $(DESTDIR); ln -s kernel.img vmlinuz cd $(DESTDIR); ln -s initrd.img initrd.img-$(KVERS) + cd $(DESTDIR); ln -s ubuntu-core-initramfs.img ubuntu-core-initramfs.img-$(KVERS) + if [ -e $(DESTDIR)/kernel.efi ]; then cd $(DESTDIR); ln -s kernel.efi kernel.img-$(KVERS); fi version-check: prepare-kernel { \
If a kernel.efi and standard embeded initrd images are produced by the initramfs tooling, include it in the snap. Previous initramfs-tools-ubuntu-core based initrd.img is still generated, and made available as well. Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com> --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+)