[OpenWrt-Devel] Rebasing "Generate EFI grub images for x86 platforms" (resend)

[Philip Prindeville]

Hi all.

I was trying to rebase my branch to upstream/master recently, but I couldn’t because this commit conflicted:

commit 9e3edeb55a2f85ecf6233a5780e495ea1755c998
Author: DUPONCHEEL Sébastien <sebastien.duponcheel at corp.ovh.com>
Date:   Tue Apr 11 12:46:44 2017 +0200

   Generate EFI grub images for x86 platforms

   Signed-off-by: DUPONCHEEL Sébastien <sebastien.duponcheel at corp.ovh.com>

here are the conflicts:

CONFLICT (content): Merge conflict in target/linux/x86/image/Makefile
CONFLICT (content): Merge conflict in package/boot/grub2/common.mk
CONFLICT (content): Merge conflict in config/Config-images.in

It might be related to:

commit 55b808e0c4be681a0aab565d32a70f5af06a1f8a
Author: Tomasz Maciej Nowak <tomek_n at o2.pl>
Date:   Sun Jan 13 21:39:36 2019 +0100

   x86: image: add test module to bootloader

   It was previously added in 546fced, which was part of "intel-microcode:
   load as early as possible" series.
   Unfortunately the conditionals added to GRUB config caused error on boot,
   because on sysupgrade, bootloader is not updated and is left with old
   features/modules. Since this module is needed for early microcode load
   and transition to this needs to be done step by step, enable the test
   module now, so that every newly created image has it already embedded.

   Signed-off-by: Tomasz Maciej Nowak <tomek_n at o2.pl>

or:

commit bb0e4f9fb0c101b86b1a0c2785fec9b38b19fd02
Author: Tomasz Maciej Nowak <tomek_n at o2.pl>
Date:   Sun Jan 13 21:37:47 2019 +0100

   build: remove leftovers from previous x86 commits

   VBoxManage is not used and the image is created with proper permisions:
   0f5d0f6  image: use internal qemu-img for vmdk and vdi images drop host
            dependencies on qemu-utils and VirtualBox

   Unreachable config symbols:
   9e0759e  x86: merge all geode based subtargets into one

   No need to define those symbols since x86_64 is subtarget of x86:
   196fb76  x86: make x86_64 a subtarget instead of a standalone target

   Unreachable config symbols, so remove GRUB_ROOT:
   371b382  x86: remove the xen_domu subtarget

   Signed-off-by: Tomasz Maciej Nowak <tomek_n at o2.pl>


Sebastian or Jo-Philipp: Is there a rebased version of this I can grab?

What’s the state of the EFI changes making it into master, anyway?

I’ve not been able to build an image in 3 months now.

Thanks,

-Philip


_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel