From patchwork Wed Mar 20 18:30:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1059454 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MA9sfy27"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44PdlS14Mtz9s3q for ; Thu, 21 Mar 2019 05:30:41 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 57C74231E9; Wed, 20 Mar 2019 18:30:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YvqVD2kzlRbi; Wed, 20 Mar 2019 18:30:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id E2F0D23244; Wed, 20 Mar 2019 18:30:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 4FAF21BF29A for ; Wed, 20 Mar 2019 18:30:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4ADE7874AB for ; Wed, 20 Mar 2019 18:30:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id l+7yUNJ58SiN for ; Wed, 20 Mar 2019 18:30:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id C7A6B87541 for ; Wed, 20 Mar 2019 18:30:26 +0000 (UTC) Received: by mail-io1-f65.google.com with SMTP id b9so2909110iot.13 for ; Wed, 20 Mar 2019 11:30:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QUff/16N1+Hmr3BSdGZc6PMwqTIYpVa6lOWNJSRV0oU=; b=MA9sfy27wvHEMBANvOcqR3c9f5UqffDcysVx6OoviMsNETvGsGwVL3arHjE2O40bQn FG7SYWGLqk9fpQd3tedNObTjqJxOTPS5cb7eKqzH0gAEVXufcHB+qul0Km8RI1xUlaLw PnzR5GAecd/rf8GvL+cDvpwke2Z4zfeSn3oT+280ca+rMc8xafDwHzF/eQQY/p670LK9 iaM3u9SljAv20zepGuib8wKrDVJNRsndr/B2MtQT2mVX1ZIfeNKDt3l8pek9BzWue4/N M3xG/lhacahrsHE+MjsdE2JxIJapfnstuHaMV+GTgfdRHLc+93JcFA0TIQNHlh9ON2hY ltGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QUff/16N1+Hmr3BSdGZc6PMwqTIYpVa6lOWNJSRV0oU=; b=D6Q4VCeo2XKfs5obueWCFLKJh2drpDPH67w8DTkzA1R8tBczzG2JkstRBePKccJuo0 3Dhz0YvSmnKyEknEPvLBxNzqohtfSCXkPpZ+tIDAeX72mdvTp/TxGw9b/oU5ffJhhO/J PM38JTB0E7hXtQx8zMVF9n1/WMYFM/d//XEgsuLH0lvLI0CqOhbRc2ioV5VGVGhGxzH2 Tgi1cJk6M1kd35hO88deH8Jtf8C37yY8WfTYHBRCEErwYBDBN99zBaBUIyUMkaZURULh 6RumyZfuOkpkB2Vemw+eZRyDErCeN3K2D9KgucAu2S1O3Ramn50otlVCjgtj4QWS33Eu FBwg== X-Gm-Message-State: APjAAAXJbMohoYmCYm4B4hemeosbiwkp5Tr7Lc+x4KYevIqGiPb9uT/C bPN7vDqIaQttKwdBUThGfxmZKxe87D0= X-Google-Smtp-Source: APXvYqy9nPUz9rEqP2DO/QAUAeCYR92FuQF6kd6J5CdpblHA8/Hnx21OruKmOsJp0EJ6wd7aUMjt2w== X-Received: by 2002:a5e:c30a:: with SMTP id a10mr6925901iok.193.1553106625758; Wed, 20 Mar 2019 11:30:25 -0700 (PDT) Received: from localhost.localdomain (68-188-149-81.dhcp.aldl.mi.charter.com. [68.188.149.81]) by smtp.gmail.com with ESMTPSA id z63sm1279311itc.39.2019.03.20.11.30.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Mar 2019 11:30:24 -0700 (PDT) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Wed, 20 Mar 2019 14:30:22 -0400 Message-Id: <20190320183022.19052-1-aduskett@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 1/1] mender-grubenv: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mirza Krak , Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett 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 Tested-by: Mirza Krak --- 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 diff --git a/DEVELOPERS b/DEVELOPERS index 3e0ac08e11..4ab0931f4e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -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/ diff --git a/package/Config.in b/package/Config.in index b5321aeb49..7eb833627b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -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" diff --git a/package/mender-grubenv/Config.in b/package/mender-grubenv/Config.in new file mode 100644 index 0000000000..7d5f7f0861 --- /dev/null +++ b/package/mender-grubenv/Config.in @@ -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 + 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 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 + +comment "mender-grubenv does not work with uboot-tools fw_printenv" + depends on BR2_PACKAGE_MENDER + depends on BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV diff --git a/package/mender-grubenv/mender-grubenv.hash b/package/mender-grubenv/mender-grubenv.hash new file mode 100644 index 0000000000..1b1eaa758a --- /dev/null +++ b/package/mender-grubenv/mender-grubenv.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 e50cc18a844e3fd1edef7af9224733b0338a34d51f1186ee19803ef7af1a5065 mender-grubenv-1.3.0.tar.gz +sha256 98ed35b5a138f58164b5c0dbccd9d7f01ef4d84b9dba01e896f0a3241c50c0f7 LICENSE diff --git a/package/mender-grubenv/mender-grubenv.mk b/package/mender-grubenv/mender-grubenv.mk new file mode 100644 index 0000000000..e5724d7855 --- /dev/null +++ b/package/mender-grubenv/mender-grubenv.mk @@ -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)),\ + $(@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) +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 +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)) diff --git a/package/mender/Config.in b/package/mender/Config.in index 5ab2304e49..0088d54008 100644 --- a/package/mender/Config.in +++ b/package/mender/Config.in @@ -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