mender-grubenv: new package
PATCH v3 1/1 mender-grubenv: new package
From: Adam Duskett <[email protected]>
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.
---
Changes v1 -> v2:
package/meson/Config.in:
- Remove select BR2_PACKAGE_MENDER_GRUBENV if BR2_TARGET_GRUB2 from package/mender/Config.in, and instead just change the uboot lines to conditionals.
- package/meson-grubenv/Config.in:
- Remove depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS (Arnout)
- Add depends on BR2_PACKAGE_MENDER # runtime. (Arnout)
- Add depends on !BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV
- Remove default string of package/mender-grubenv/mender_grubenv_defines (Arnout)
- Add a more comprehensive help message for the BR2_PACKAGE_MENDER_GRUBENV_DEFINES option.
- Add a new comment explaining that mender-grubenv does not work with uboot-tools fw_printenv.
- package/meson-grubenv/meson-grubenv.mk:
- Use the github helper for the URL. (Arnout)
- Change Apache2.0 to Apache-2.0.
- Remove the MENDER_GRUBENV_SOURCE variable.
- Add a MENDER_GRUBENV_MAKE_ENV variable. (Arnout)
- Add a check for the MENDER_GRUBENV_DEFINES variable to see if the BR2_PACKAGE_MENDER_GRUBENV_DEFINES variable is blank, and if so set the variable to $(@D)/mender_grubenv_defines.example. (Thanks Yann.)
- Print only the missing grub modules. (Arnout)
- Move the copying of MENDER_GRUBENV_DEFINES to the configure step. (Arnout)
- Use MENDER_GRUBENV_MAKE_ENV during the build and install steps. (Arnout)
- package/meson-grubenv/meson-grubenv.hash:
- Use mender-grubenv-1.3.0.tar.gz instead of 1.3.0.tar.gz.
Changes v2 -> v3:
- Refactor the patch because it's been sitting for over two months, and no longer applied cleanly.
DEVELOPERS | 1 + package/Config.in | 1 + package/mender-grubenv/Config.in | 42 +++++++++++++++++ package/mender-grubenv/mender-grubenv.hash | 3 ++ package/mender-grubenv/mender-grubenv.mk | 53 ++++++++++++++++++++++ package/mender/Config.in | 4 +- 6 files changed, 102 insertions(+), 2 deletions(-) create mode 100644 package/mender-grubenv/Config.in create mode 100644 package/mender-grubenv/mender-grubenv.hash create mode 100644 package/mender-grubenv/mender-grubenv.mk
DEVELOPERS +1 -0
@@ -50,6 +50,7 @@ F: package/libselinux/ F: package/libsemanage/ F: package/libsepol/ F: package/libwebsockets/ +F: package/mender-grubenv/ F: package/nginx-naxsi/ F: package/openjdk/ F: package/openjdk-bin/
package/Config.in +1 -0
@@ -2197,6 +2197,7 @@ menu "System tools" source "package/libostree/Config.in" source "package/lxc/Config.in" source "package/mender/Config.in" + source "package/mender-grubenv/Config.in" source "package/monit/Config.in" source "package/ncdu/Config.in" source "package/numactl/Config.in"
package/mender-grubenv/Config.in new file +42 -0
42 lines not on this page · raw message
package/mender-grubenv/mender-grubenv.hash new file +3 -0
@@ -0,0 +1,3 @@ +# Locally computed +sha256 e50cc18a844e3fd1edef7af9224733b0338a34d51f1186ee19803ef7af1a5065 mender-grubenv-1.3.0.tar.gz +sha256 98ed35b5a138f58164b5c0dbccd9d7f01ef4d84b9dba01e896f0a3241c50c0f7 LICENSE
package/mender-grubenv/mender-grubenv.mk new file +53 -0
53 lines not on this page · raw message
package/mender/Config.in +2 -2
@@ -4,8 +4,8 @@ config BR2_PACKAGE_MENDER depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_XZ - select BR2_PACKAGE_UBOOT_TOOLS # runtime - select BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV # runtime + select BR2_PACKAGE_UBOOT_TOOLS if BR2_TARGET_UBOOT # runtime + select BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV if BR2_TARGET_UBOOT # runtime help Mender is an open source over-the-air (OTA) software updater for embedded Linux devices. Mender comprises a client
Signature · 1 line
2.21.0
PATCH v3 1/1 mender-grubenv: new package
Quoted 9 lines · On Thu, Jun 6, 2019 at 5:52 PM <[email protected]> wrote:
From: Adam Duskett <[email protected]>
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.
Quoted 6 lines
Because this patch also includes a grub version of
fw_printenvandfw_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 offw_printenvand fails to start.Signed-off-by Adam Duskett <[email protected]>
Signature · 3 lines
Mirza Krak | Embedded Solutions Architect | https://mender.io Northern.tech AS | @northerntechHQ
PATCH v3 1/1 mender-grubenv: new package
Quoted 16 lines · Mirza Krak
Quoted 14 lines · On Thu, Jun 6, 2019 at 5:52 PM <[email protected]> wrote:
From: Adam Duskett <[email protected]>
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_printenvandfw_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 offw_printenvand fails to start.
Quoted 4 lines
Quoted 1 line
Signed-off-by Adam Duskett <[email protected]>Tested-by Mirza Krak <[email protected]>Signed-off-by Mirza Krak <[email protected]>
Ops, the "Signed-off-by" should be,
Signature · 3 lines
Mirza Krak | Embedded Solutions Architect | https://mender.io Northern.tech AS | @northerntechHQ
Arnout Vandecappelle
AppliedPATCH v3 1/1 mender-grubenv: new package
In reply to aduskett at gmail.comQuoted 14 lines · aduskett at gmail.com
From: Adam Duskett <[email protected]>
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_printenvandfw_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 offw_printenvand fails to start.Signed-off-by Adam Duskett <[email protected]>
[snip]
package/mender-grubenv/Config.in line 6
Quoted 12 lines
package/mender-grubenv/Config.in new file +6
-0@@ -0,0 +1,42 @@ +config BR2_PACKAGE_MENDER_GRUBENV + bool "mender-grubenv" + 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_ARCH_SUPPORTS
Architecture dependencies (i.e., the ones that should not be mentioned in a
comment, and are not package dependencies) should come first. I'm sure that's documented somewhere :-P
package/mender-grubenv/Config.in line 7
Quoted 1 line
package/mender-grubenv/Config.in new file +1
-0+ depends on BR2_TARGET_GRUB2
This is also a runtime dependency.
Quoted 21 lines
package/mender-grubenv/Config.in new file +21
-0+ 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
package/mender-grubenv/Config.in line 38
Quoted 10 lines
package/mender-grubenv/Config.in new file +10
-0+ mender_kernel_root_base=/dev/mmcblk0p + mender_grub_storage_device=hd0 + kernel_imagetype=bzImage + +endif + +comment "mender-grubenv needs a grub2 bootloader and a toolchain w/ wchar" + depends on BR2_PACKAGE_MENDER + depends on BR2_TARGET_GRUB2_ARCH_SUPPORTS + depends on !BR2_TARGET_GRUB2 || !BR2_USE_WCHAR
wchar is not in the dependencies above. I guess this was inherited from
selecting grub2 instead of depending on it at some point. I just removed it. And I checked in the package itself - there doesn't seem anything that directly depends on wchar.
package/mender-grubenv/Config.in line 41
Quoted 3 lines
package/mender-grubenv/Config.in new file +3
-0+ +comment "mender-grubenv does not work with uboot-tools fw_printenv" + depends on BR2_PACKAGE_MENDER
The architecture dependency should be repeated here. Otherwise, the user may
see this comment, remove fwprintenv, come back and mender-grubenv has just disappeared.
Quoted 40 lines
package/mender-grubenv/Config.in new file +1
-0+ depends on BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENVpackage/mender-grubenv/mender-grubenv.hash new file +3
-0@@ -0,0 +1,3 @@ +# Locally computed +sha256 e50cc18a844e3fd1edef7af9224733b0338a34d51f1186ee19803ef7af1a5065 mender-grubenv-1.3.0.tar.gz +sha256 98ed35b5a138f58164b5c0dbccd9d7f01ef4d84b9dba01e896f0a3241c50c0f7 LICENSEpackage/mender-grubenv/mender-grubenv.mk new file +24
-0@@ -0,0 +1,53 @@ +################################################################################ +# +# mender-grubenv +# +################################################################################ + +MENDER_GRUBENV_VERSION = 1.3.0 +MENDER_GRUBENV_SITE = $(call github,mendersoftware,grub-mender-grubenv,$(MENDER_GRUBENV_VERSION)) +MENDER_GRUBENV_LICENSE = Apache-2.0 +MENDER_GRUBENV_LICENSE_FILES = LICENSE + +ifeq ($(BR2_TARGET_GRUB2_I386_PC)$(BR2_TARGET_GRUB2_ARM_UBOOT),y) +MENDER_GRUBENV_ENV_DIR = /boot/grub +else +MENDER_GRUBENV_ENV_DIR = /boot/efi/EFI/BOOT +endif + +MENDER_GRUBENV_MAKE_ENV = \ + $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_MAKE_ENV) \ + ENV_DIR=$(MENDER_GRUBENV_ENV_DIR) + +MENDER_GRUBENV_DEFINES = \ + $(or $(call qstrip,$(BR2_PACKAGE_MENDER_GRUBENV_DEFINES)),\
package/mender-grubenv/mender-grubenv.mk line 34
Quoted 10 lines
package/mender-grubenv/mender-grubenv.mk new file +10
-0+ $(@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. +MENDER_GRUBENV_MANDATORY_MODULES=loadenv hashsum echo halt gcry_sha256 test +MENDER_GRUBENV_MODULES_MISSING = \ + $(filter-out $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES)),\ + $(MENDER_GRUBENV_MANDATORY_MODULES)) + +ifeq ($(BR2_PACKAGE_MENDER_GRUBENV),y)
This lacks a check on $(BR_BUILDING). I don't remember what exactly it is
needed for, but it is needed for sure :-)
package/mender-grubenv/mender-grubenv.mk line 42
Quoted 8 lines
package/mender-grubenv/mender-grubenv.mk new file +8
-0+ifneq ($(MENDER_GRUBENV_MODULES_MISSING),) +$(error The following missing grub2 modules must be enabled for mender-grubenv \ + to work: $(MENDER_GRUBENV_MODULES_MISSING)) +endif +endif + +define MENDER_GRUBENV_CONFIGURE_CMDS + cp -dpfr $(MENDER_GRUBENV_DEFINES) $(@D)/mender_grubenv_defines
This is just a single file, so a recursive copy seems a bit strange. Also, I
don't think we want -p at all. So I replaced this with $(INSTALL) -m 0644.
Quoted 16 lines
package/mender-grubenv/mender-grubenv.mk new file +11
-0+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 + +$(eval $(generic-package))package/mender/Config.in +0
-0
package/mender/Config.in config BR2_PACKAGE_MENDER · line 8
Quoted 7 lines
package/mender/Config.in +2
-2@@ -4,8 +4,8 @@ config BR2_PACKAGE_MENDER depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_XZ - select BR2_PACKAGE_UBOOT_TOOLS # runtime - select BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV # runtime + select BR2_PACKAGE_UBOOT_TOOLS if BR2_TARGET_UBOOT # runtime + select BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV if BR2_TARGET_UBOOT # runtime
I believe that mender needs *a* fw_printenv. So, if the boot loader is U-Boot,
it needs uboot-tools, and if the boot loader is grub2, it needs mender-grubenv.
The problem is that we may be building U-Boot outside of Buildroot. Therefore,BR2_TARGET_UBOOT is not a sufficient condition to know if we're using U-Boot or grub.
I don't think there's a good solution for that, so I left this as is. But if
you come up with something, feel free to suggest it.
I've applied with all the changes mentioned above, thanks.
Regards,
Arnout
Quoted 4 lines
package/mender/Config.in +0
-0help Mender is an open source over-the-air (OTA) software updater for embedded Linux devices. Mender comprises a client