From patchwork Wed Sep 4 14:20:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1980862 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WzPmT3sJ9z1yXY for ; Thu, 5 Sep 2024 00:20:57 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 5D553811D9; Wed, 4 Sep 2024 14:20:55 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 8kh_CIfs6P_A; Wed, 4 Sep 2024 14:20:54 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org AC340811D8 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id AC340811D8; Wed, 4 Sep 2024 14:20:53 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id B7E061BF267 for ; Wed, 4 Sep 2024 14:20:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id A2DEB6059D for ; Wed, 4 Sep 2024 14:20:46 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id gcq-65ezKG6M for ; Wed, 4 Sep 2024 14:20:46 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::544; helo=mail-ed1-x544.google.com; envelope-from=adam.duskett@amarulasolutions.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 93B82605EE DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 93B82605EE Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by smtp3.osuosl.org (Postfix) with ESMTPS id 93B82605EE for ; Wed, 4 Sep 2024 14:20:45 +0000 (UTC) Received: by mail-ed1-x544.google.com with SMTP id 4fb4d7f45d1cf-5c24b1ed83eso609499a12.2 for ; Wed, 04 Sep 2024 07:20:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725459643; x=1726064443; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=R+HGCOuKdig/Tl2BpFPS4G02esg7Y5pwDOapL7WJKCs=; b=EwQ//r2wv8bGrxH+XObBN2uHzJXD5dBhZfAQonB8ZFWnVzltyHwELkpFeA+G0E+lyB vJIbxImsufLL2FCRtEhgKOq1FflzvKMAIcwzU8NJz7DtvGX1jZJYeNSEs10wToAbIU6l SKAEixNU4+pb7BWmQX34rTyvO7EhJZzSNx3eNp+IvPuxbEGk5apuhwUufD/22PHUmMiv YR2wxRdUTNxR4g7Z+ENxpwx9xyHSf+boQRTqfjEEDndgpgmkK5quS6RAaLY0apkWF2de 2H+3IJM/czENQC3SCcevN9S+8uBA6fBE6RqCxTfWydi0icq9o9Y7iEFLyZ2bLftWjAnz SoNg== X-Gm-Message-State: AOJu0YwFx9rsJXTBryzSdyv+1hdv/rW5j2SdUSLMgA6XBWE4QzQlOFuI ZoQyH/M3f7oSyQoGlZHRzbyvvuFsMztOhKfD66GES84xAWke5Y4gLE/aFjrfKfLBoZflqxBh/9c VMbgd/+NP X-Google-Smtp-Source: AGHT+IFNbZiil+gfEzik9X8r50ZgbvC6r+ck/QGwk8R9FD5SAWCoiT5aspFo/PIcduEBYQxZ8DTxww== X-Received: by 2002:a05:6402:34c3:b0:5c2:4dcc:b913 with SMTP id 4fb4d7f45d1cf-5c24dccbcb3mr5396810a12.3.1725459642454; Wed, 04 Sep 2024 07:20:42 -0700 (PDT) Received: from adam-laptop.ipgroup.local (212-57-59-66.xdsl.deanconnect.nl. [212.57.59.66]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c2502f86ebsm4680230a12.77.2024.09.04.07.20.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2024 07:20:42 -0700 (PDT) From: Adam Duskett To: buildroot@buildroot.org Date: Wed, 4 Sep 2024 16:20:36 +0200 Message-ID: <20240904142038.3294224-3-adam.duskett@amarulasolutions.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240904142038.3294224-1-adam.duskett@amarulasolutions.com> References: <20240904142038.3294224-1-adam.duskett@amarulasolutions.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1725459643; x=1726064443; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=R+HGCOuKdig/Tl2BpFPS4G02esg7Y5pwDOapL7WJKCs=; b=KhNr1B3xmRhVUd1hUQL7dg3kZZHITlYpe5ZcV/nm1Vj2n/swL7lkdrRBph+3p4vhv3 WOCecJwPM4qjG1G27iz1ssIuJyFdo7Y3qTo6z4Ro5eGWvqhKg9Uo4Xi+A3HkOePixAIL 3ZiWcvoTteq5c6sTJbgAJxym73ylEVxY/CC1o= X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=none dis=none) header.from=amarulasolutions.com X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=KhNr1B3x Subject: [Buildroot] [PATCH 3/5] package/mender-grubenv: bump version to 38e5043a215f696d126a2d707c9db9aeb93cfb2d X-BeenThere: buildroot@buildroot.org 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: Angelo Compagnucci , Adam Duskett Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" 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 --- 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(-) diff --git a/package/mender-grubenv/Config.in b/package/mender-grubenv/Config.in index f27eb09e34..8505458793 100644 --- a/package/mender-grubenv/Config.in +++ b/package/mender-grubenv/Config.in @@ -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. diff --git a/package/mender-grubenv/mender-grubenv.hash b/package/mender-grubenv/mender-grubenv.hash index 193bff073b..d7f784493c 100644 --- a/package/mender-grubenv/mender-grubenv.hash +++ b/package/mender-grubenv/mender-grubenv.hash @@ -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 diff --git a/package/mender-grubenv/mender-grubenv.mk b/package/mender-grubenv/mender-grubenv.mk index a6d8d48d43..a47531fe58 100644 --- a/package/mender-grubenv/mender-grubenv.mk +++ b/package/mender-grubenv/mender-grubenv.mk @@ -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