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 <[email protected]>
---
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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#139630):
https://lists.openembedded.org/g/openembedded-core/message/139630
Mute This Topic: https://lists.openembedded.org/mt/74948517/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
