NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9849fa0101
kumquat-buildroot/package/mender-grubenv/mender-grubenv.mk

87 lines
2.8 KiB
Makefile
Raw Normal View History

mender-grubenv: new package Mender-grubenv contains the boot scripts and tools used by Mender to integrate with the Grub2 bootloader. The user must select the following Grub modules for this package: loadenv, hashsum, echo, halt, gcry_sha256, and test. Because this patch also includes a grub version of fw_printenv and fw_setenv, package/mender/Config.in must be changed as well at the same time, because if both uboot-tools and this package are selected, during startup, mender calls the uboot-tools version of fw_printenv and fails to start. Signed-off-by: Adam Duskett <Aduskett@gmail.com> Tested-by: Mirza Krak <mirza.krak@northern.tech> Acked-by: Mirza Krak <mirza.krak@northern.tech> [Arnout: - reorder depends clauses; - add runtime tag to grub2 dependency - remove wchar dependency from comment - only error if BR_BUILDING - use install instead of cp for a single file.] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2019-06-06 17:52:15 +02:00
################################################################################
#
# mender-grubenv
#
################################################################################
package/mender-grubenv: bump to version 1a7db967495bbe8be53b7a69dcb42822f39d9a74 Other changes: - Drop depends on !BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV as mender-grubenv no longer uses fw_printenv and fw_setenv and instead provides grub-mender-grubenv-print and grub-mender-grubenv-set - Update the LICENSE hash as the year has changed. Signed-off-by: Adam Duskett <aduskett@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2021-11-03 20:55:20 +01:00
MENDER_GRUBENV_VERSION = 1a7db967495bbe8be53b7a69dcb42822f39d9a74
mender-grubenv: new package Mender-grubenv contains the boot scripts and tools used by Mender to integrate with the Grub2 bootloader. The user must select the following Grub modules for this package: loadenv, hashsum, echo, halt, gcry_sha256, and test. Because this patch also includes a grub version of fw_printenv and fw_setenv, package/mender/Config.in must be changed as well at the same time, because if both uboot-tools and this package are selected, during startup, mender calls the uboot-tools version of fw_printenv and fails to start. Signed-off-by: Adam Duskett <Aduskett@gmail.com> Tested-by: Mirza Krak <mirza.krak@northern.tech> Acked-by: Mirza Krak <mirza.krak@northern.tech> [Arnout: - reorder depends clauses; - add runtime tag to grub2 dependency - remove wchar dependency from comment - only error if BR_BUILDING - use install instead of cp for a single file.] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2019-06-06 17:52:15 +02:00
MENDER_GRUBENV_SITE = $(call github,mendersoftware,grub-mender-grubenv,$(MENDER_GRUBENV_VERSION))
MENDER_GRUBENV_LICENSE = Apache-2.0
MENDER_GRUBENV_LICENSE_FILES = LICENSE
package/mender-grubenv: fix installation with genimage.sh script 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>
2019-09-03 00:34:41 +02:00
# Grub2 must be built first so this package can overwrite the config files
# provided by grub.
MENDER_GRUBENV_DEPENDENCIES = grub2
MENDER_GRUBENV_INSTALL_IMAGES = YES
mender-grubenv: new package Mender-grubenv contains the boot scripts and tools used by Mender to integrate with the Grub2 bootloader. The user must select the following Grub modules for this package: loadenv, hashsum, echo, halt, gcry_sha256, and test. Because this patch also includes a grub version of fw_printenv and fw_setenv, package/mender/Config.in must be changed as well at the same time, because if both uboot-tools and this package are selected, during startup, mender calls the uboot-tools version of fw_printenv and fails to start. Signed-off-by: Adam Duskett <Aduskett@gmail.com> Tested-by: Mirza Krak <mirza.krak@northern.tech> Acked-by: Mirza Krak <mirza.krak@northern.tech> [Arnout: - reorder depends clauses; - add runtime tag to grub2 dependency - remove wchar dependency from comment - only error if BR_BUILDING - use install instead of cp for a single file.] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2019-06-06 17:52:15 +02:00
MENDER_GRUBENV_MAKE_ENV = \
$(TARGET_CONFIGURE_OPTS) \
package/mender-grubenv: fix install for legacy BIOS or ARM U-Boot Some last-minute changes were made when applying commits 7a68960b682c0 (boot/grub2/Config.in: add symbols to represent legacy and EFI boot) and 4d5b209384e0 (package/mender-grubenv: fix grub module checks), and the renaming of the BR2_TARGET_GRUB_LEGACY was not fully propagated. This caused the path to the boot files to always be interpreted as being the EFI one, and never the legacy one. In practice, that was not causing any build failure, because the path was passed at build-time to mender-grubenv, that would use it as the location where to install its files, and finally as the location where our image-isntall commands would look for them. Still this is incorrect because it would not match where grub2 would eventually end up lookig for its files at runtime... To avoid further issue, drop the conditional block dedicated to setting the path to the boot files, drop the intermediate variable, and move setting the environment variable down into the existing conditional block. We do drop the intermediate variable, because there is no longer any genericity needed: the installation commands are already duplicated for the two cases anyway. Reported-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Adam Duskett <aduskett@gmail.com> Cc: Köry Maincent <kory.maincent@bootlin.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2021-12-05 00:13:25 +01:00
$(TARGET_MAKE_ENV)
mender-grubenv: new package Mender-grubenv contains the boot scripts and tools used by Mender to integrate with the Grub2 bootloader. The user must select the following Grub modules for this package: loadenv, hashsum, echo, halt, gcry_sha256, and test. Because this patch also includes a grub version of fw_printenv and fw_setenv, package/mender/Config.in must be changed as well at the same time, because if both uboot-tools and this package are selected, during startup, mender calls the uboot-tools version of fw_printenv and fails to start. Signed-off-by: Adam Duskett <Aduskett@gmail.com> Tested-by: Mirza Krak <mirza.krak@northern.tech> Acked-by: Mirza Krak <mirza.krak@northern.tech> [Arnout: - reorder depends clauses; - add runtime tag to grub2 dependency - remove wchar dependency from comment - only error if BR_BUILDING - use install instead of cp for a single file.] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2019-06-06 17:52:15 +02:00
MENDER_GRUBENV_DEFINES = \
$(or $(call qstrip,$(BR2_PACKAGE_MENDER_GRUBENV_DEFINES)),\
$(@D)/mender_grubenv_defines.example)
# These grub modules must be built in for the grub scripts to work properly.
# Without them, the system will not boot.
package/mender-grubenv: fix modules list help and variable The help was missing the regexp module. The variable assignment was missing spaces around the equal sign. Signed-off-by: Adam Duskett <aduskett@gmail.com> [yann.morin.1998@free.fr: split to its own patch, fix assignment too] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Köry Maincent <kory.maincent@bootlin.com>
2021-12-03 23:58:04 +01:00
MENDER_GRUBENV_MANDATORY_MODULES = loadenv hashsum echo halt gcry_sha256 test regexp
package/mender-grubenv: fix grub module checks 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. This change causes a systematic build failure now, as the legacy variable BR2_TARGET_GRUB2_BUILTIN_MODULES is now always empty (during build). We fix that by supplicating the missing modules to check: one for EFI and one for legacy boot. The EFI check is tricky: Indeed, there can be more than one EFI platform enabled simultaneously; indeed, on x86_64, we can have both the 32-bit and 64-bit EFI platforms enabled. So the check is inverted, and we check that no platform is not enabled (yeah, double negation). For consistency, we do the same for the legacy boot, even though in that case, there can only ever be only one enabled at once at most. Furthermore, mender-grubenv does not support multiple installations of grub concurrently; it can only be installed for either legacy or EFI, not both at the same time: /etc/mender-grubenv.cfg, its configuration file, can only contain settings for one or the other, not both. So we add a new check to Config.in to support only one grub installation type at a time. Signed-off-by: Adam Duskett <aduskett@gmail.com> [yann.morin.1998@free.fr: - drop superfluous check on empty modules lists - move EFI and legacy commands under same condition as checks - variables were renamed - misc eye-candy ] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Köry Maincent <kory.maincent@bootlin.com>
2021-12-03 19:51:06 +01:00
ifeq ($(BR2_TARGET_GRUB2_HAS_LEGACY_BOOT),y)
MENDER_GRUBENV_MODULES_MISSING_PC = \
$(filter-out $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES_PC)),\
$(MENDER_GRUBENV_MANDATORY_MODULES))
package/mender-grubenv: fix install for legacy BIOS or ARM U-Boot Some last-minute changes were made when applying commits 7a68960b682c0 (boot/grub2/Config.in: add symbols to represent legacy and EFI boot) and 4d5b209384e0 (package/mender-grubenv: fix grub module checks), and the renaming of the BR2_TARGET_GRUB_LEGACY was not fully propagated. This caused the path to the boot files to always be interpreted as being the EFI one, and never the legacy one. In practice, that was not causing any build failure, because the path was passed at build-time to mender-grubenv, that would use it as the location where to install its files, and finally as the location where our image-isntall commands would look for them. Still this is incorrect because it would not match where grub2 would eventually end up lookig for its files at runtime... To avoid further issue, drop the conditional block dedicated to setting the path to the boot files, drop the intermediate variable, and move setting the environment variable down into the existing conditional block. We do drop the intermediate variable, because there is no longer any genericity needed: the installation commands are already duplicated for the two cases anyway. Reported-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Adam Duskett <aduskett@gmail.com> Cc: Köry Maincent <kory.maincent@bootlin.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2021-12-05 00:13:25 +01:00
MENDER_GRUBENV_MAKE_ENV += ENV_DIR=/boot/grub
package/mender-grubenv: fix grub module checks 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. This change causes a systematic build failure now, as the legacy variable BR2_TARGET_GRUB2_BUILTIN_MODULES is now always empty (during build). We fix that by supplicating the missing modules to check: one for EFI and one for legacy boot. The EFI check is tricky: Indeed, there can be more than one EFI platform enabled simultaneously; indeed, on x86_64, we can have both the 32-bit and 64-bit EFI platforms enabled. So the check is inverted, and we check that no platform is not enabled (yeah, double negation). For consistency, we do the same for the legacy boot, even though in that case, there can only ever be only one enabled at once at most. Furthermore, mender-grubenv does not support multiple installations of grub concurrently; it can only be installed for either legacy or EFI, not both at the same time: /etc/mender-grubenv.cfg, its configuration file, can only contain settings for one or the other, not both. So we add a new check to Config.in to support only one grub installation type at a time. Signed-off-by: Adam Duskett <aduskett@gmail.com> [yann.morin.1998@free.fr: - drop superfluous check on empty modules lists - move EFI and legacy commands under same condition as checks - variables were renamed - misc eye-candy ] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Köry Maincent <kory.maincent@bootlin.com>
2021-12-03 19:51:06 +01:00
define MENDER_GRUBENV_INSTALL_I386_CFG
mkdir -p $(BINARIES_DIR)/boot-part/grub
package/mender-grubenv: fix install for legacy BIOS or ARM U-Boot Some last-minute changes were made when applying commits 7a68960b682c0 (boot/grub2/Config.in: add symbols to represent legacy and EFI boot) and 4d5b209384e0 (package/mender-grubenv: fix grub module checks), and the renaming of the BR2_TARGET_GRUB_LEGACY was not fully propagated. This caused the path to the boot files to always be interpreted as being the EFI one, and never the legacy one. In practice, that was not causing any build failure, because the path was passed at build-time to mender-grubenv, that would use it as the location where to install its files, and finally as the location where our image-isntall commands would look for them. Still this is incorrect because it would not match where grub2 would eventually end up lookig for its files at runtime... To avoid further issue, drop the conditional block dedicated to setting the path to the boot files, drop the intermediate variable, and move setting the environment variable down into the existing conditional block. We do drop the intermediate variable, because there is no longer any genericity needed: the installation commands are already duplicated for the two cases anyway. Reported-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Adam Duskett <aduskett@gmail.com> Cc: Köry Maincent <kory.maincent@bootlin.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2021-12-05 00:13:25 +01:00
cp -dpfr $(TARGET_DIR)/boot/grub/grub.cfg \
$(TARGET_DIR)/boot/grub/mender_grubenv* \
package/mender-grubenv: fix grub module checks 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. This change causes a systematic build failure now, as the legacy variable BR2_TARGET_GRUB2_BUILTIN_MODULES is now always empty (during build). We fix that by supplicating the missing modules to check: one for EFI and one for legacy boot. The EFI check is tricky: Indeed, there can be more than one EFI platform enabled simultaneously; indeed, on x86_64, we can have both the 32-bit and 64-bit EFI platforms enabled. So the check is inverted, and we check that no platform is not enabled (yeah, double negation). For consistency, we do the same for the legacy boot, even though in that case, there can only ever be only one enabled at once at most. Furthermore, mender-grubenv does not support multiple installations of grub concurrently; it can only be installed for either legacy or EFI, not both at the same time: /etc/mender-grubenv.cfg, its configuration file, can only contain settings for one or the other, not both. So we add a new check to Config.in to support only one grub installation type at a time. Signed-off-by: Adam Duskett <aduskett@gmail.com> [yann.morin.1998@free.fr: - drop superfluous check on empty modules lists - move EFI and legacy commands under same condition as checks - variables were renamed - misc eye-candy ] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Köry Maincent <kory.maincent@bootlin.com>
2021-12-03 19:51:06 +01:00
$(BINARIES_DIR)/boot-part/grub
endef
endif # BR2_TARGET_GRUB2_HAS_LEGACY_BOOT
ifeq ($(BR2_TARGET_GRUB2_HAS_EFI_BOOT),y)
MENDER_GRUBENV_MODULES_MISSING_EFI = \
$(filter-out $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI)),\
mender-grubenv: new package Mender-grubenv contains the boot scripts and tools used by Mender to integrate with the Grub2 bootloader. The user must select the following Grub modules for this package: loadenv, hashsum, echo, halt, gcry_sha256, and test. Because this patch also includes a grub version of fw_printenv and fw_setenv, package/mender/Config.in must be changed as well at the same time, because if both uboot-tools and this package are selected, during startup, mender calls the uboot-tools version of fw_printenv and fails to start. Signed-off-by: Adam Duskett <Aduskett@gmail.com> Tested-by: Mirza Krak <mirza.krak@northern.tech> Acked-by: Mirza Krak <mirza.krak@northern.tech> [Arnout: - reorder depends clauses; - add runtime tag to grub2 dependency - remove wchar dependency from comment - only error if BR_BUILDING - use install instead of cp for a single file.] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2019-06-06 17:52:15 +02:00
$(MENDER_GRUBENV_MANDATORY_MODULES))
package/mender-grubenv: fix install for legacy BIOS or ARM U-Boot Some last-minute changes were made when applying commits 7a68960b682c0 (boot/grub2/Config.in: add symbols to represent legacy and EFI boot) and 4d5b209384e0 (package/mender-grubenv: fix grub module checks), and the renaming of the BR2_TARGET_GRUB_LEGACY was not fully propagated. This caused the path to the boot files to always be interpreted as being the EFI one, and never the legacy one. In practice, that was not causing any build failure, because the path was passed at build-time to mender-grubenv, that would use it as the location where to install its files, and finally as the location where our image-isntall commands would look for them. Still this is incorrect because it would not match where grub2 would eventually end up lookig for its files at runtime... To avoid further issue, drop the conditional block dedicated to setting the path to the boot files, drop the intermediate variable, and move setting the environment variable down into the existing conditional block. We do drop the intermediate variable, because there is no longer any genericity needed: the installation commands are already duplicated for the two cases anyway. Reported-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Adam Duskett <aduskett@gmail.com> Cc: Köry Maincent <kory.maincent@bootlin.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2021-12-05 00:13:25 +01:00
MENDER_GRUBENV_MAKE_ENV += ENV_DIR=/boot/EFI/BOOT
package/mender-grubenv: fix grub module checks 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. This change causes a systematic build failure now, as the legacy variable BR2_TARGET_GRUB2_BUILTIN_MODULES is now always empty (during build). We fix that by supplicating the missing modules to check: one for EFI and one for legacy boot. The EFI check is tricky: Indeed, there can be more than one EFI platform enabled simultaneously; indeed, on x86_64, we can have both the 32-bit and 64-bit EFI platforms enabled. So the check is inverted, and we check that no platform is not enabled (yeah, double negation). For consistency, we do the same for the legacy boot, even though in that case, there can only ever be only one enabled at once at most. Furthermore, mender-grubenv does not support multiple installations of grub concurrently; it can only be installed for either legacy or EFI, not both at the same time: /etc/mender-grubenv.cfg, its configuration file, can only contain settings for one or the other, not both. So we add a new check to Config.in to support only one grub installation type at a time. Signed-off-by: Adam Duskett <aduskett@gmail.com> [yann.morin.1998@free.fr: - drop superfluous check on empty modules lists - move EFI and legacy commands under same condition as checks - variables were renamed - misc eye-candy ] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Köry Maincent <kory.maincent@bootlin.com>
2021-12-03 19:51:06 +01:00
define MENDER_GRUBENV_INSTALL_EFI_CFG
mkdir -p $(BINARIES_DIR)/efi-part/EFI/BOOT
package/mender-grubenv: fix install for legacy BIOS or ARM U-Boot Some last-minute changes were made when applying commits 7a68960b682c0 (boot/grub2/Config.in: add symbols to represent legacy and EFI boot) and 4d5b209384e0 (package/mender-grubenv: fix grub module checks), and the renaming of the BR2_TARGET_GRUB_LEGACY was not fully propagated. This caused the path to the boot files to always be interpreted as being the EFI one, and never the legacy one. In practice, that was not causing any build failure, because the path was passed at build-time to mender-grubenv, that would use it as the location where to install its files, and finally as the location where our image-isntall commands would look for them. Still this is incorrect because it would not match where grub2 would eventually end up lookig for its files at runtime... To avoid further issue, drop the conditional block dedicated to setting the path to the boot files, drop the intermediate variable, and move setting the environment variable down into the existing conditional block. We do drop the intermediate variable, because there is no longer any genericity needed: the installation commands are already duplicated for the two cases anyway. Reported-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Adam Duskett <aduskett@gmail.com> Cc: Köry Maincent <kory.maincent@bootlin.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2021-12-05 00:13:25 +01:00
cp -dpfr $(TARGET_DIR)/boot/EFI/BOOT/grub.cfg \
$(TARGET_DIR)/boot/EFI/BOOT/mender_grubenv* \
package/mender-grubenv: fix grub module checks 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. This change causes a systematic build failure now, as the legacy variable BR2_TARGET_GRUB2_BUILTIN_MODULES is now always empty (during build). We fix that by supplicating the missing modules to check: one for EFI and one for legacy boot. The EFI check is tricky: Indeed, there can be more than one EFI platform enabled simultaneously; indeed, on x86_64, we can have both the 32-bit and 64-bit EFI platforms enabled. So the check is inverted, and we check that no platform is not enabled (yeah, double negation). For consistency, we do the same for the legacy boot, even though in that case, there can only ever be only one enabled at once at most. Furthermore, mender-grubenv does not support multiple installations of grub concurrently; it can only be installed for either legacy or EFI, not both at the same time: /etc/mender-grubenv.cfg, its configuration file, can only contain settings for one or the other, not both. So we add a new check to Config.in to support only one grub installation type at a time. Signed-off-by: Adam Duskett <aduskett@gmail.com> [yann.morin.1998@free.fr: - drop superfluous check on empty modules lists - move EFI and legacy commands under same condition as checks - variables were renamed - misc eye-candy ] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Köry Maincent <kory.maincent@bootlin.com>
2021-12-03 19:51:06 +01:00
$(BINARIES_DIR)/efi-part/EFI/BOOT
endef
endif # BR2_TARGET_GRUB2_HAS_EFI_BOOT
mender-grubenv: new package Mender-grubenv contains the boot scripts and tools used by Mender to integrate with the Grub2 bootloader. The user must select the following Grub modules for this package: loadenv, hashsum, echo, halt, gcry_sha256, and test. Because this patch also includes a grub version of fw_printenv and fw_setenv, package/mender/Config.in must be changed as well at the same time, because if both uboot-tools and this package are selected, during startup, mender calls the uboot-tools version of fw_printenv and fails to start. Signed-off-by: Adam Duskett <Aduskett@gmail.com> Tested-by: Mirza Krak <mirza.krak@northern.tech> Acked-by: Mirza Krak <mirza.krak@northern.tech> [Arnout: - reorder depends clauses; - add runtime tag to grub2 dependency - remove wchar dependency from comment - only error if BR_BUILDING - use install instead of cp for a single file.] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2019-06-06 17:52:15 +02:00
ifeq ($(BR2_PACKAGE_MENDER_GRUBENV)$(BR_BUILDING),yy)
package/mender-grubenv: fix grub module checks 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. This change causes a systematic build failure now, as the legacy variable BR2_TARGET_GRUB2_BUILTIN_MODULES is now always empty (during build). We fix that by supplicating the missing modules to check: one for EFI and one for legacy boot. The EFI check is tricky: Indeed, there can be more than one EFI platform enabled simultaneously; indeed, on x86_64, we can have both the 32-bit and 64-bit EFI platforms enabled. So the check is inverted, and we check that no platform is not enabled (yeah, double negation). For consistency, we do the same for the legacy boot, even though in that case, there can only ever be only one enabled at once at most. Furthermore, mender-grubenv does not support multiple installations of grub concurrently; it can only be installed for either legacy or EFI, not both at the same time: /etc/mender-grubenv.cfg, its configuration file, can only contain settings for one or the other, not both. So we add a new check to Config.in to support only one grub installation type at a time. Signed-off-by: Adam Duskett <aduskett@gmail.com> [yann.morin.1998@free.fr: - drop superfluous check on empty modules lists - move EFI and legacy commands under same condition as checks - variables were renamed - misc eye-candy ] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Köry Maincent <kory.maincent@bootlin.com>
2021-12-03 19:51:06 +01:00
ifneq ($(MENDER_GRUBENV_MODULES_MISSING_EFI),)
$(error The following missing grub2 efi modules must be enabled for mender-grubenv \
to work: $(MENDER_GRUBENV_MODULES_MISSING_EFI))
endif
ifneq ($(MENDER_GRUBENV_MODULES_MISSING_PC),)
$(error The following missing grub2 pc modules must be enabled for mender-grubenv \
to work: $(MENDER_GRUBENV_MODULES_MISSING_PC))
mender-grubenv: new package Mender-grubenv contains the boot scripts and tools used by Mender to integrate with the Grub2 bootloader. The user must select the following Grub modules for this package: loadenv, hashsum, echo, halt, gcry_sha256, and test. Because this patch also includes a grub version of fw_printenv and fw_setenv, package/mender/Config.in must be changed as well at the same time, because if both uboot-tools and this package are selected, during startup, mender calls the uboot-tools version of fw_printenv and fails to start. Signed-off-by: Adam Duskett <Aduskett@gmail.com> Tested-by: Mirza Krak <mirza.krak@northern.tech> Acked-by: Mirza Krak <mirza.krak@northern.tech> [Arnout: - reorder depends clauses; - add runtime tag to grub2 dependency - remove wchar dependency from comment - only error if BR_BUILDING - use install instead of cp for a single file.] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2019-06-06 17:52:15 +02:00
endif
endif
define MENDER_GRUBENV_CONFIGURE_CMDS
$(INSTALL) -m 0644 $(MENDER_GRUBENV_DEFINES) $(@D)/mender_grubenv_defines
endef
define MENDER_GRUBENV_BUILD_CMDS
$(MENDER_GRUBENV_MAKE_ENV) $(MAKE) -C $(@D)
endef
define MENDER_GRUBENV_INSTALL_TARGET_CMDS
$(MENDER_GRUBENV_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
endef
package/mender-grubenv: fix installation with genimage.sh script 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>
2019-09-03 00:34:41 +02:00
define MENDER_GRUBENV_INSTALL_IMAGES_CMDS
package/mender-grubenv: fix grub module checks 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. This change causes a systematic build failure now, as the legacy variable BR2_TARGET_GRUB2_BUILTIN_MODULES is now always empty (during build). We fix that by supplicating the missing modules to check: one for EFI and one for legacy boot. The EFI check is tricky: Indeed, there can be more than one EFI platform enabled simultaneously; indeed, on x86_64, we can have both the 32-bit and 64-bit EFI platforms enabled. So the check is inverted, and we check that no platform is not enabled (yeah, double negation). For consistency, we do the same for the legacy boot, even though in that case, there can only ever be only one enabled at once at most. Furthermore, mender-grubenv does not support multiple installations of grub concurrently; it can only be installed for either legacy or EFI, not both at the same time: /etc/mender-grubenv.cfg, its configuration file, can only contain settings for one or the other, not both. So we add a new check to Config.in to support only one grub installation type at a time. Signed-off-by: Adam Duskett <aduskett@gmail.com> [yann.morin.1998@free.fr: - drop superfluous check on empty modules lists - move EFI and legacy commands under same condition as checks - variables were renamed - misc eye-candy ] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Köry Maincent <kory.maincent@bootlin.com>
2021-12-03 19:51:06 +01:00
$(MENDER_GRUBENV_INSTALL_I386_CFG)
$(MENDER_GRUBENV_INSTALL_EFI_CFG)
package/mender-grubenv: fix installation with genimage.sh script 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>
2019-09-03 00:34:41 +02:00
endef
mender-grubenv: new package Mender-grubenv contains the boot scripts and tools used by Mender to integrate with the Grub2 bootloader. The user must select the following Grub modules for this package: loadenv, hashsum, echo, halt, gcry_sha256, and test. Because this patch also includes a grub version of fw_printenv and fw_setenv, package/mender/Config.in must be changed as well at the same time, because if both uboot-tools and this package are selected, during startup, mender calls the uboot-tools version of fw_printenv and fails to start. Signed-off-by: Adam Duskett <Aduskett@gmail.com> Tested-by: Mirza Krak <mirza.krak@northern.tech> Acked-by: Mirza Krak <mirza.krak@northern.tech> [Arnout: - reorder depends clauses; - add runtime tag to grub2 dependency - remove wchar dependency from comment - only error if BR_BUILDING - use install instead of cp for a single file.] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2019-06-06 17:52:15 +02:00
$(eval $(generic-package))
Reference in New Issue Copy Permalink