@@ -4,6 +4,8 @@ config BR2_PACKAGE_MENDER_GRUBENV
depends on BR2_PACKAGE_MENDER # runtime
depends on BR2_TARGET_GRUB2
depends on !(BR2_TARGET_GRUB2_HAS_LEGACY_BOOT && BR2_TARGET_GRUB2_HAS_EFI_BOOT)
+ select BR2_PACKAGE_UTIL_LINUX
+ select BR2_PACKAGE_UTIL_LINUX_BINARIES # flock -w
help
Contains the boot scripts and tools used by Mender to
integrate with the GRUB bootloader.
@@ -1,3 +1,3 @@
# Locally computed
-sha256 b7a08eb3d996afb38c1a4f7c51b7eb44aec6197ff713ce75e4f39d5b448cfc82 mender-grubenv-2ac898f5924d5870f8394ad8ecd3ef1ab1422e3b.tar.gz
-sha256 1033348db7606a7e61b6484f293847cf8d7a35766efebb97e304d4bd5d7f3f6b LICENSE
+sha256 0bac59698165a8dafdd282610246addd7bebf41612efa88c77b779f8ffb5ed9d mender-grubenv-38e5043a215f696d126a2d707c9db9aeb93cfb2d.tar.gz
+sha256 d0f406b04e7901e6b4076bdf5fd20f9d7f04fc41681069fd8954413ac6295688 LICENSE
@@ -4,13 +4,13 @@
#
################################################################################
-MENDER_GRUBENV_VERSION = 2ac898f5924d5870f8394ad8ecd3ef1ab1422e3b
+MENDER_GRUBENV_VERSION = 38e5043a215f696d126a2d707c9db9aeb93cfb2d
MENDER_GRUBENV_SITE = $(call github,mendersoftware,grub-mender-grubenv,$(MENDER_GRUBENV_VERSION))
MENDER_GRUBENV_LICENSE = Apache-2.0
MENDER_GRUBENV_LICENSE_FILES = LICENSE
# Grub2 must be built first so this package can overwrite the config files
# provided by grub.
-MENDER_GRUBENV_DEPENDENCIES = grub2
+MENDER_GRUBENV_DEPENDENCIES = grub2 util-linux
MENDER_GRUBENV_MAKE_ENV = \
$(TARGET_CONFIGURE_OPTS) \
@@ -29,14 +29,14 @@ MENDER_GRUBENV_MODULES_MISSING_PC = \
$(filter-out $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES_PC)),\
$(MENDER_GRUBENV_MANDATORY_MODULES))
-MENDER_GRUBENV_MAKE_ENV += BOOT_DIR=/boot/grub
+MENDER_GRUBENV_MAKE_ENV += BOOT_DIR=/boot
define MENDER_GRUBENV_INSTALL_I386_CFG
mkdir -p $(BINARIES_DIR)/boot-part/grub
cp -dpfr $(MENDER_GRUBENV_BUILDDIR)/mender_grub.cfg \
$(TARGET_DIR)/boot/grub/grub.cfg
cp -dpfr $(TARGET_DIR)/boot/grub/grub.cfg \
- $(TARGET_DIR)/boot/grub/grub-mender-grubenv \
+ $(TARGET_DIR)/boot/grub-mender-grubenv \
$(BINARIES_DIR)/boot-part/
endef
MENDER_GRUBENV_TARGET_FINALIZE_HOOKS += MENDER_GRUBENV_INSTALL_I386_CFG
Commit 174bf40fb520893a5ef69ef02c22aa232b56bd67 introduced the usage of `flock -w` to prevent errors during concurrent access of the environment (IE: When a process is editing an env and another is trying to restore it.) As such, mender-grubenv now requires util-linux and the basic binaries set, as the busybox flock does not provide the -w argument. Other changes: - The boot directory is now expected to be /boot instead of /boot/grub - License hash changed for 2023 -> 2024 year date (see commit f54ecfb) Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com> --- package/mender-grubenv/Config.in | 2 ++ package/mender-grubenv/mender-grubenv.hash | 4 ++-- package/mender-grubenv/mender-grubenv.mk | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-)