From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Peter Korsgaard <peter@korsgaard.com>
Cc: "Köry Maincent" <kory.maincent@bootlin.com>,
"Adam Duskett" <aduskett@gmail.com>,
buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH 3/3] package/mender-grubenv: fix grub module checks
Date: Sat, 4 Dec 2021 23:55:16 +0100 [thread overview]
Message-ID: <20211204225516.GI472627@scaer> (raw)
In-Reply-To: <87czmcatdd.fsf@dell.be.48ers.dk>
Peter, All,
On 2021-12-04 23:38 +0100, Peter Korsgaard spake thusly:
> >>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:
> >>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
> >> From: Adam Duskett <aduskett@gmail.com>
> >> Commit b68810e70cbd (boot/grub2: add support to build multiple Grub2
> >> configurations in the same build) broke mender-grubenv by splititng up
> >> BR2_TARGET_GRUB2_BUILTIN_MODULES into two separate symbols, one for
> >> legacy boot and one for EFI boot.
>
> >> +++ b/package/mender-grubenv/mender-grubenv.mk
> >> @@ -13,7 +13,7 @@ MENDER_GRUBENV_LICENSE_FILES = LICENSE
> >> MENDER_GRUBENV_DEPENDENCIES = grub2
> >> MENDER_GRUBENV_INSTALL_IMAGES = YES
>
> >> -ifeq ($(BR2_TARGET_GRUB2_I386_PC)$(BR2_TARGET_GRUB2_ARM_UBOOT),y)
> >> +ifeq ($(BR2_TARGET_GRUB_LEGACY)$(BR2_TARGET_GRUB2_ARM_UBOOT),y)
> >> MENDER_GRUBENV_ENV_DIR = /boot/grub
>
> > Should this not be BR2_TARGET_GRUB2_HAS_LEGACY_BOOT?
Gah. This is a place I forgot to fix after I renamed the variables.
> In fact, what seems to have been committed is:
> ifeq ($(BR2_TARGET_GRUB_LEGACY),y)
> What happened to the _ARM_UBOOT part?
The _ARM_UBOOT is implied because it selects _HAS_LEGACY_BOOT:
https://git.buildroot.org/buildroot/tree/boot/grub2/Config.in#n73
config BR2_TARGET_GRUB2_ARM_UBOOT
bool "arm-uboot"
depends on BR2_arm
select BR2_TARGET_GRUB2_HAS_LEGACY_BOOT
I'll apply a fixup commit, sorry for the mess... :-/
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next prev parent reply other threads:[~2021-12-04 22:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-03 23:17 [Buildroot] [PATCH 0/3] package/mender-grubenv: fix breakage after grub2 rework (branch yem/mender-grubenv) Yann E. MORIN
2021-12-03 23:17 ` [Buildroot] [PATCH 1/3] boot/grub2/Config.in: add symbols to represent legacy and EFI boot Yann E. MORIN
2021-12-03 23:17 ` [Buildroot] [PATCH 2/3] package/mender-grubenv: fix modules list help and variable Yann E. MORIN
2021-12-03 23:17 ` [Buildroot] [PATCH 3/3] package/mender-grubenv: fix grub module checks Yann E. MORIN
2021-12-04 9:17 ` Yann E. MORIN
2021-12-04 22:36 ` Peter Korsgaard
2021-12-04 22:38 ` Peter Korsgaard
2021-12-04 22:55 ` Yann E. MORIN [this message]
2021-12-04 17:25 ` [Buildroot] [PATCH 0/3] package/mender-grubenv: fix breakage after grub2 rework (branch yem/mender-grubenv) Yann E. MORIN
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=20211204225516.GI472627@scaer \
--to=yann.morin.1998@free.fr \
--cc=aduskett@gmail.com \
--cc=buildroot@buildroot.org \
--cc=kory.maincent@bootlin.com \
--cc=peter@korsgaard.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox