425f79087a
mender-grubenv currently has 3 problems that prevent an x86_64-efi image from successfully being made with the genimage.sh script. - mender-grubenv does not currently depend on Grub2. While Grub2 is not needed to build the mender-grubenv package, Grub2 needs to be built first for mender-grubenv to overwrite the default Grub2 files reliably. - The MENDER_GRUBENV_ENV_DIR variable points to /boot/efi/EFI/BOOT instead of /boot/EFI/BOOT, which is where the Grub2 package installs the default files. This variable now points to the correct location. - The Grub2 package installs images to $(BINARIES_DIR)/efi-part, which the mender-grubenv package currently does not do. As such; the default Grub2 configuration file is used instead of the one provided by mender-grubenv. Adding a MENDER_GRUBENV_INSTALL_IMAGES_CMDS define in mender-grubenv.mk which copies the installed files from $(TARGET_DIR)/boot/EFI to $(BINARIES_DIR)/efi-part fixes this issue. Signed-off-by: Adam Duskett <aduskett@greenlots.com> [Thomas: - drop "runtime" on the depends on BR2_TARGET_GRUB2 since we now have a build-time dependency on it - explicitly copy the files installed by mender-grubenv in MENDER_GRUBENV_INSTALL_IMAGES_CMDS instead of blindly copying everything that is in $(TARGET_DIR)/boot/EFI] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
44 lines
1.3 KiB
Plaintext
44 lines
1.3 KiB
Plaintext
config BR2_PACKAGE_MENDER_GRUBENV
|
|
bool "mender-grubenv"
|
|
depends on BR2_TARGET_GRUB2_ARCH_SUPPORTS
|
|
depends on BR2_PACKAGE_MENDER # runtime
|
|
# grubenv provides it's own fw_printenv.
|
|
depends on !BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV
|
|
depends on BR2_TARGET_GRUB2
|
|
help
|
|
Contains the boot scripts and tools used by Mender to
|
|
integrate with the GRUB bootloader.
|
|
|
|
The following Grub modules must be selected for this package:
|
|
loadenv hashsum echo halt gcry_sha256 test
|
|
|
|
https://github.com/mendersoftware/grub-mender-grubenv
|
|
|
|
if BR2_PACKAGE_MENDER_GRUBENV
|
|
|
|
config BR2_PACKAGE_MENDER_GRUBENV_DEFINES
|
|
string "path to grubenv defines"
|
|
help
|
|
Specify a path to the mender grubenv defines file.
|
|
If no path is specified, the example file in the source
|
|
directory will be used.
|
|
|
|
The example file in the source directory sets the following:
|
|
mender_rootfsa_part=2
|
|
mender_rootfsb_part=3
|
|
mender_kernel_root_base=/dev/mmcblk0p
|
|
mender_grub_storage_device=hd0
|
|
kernel_imagetype=bzImage
|
|
|
|
endif
|
|
|
|
comment "mender-grubenv needs a grub2 bootloader"
|
|
depends on BR2_TARGET_GRUB2_ARCH_SUPPORTS
|
|
depends on BR2_PACKAGE_MENDER
|
|
depends on !BR2_TARGET_GRUB2
|
|
|
|
comment "mender-grubenv does not work with uboot-tools fw_printenv"
|
|
depends on BR2_TARGET_GRUB2_ARCH_SUPPORTS
|
|
depends on BR2_PACKAGE_MENDER
|
|
depends on BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV
|