Skip to contentSkip to conversation

mender-grubenv: new package

PATCH Superseded aduskett at gmail.com 2 participants 2 messages Mar 20, 2019 – Mar 21, 2019

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 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.

 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
index 3e0ac08e11..4ab0931f4e 100644
@@ -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
index b5321aeb49..7eb833627b 100644
@@ -2168,6 +2168,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
new file mode 100644
index 0000000000..1b1eaa758a
@@ -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
index 5ab2304e49..0088d54008 100644
@@ -3,8 +3,8 @@ config BR2_PACKAGE_MENDER
 	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
-	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.20.1
#1 lore raw

PATCH v2 1/1 mender-grubenv: new package

Quoted 9 lines · On Wed, Mar 20, 2019 at 7:30 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_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.

Signature · 3 lines
Mirza Krak | Embedded Solutions Architect | https://mender.io

 Northern.tech AS | @northerntechHQ