From patchwork Mon Sep 2 22:34:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1156734 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="UmzQuTu2"; 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 46MlJY6BkYz9s4Y for ; Tue, 3 Sep 2019 08:34:53 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id EDEBE20482; Mon, 2 Sep 2019 22:34:49 +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 FDja27nCtnaZ; Mon, 2 Sep 2019 22:34:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id C3713204A2; Mon, 2 Sep 2019 22:34:47 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 53BEF1BF3E0 for ; Mon, 2 Sep 2019 22:34:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 50A7F84EEA for ; Mon, 2 Sep 2019 22:34:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JsTN0_IfYyAO for ; Mon, 2 Sep 2019 22:34:45 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by fraxinus.osuosl.org (Postfix) with ESMTPS id ABCA784E7C for ; Mon, 2 Sep 2019 22:34:45 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id s12so2570258pfe.6 for ; Mon, 02 Sep 2019 15:34:45 -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=fXqVclFDam4R3N8r8jIuL/QociJbsxUJZ0FQlDn/1Dg=; b=UmzQuTu2MqBV0bVDczr6gWGJAWOeIjY+xf4zhX8YunmXfVKZMTYOZL47fqFr5liTg3 bjYXe/1yldgE5yWU8b6nBvO3HGaiMSQ7fEzrkurfWw3xL8LlEmKcevomRgvDc12UyaEN FEOhQKkHQT+zfoKibTvoGUv/cudqq3w3LHCNTYUVUJGnsRm09s2UU+L2gzCnJMZ8xNJ0 ThSkV+NtHvyxPzDaGvXPwvNLjlRnrJQROY6P2DR0xqnXMfRq3XDpih0eggb98n8xG15l jt6zzPC+axLNh8R8tkQdYhMeVr+/S0kn//oQltFPjZBW4pJ4xzINJLPyCMcxc30Cga9h de7w== 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=fXqVclFDam4R3N8r8jIuL/QociJbsxUJZ0FQlDn/1Dg=; b=k7+eSHMXv7WZcpTum+7UDm3IDtMjvHQQ9hV5yVqDrekSV7KoXLhi7cYDQzeM3AqxV8 gSTZHERF/+mfg/xV/epOBTs09Bj/pg+F7KiJyIxHhDnsNsJO53XIXLVSANy0I0lsl0mk UeJ2jeTQcpq8YLiTl0Xoi7I0VfoECnl4I9aWHinfaHOekDRq8zzYdoKY+m9acM8IS09t Pb5SCTjCb5UWzAynOW/JLpAqyGqq/WrYTdHjnYCd+YKKlQrH8ryKoDH0zj3g6olzfNgL xxkoopLhes2HebQ13QiKN6fEKz6+nS9mve2G5cFVvhECip6nDwza4xj5dbWGmSt4LLSg rSvg== X-Gm-Message-State: APjAAAUh0xVxraXRd4ZnvNkZ0iVXgPdzP+H8gJNe/cT3MOXpn/SNy7bk xkTNTWrrWZ91Vr7VUtQLANKtV+mmVF4= X-Google-Smtp-Source: APXvYqy4P/HXo7Gsnyy8Nxp5U2e5kt3qG9WvFFd4igw/tlt1bwsqE+jy00MDu5sQUFRauN/ELZF2WA== X-Received: by 2002:a17:90a:d988:: with SMTP id d8mr244954pjv.65.1567463684887; Mon, 02 Sep 2019 15:34:44 -0700 (PDT) Received: from localhost.localdomain (137-025-100-153.res.spectrum.com. [137.25.100.153]) by smtp.gmail.com with ESMTPSA id u21sm14068380pjn.5.2019.09.02.15.34.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 15:34:44 -0700 (PDT) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Mon, 2 Sep 2019 15:34:41 -0700 Message-Id: <20190902223442.24880-1-aduskett@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2] package/mender-grubenv: fix installation with genimage.sh script 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: Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett 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 --- package/mender-grubenv/mender-grubenv.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/package/mender-grubenv/mender-grubenv.mk b/package/mender-grubenv/mender-grubenv.mk index c947f2ff9d..6759e1379b 100644 --- a/package/mender-grubenv/mender-grubenv.mk +++ b/package/mender-grubenv/mender-grubenv.mk @@ -8,11 +8,15 @@ 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 +# 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 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 +MENDER_GRUBENV_ENV_DIR = /boot/EFI/BOOT endif MENDER_GRUBENV_MAKE_ENV = \ @@ -50,4 +54,10 @@ define MENDER_GRUBENV_INSTALL_TARGET_CMDS $(MENDER_GRUBENV_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install endef +# Overwrite the default grub2 config files with the ones in this package. +define MENDER_GRUBENV_INSTALL_IMAGES_CMDS + mkdir -p $(dir $(GRUB2_IMAGE)) + cp -dpfr $(TARGET_DIR)/boot/EFI $(BINARIES_DIR)/efi-part +endef + $(eval $(generic-package))