From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] package/mender-grubenv: fix installing on non-efi platforms
Date: Sat, 15 May 2021 14:54:38 +0200 [thread overview]
Message-ID: <20210515125438.GL2506@scaer> (raw)
In-Reply-To: <20210513020052.2528223-1-aduskett@gmail.com>
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 at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
prev parent reply other threads:[~2021-05-15 12:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-13 2:00 [Buildroot] [PATCH] package/mender-grubenv: fix installing on non-efi platforms Adam Duskett
2021-05-15 12:54 ` Yann E. MORIN [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210515125438.GL2506@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.