From: "Jacob Kroon" <jacob.kroon@gmail.com>
To: Richard Purdie <richard.purdie@linuxfoundation.org>,
Christopher Clark <christopher.w.clark@gmail.com>,
openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH] grub-efi-native: use RDEPENDS on grub-native instead of duplicating tools
Date: Thu, 18 Jun 2020 10:27:33 +0200 [thread overview]
Message-ID: <a2dcab79-dd9f-168a-c391-07897ad1b556@gmail.com> (raw)
In-Reply-To: <afb6222235af73893eb979a1f486108e902d4eaf.camel@linuxfoundation.org>
On 6/18/20 1:12 AM, Richard Purdie wrote:
> On Wed, 2020-06-17 at 16:07 -0700, Christopher Clark wrote:
>> Both grub-native and grub-efi-native included packaging for the
>> grub-mkimage and grub-editenv tools, which prevented concurrent
>> installation of both the grub-native and grub-efi-native packages.
>> This caused errors on image generation with wic when populating
>> partitions with both legacy and efi boot support, so resolve this by
>> removing the duplicated tools from grub-efi-native and add a
>> runtime dependency from it to grub-native.
>>
>> Signed-off-by: Christopher Clark <christopher.w.clark@gmail.com>
>> ---
>> meta/recipes-bsp/grub/grub-efi_2.04.bb | 5 ++---
>> 1 file changed, 2 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta/recipes-bsp/grub/grub-efi_2.04.bb b/meta/recipes-
>> bsp/grub/grub-efi_2.04.bb
>> index b9d6225d27..ed43dee152 100644
>> --- a/meta/recipes-bsp/grub/grub-efi_2.04.bb
>> +++ b/meta/recipes-bsp/grub/grub-efi_2.04.bb
>> @@ -6,6 +6,7 @@ GRUBPLATFORM = "efi"
>>
>> DEPENDS_append_class-target = " grub-efi-native"
>> RDEPENDS_${PN}_class-target = "grub-common virtual/grub-bootconf"
>> +RDEPENDS_${PN}_class-native = "grub-native"
>>
>> SRC_URI += " \
>> file://cfg \
>> @@ -61,9 +62,7 @@ do_install_append_class-target() {
>> }
>>
>> do_install_class-native() {
>> - install -d ${D}${bindir}
>> - install -m 755 grub-mkimage ${D}${bindir}
>> - install -m 755 grub-editenv ${D}${bindir}
>> + :
>> }
>>
>> do_install_class-target() {
>
> I think we want to PROVIDES_append_class-native = " grub-efi-native" in
> grub and then drop the BBCLASSEXTEND from grub-efi?
>
Just for the record, I tested building grub-native (x86-64) both with
platform "pc" and "efi", and in the same build directory, and all tools
in ${bindir} were binary identical. Asking in #grub on freenode also
confirmed this, apparently Debian packaging also assumes this.
So no grub-efi-native required, and we can remove that
_class_target/_class_native special handling as well.
Jacob
next prev parent reply other threads:[~2020-06-18 8:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-17 23:07 [PATCH] grub-efi-native: use RDEPENDS on grub-native instead of duplicating tools Christopher Clark
2020-06-17 23:12 ` [OE-core] " Richard Purdie
2020-06-18 8:27 ` Jacob Kroon [this message]
2020-06-18 21:58 ` Christopher Clark
2020-06-19 19:35 ` Jacob Kroon
2020-06-19 23:03 ` Christopher Clark
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=a2dcab79-dd9f-168a-c391-07897ad1b556@gmail.com \
--to=jacob.kroon@gmail.com \
--cc=christopher.w.clark@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=richard.purdie@linuxfoundation.org \
/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