| Message ID | 20210513020052.2528223-1-aduskett@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | package/mender-grubenv: fix installing on non-efi platforms | expand |
Adam, All, On 2021-05-12 19:00 -0700, Adam Duskett spake thusly: > Currently, mender-grubenv unconditionally installs files from the > $(TARGET_DIR)/boot/EFI directory to the $(BINARIES_DIR)/efi-part. > This fails on systems that are not building grub against EFI. > > Add a check in mender-grubenv.mk to ensure the files are copied to the correct > location if EFI is not selected. > > Signed-off-by: Adam Duskett <aduskett@gmail.com> Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/mender-grubenv/mender-grubenv.mk | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/package/mender-grubenv/mender-grubenv.mk b/package/mender-grubenv/mender-grubenv.mk > index ade0f4c0ed..f06dbbe35c 100644 > --- a/package/mender-grubenv/mender-grubenv.mk > +++ b/package/mender-grubenv/mender-grubenv.mk > @@ -55,11 +55,20 @@ define MENDER_GRUBENV_INSTALL_TARGET_CMDS > endef > > # Overwrite the default grub2 config files with the ones in this package. > +ifeq ($(BR2_TARGET_GRUB2_I386_PC)$(BR2_TARGET_GRUB2_ARM_UBOOT),y) > +define MENDER_GRUBENV_INSTALL_IMAGES_CMDS > + mkdir -p $(BINARIES_DIR)/boot-part/grub > + cp -dpfr $(TARGET_DIR)/boot/grub/grub.cfg \ > + $(TARGET_DIR)/boot/grub/mender_grubenv* \ > + $(BINARIES_DIR)/boot-part/grub > +endef > +else > define MENDER_GRUBENV_INSTALL_IMAGES_CMDS > mkdir -p $(BINARIES_DIR)/efi-part/EFI/BOOT > cp -dpfr $(TARGET_DIR)/boot/EFI/BOOT/grub.cfg \ > $(TARGET_DIR)/boot/EFI/BOOT/mender_grubenv* \ > $(BINARIES_DIR)/efi-part/EFI/BOOT > endef > +endif > > $(eval $(generic-package)) > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
diff --git a/package/mender-grubenv/mender-grubenv.mk b/package/mender-grubenv/mender-grubenv.mk index ade0f4c0ed..f06dbbe35c 100644 --- a/package/mender-grubenv/mender-grubenv.mk +++ b/package/mender-grubenv/mender-grubenv.mk @@ -55,11 +55,20 @@ define MENDER_GRUBENV_INSTALL_TARGET_CMDS endef # Overwrite the default grub2 config files with the ones in this package. +ifeq ($(BR2_TARGET_GRUB2_I386_PC)$(BR2_TARGET_GRUB2_ARM_UBOOT),y) +define MENDER_GRUBENV_INSTALL_IMAGES_CMDS + mkdir -p $(BINARIES_DIR)/boot-part/grub + cp -dpfr $(TARGET_DIR)/boot/grub/grub.cfg \ + $(TARGET_DIR)/boot/grub/mender_grubenv* \ + $(BINARIES_DIR)/boot-part/grub +endef +else define MENDER_GRUBENV_INSTALL_IMAGES_CMDS mkdir -p $(BINARIES_DIR)/efi-part/EFI/BOOT cp -dpfr $(TARGET_DIR)/boot/EFI/BOOT/grub.cfg \ $(TARGET_DIR)/boot/EFI/BOOT/mender_grubenv* \ $(BINARIES_DIR)/efi-part/EFI/BOOT endef +endif $(eval $(generic-package))
Currently, mender-grubenv unconditionally installs files from the $(TARGET_DIR)/boot/EFI directory to the $(BINARIES_DIR)/efi-part. This fails on systems that are not building grub against EFI. Add a check in mender-grubenv.mk to ensure the files are copied to the correct location if EFI is not selected. Signed-off-by: Adam Duskett <aduskett@gmail.com> --- package/mender-grubenv/mender-grubenv.mk | 9 +++++++++ 1 file changed, 9 insertions(+)