[Buildroot] [PATCH 1/4] package/mender: bump version to 3.4.0

All of lore.kernel.org
 help / color / mirror / Atom feed

* [Buildroot] [PATCH 1/4] package/mender: bump version to 3.4.0
@ 2022-10-05 21:21 Adam Duskett
  2022-10-05 21:21 ` [Buildroot] [PATCH 2/4] package/mender-connect: bump version to 2.1.0 Adam Duskett
                   ` (3 more replies)
  0 siblings, 4 replies; 8+ messages in thread
From: Adam Duskett @ 2022-10-05 21:21 UTC (permalink / raw)
  To: buildroot; +Cc: Angelo Compagnucci, Adam Duskett

Updated vendor/github.com/mendersoftware/mender-artifact/LICENSE hash due to a
year change.

Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
 package/mender/mender.hash | 6 +++---
 package/mender/mender.mk   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/mender/mender.hash b/package/mender/mender.hash
index 7fee01cf1a..d563dc534b 100644
--- a/package/mender/mender.hash
+++ b/package/mender/mender.hash
@@ -1,12 +1,12 @@
 # Locally computed:
-sha256  9d8b2438e358dacde58c3692bd038ed9938392f1a526c49d919f73a2dff77eee  mender-3.3.0.tar.gz
+sha256  8a149b11b990beb7620b372023eec28df63cee6a1aa4132e88ecef554f080f72  mender-3.4.0.tar.gz
 
 # Vendor licenses
 # Generated with sed '/^[A-Za-z0-9_]/s/^/sha256  /' LIC_FILES_CHKSUM.sha256
 
 # Apache-2.0 license.
 sha256  1033348db7606a7e61b6484f293847cf8d7a35766efebb97e304d4bd5d7f3f6b  LICENSE
-sha256  b4acfcfa2a0ba1a8c82ec3965fbcee886cff8394ca4214e0ddac0a36beb1e05a  vendor/github.com/mendersoftware/mender-artifact/LICENSE
+sha256  1033348db7606a7e61b6484f293847cf8d7a35766efebb97e304d4bd5d7f3f6b  vendor/github.com/mendersoftware/mender-artifact/LICENSE
 sha256  73ba74dfaa520b49a401b5d21459a8523a146f3b7518a833eea5efa85130bf68  vendor/github.com/mendersoftware/openssl/LICENSE
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  vendor/github.com/minio/sha256-simd/LICENSE
 sha256  8f5d89b47d7a05a199b77b7e0f362dad391d451ebda4ef48ba11c50c071564c7  vendor/github.com/mendersoftware/progressbar/LICENSE
@@ -42,4 +42,4 @@ sha256  08eab1118c80885fa1fa6a6dd7303f65a379fcb3733e063d20d1bbc2c76e6fa1  vendor
 sha256  310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569  vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md
 
 # sha256 of all the vendor licenses combined
-sha256  e6d8321e71be932e08b8923fe9e24e06a95c7e74a6b86e6f73696436ae0ea54f  LIC_FILES_CHKSUM.sha256
+sha256  93d9db9b43097b174e362ac8f398aa9a37fcdde2974d0567b62bd6d1e0d22037  LIC_FILES_CHKSUM.sha256
diff --git a/package/mender/mender.mk b/package/mender/mender.mk
index 5c3c593da6..724295f784 100644
--- a/package/mender/mender.mk
+++ b/package/mender/mender.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MENDER_VERSION = 3.3.0
+MENDER_VERSION = 3.4.0
 MENDER_SITE = $(call github,mendersoftware,mender,$(MENDER_VERSION))
 MENDER_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT, OLDAP-2.8
 
-- 
2.37.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH 2/4] package/mender-connect: bump version to 2.1.0
  2022-10-05 21:21 [Buildroot] [PATCH 1/4] package/mender: bump version to 3.4.0 Adam Duskett
@ 2022-10-05 21:21 ` Adam Duskett
  2022-10-06 19:41   ` Thomas Petazzoni via buildroot
  2022-10-05 21:21 ` [Buildroot] [PATCH 3/4] package/mender-artifact: bump version to 3.9.0 Adam Duskett
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 8+ messages in thread
From: Adam Duskett @ 2022-10-05 21:21 UTC (permalink / raw)
  To: buildroot; +Cc: Angelo Compagnucci, Adam Duskett

Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
 package/mender-connect/mender-connect.hash | 2 +-
 package/mender-connect/mender-connect.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/mender-connect/mender-connect.hash b/package/mender-connect/mender-connect.hash
index 46f37f954b..da4ec5fbbd 100644
--- a/package/mender-connect/mender-connect.hash
+++ b/package/mender-connect/mender-connect.hash
@@ -1,5 +1,5 @@
 # Locally computed:
-sha256  6410bcd76cebd21e9f18fe5768928d67163e4bb2b6ae76d0e20815400d907657  mender-connect-2.0.2.tar.gz
+sha256  96b81bb4c72eb8c1756febb94101c0dea5a6d4884591824e61a5f2509cd9ca9b  mender-connect-2.1.0.tar.gz
 sha256  78b3954421ec6499c3f9735b96d52288574ae80c747416a52548d7f526f26e8c  LIC_FILES_CHKSUM.sha256
 
 # Vendor licenses
diff --git a/package/mender-connect/mender-connect.mk b/package/mender-connect/mender-connect.mk
index 1b0285cffc..36ddd5f7db 100644
--- a/package/mender-connect/mender-connect.mk
+++ b/package/mender-connect/mender-connect.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MENDER_CONNECT_VERSION = 2.0.2
+MENDER_CONNECT_VERSION = 2.1.0
 MENDER_CONNECT_SITE = $(call github,mendersoftware,mender-connect,$(MENDER_CONNECT_VERSION))
 MENDER_CONNECT_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT
 
-- 
2.37.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [Buildroot] [PATCH 2/4] package/mender-connect: bump version to 2.1.0
  2022-10-05 21:21 ` [Buildroot] [PATCH 2/4] package/mender-connect: bump version to 2.1.0 Adam Duskett
@ 2022-10-06 19:41   ` Thomas Petazzoni via buildroot
  0 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-10-06 19:41 UTC (permalink / raw)
  To: Adam Duskett; +Cc: Angelo Compagnucci, buildroot

On Wed,  5 Oct 2022 14:21:48 -0700
Adam Duskett <aduskett@gmail.com> wrote:

> Signed-off-by: Adam Duskett <aduskett@gmail.com>
> ---
>  package/mender-connect/mender-connect.hash | 2 +-
>  package/mender-connect/mender-connect.mk   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH 3/4] package/mender-artifact: bump version to 3.9.0
  2022-10-05 21:21 [Buildroot] [PATCH 1/4] package/mender: bump version to 3.4.0 Adam Duskett
  2022-10-05 21:21 ` [Buildroot] [PATCH 2/4] package/mender-connect: bump version to 2.1.0 Adam Duskett
@ 2022-10-05 21:21 ` Adam Duskett
  2022-10-06 19:42   ` Thomas Petazzoni via buildroot
  2022-10-05 21:21 ` [Buildroot] [PATCH 4/4] package/mender-grubenv: bump version to 2ac898f5924d5870f8394ad8ecd3ef1ab1422e3b Adam Duskett
  2022-10-06 19:41 ` [Buildroot] [PATCH 1/4] package/mender: bump version to 3.4.0 Thomas Petazzoni via buildroot
  3 siblings, 1 reply; 8+ messages in thread
From: Adam Duskett @ 2022-10-05 21:21 UTC (permalink / raw)
  To: buildroot; +Cc: Angelo Compagnucci, Adam Duskett

Changes:
New licenses:
  Apache  2.0:
  - vendor/github.com/mendersoftware/openssl/LICENSE

BSD 3 Clause:
  - vendor/golang.org/x/crypto/LICENSE
  - vendor/golang.org/x/time/LICENSE

mender-artifact now requires OpenSSL, and is incompatible with OpenSSL3.
As such, the host-pkgconf and host-libopenssl packages are now dependencies to
prevent linking errors against OpenSSL3 on newer distributions such as
Fedora 35.

Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
 package/mender-artifact/Config.in.host       |  1 +
 package/mender-artifact/mender-artifact.hash |  7 +++++--
 package/mender-artifact/mender-artifact.mk   | 16 +++++++++++++---
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/package/mender-artifact/Config.in.host b/package/mender-artifact/Config.in.host
index c7be0ed261..1879b4aa74 100644
--- a/package/mender-artifact/Config.in.host
+++ b/package/mender-artifact/Config.in.host
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_HOST_MENDER_ARTIFACT
 	bool "host mender-artifact"
 	depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS
+	select BR2_PACKAGE_HOST_PKGCONF
 	help
 	  The mender-artifact tool is a CLI implementation of the
 	  Mender artifacts library.
diff --git a/package/mender-artifact/mender-artifact.hash b/package/mender-artifact/mender-artifact.hash
index 8262e26bf0..58a8cc663d 100644
--- a/package/mender-artifact/mender-artifact.hash
+++ b/package/mender-artifact/mender-artifact.hash
@@ -1,6 +1,6 @@
 # Locally computed:
-sha256  d3ed68d8637195ff35de97b12c8fa148cebffb1ee0fd0d43909ec1643c0c296a  mender-artifact-3.8.0.tar.gz
-sha256  b8462a14975e30fb0dff14ed50e7563e833ccce13c2aa93f95386ffe877ed673  LIC_FILES_CHKSUM.sha256
+sha256  cb6d4da1bef47b5ddab311ffe5c7331073d6c98f2a8dac29ddced36feac29e5e  mender-artifact-3.9.0.tar.gz
+sha256  5635790313f33aea860583427e8e73792e99c5dfb947d4025c0102011564af50  LIC_FILES_CHKSUM.sha256
 
 # License hash extracted from LIC_FILES_CHKSUM.sha256 using the
 # following command:
@@ -22,6 +22,7 @@ sha256  58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd  vendor
 sha256  73ba74dfaa520b49a401b5d21459a8523a146f3b7518a833eea5efa85130bf68  vendor/github.com/golang/groupcache/LICENSE
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  vendor/gopkg.in/square/go-jose.v2/LICENSE
 sha256  c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4  vendor/github.com/oklog/run/LICENSE
+sha256  73ba74dfaa520b49a401b5d21459a8523a146f3b7518a833eea5efa85130bf68  vendor/github.com/mendersoftware/openssl/LICENSE
 
 #
 # BSD 2 Clause licenses.
@@ -44,6 +45,8 @@ sha256  fc0a2f71df4e8f047902da53d1f85301be43e0f360fc167057a2d04658ed2ba9  vendor
 sha256  4835612df0098ca95f8e7d9e3bffcb02358d435dbb38057c844c99d7f725eb20  vendor/google.golang.org/protobuf/LICENSE
 sha256  8778a9fc1eaffb03ab873caae251df2d224f6b5502be8777d3cd573a4dd43903  vendor/github.com/golang/protobuf/LICENSE
 sha256  b95218cd9607855a6536384c0262922b30a0c2bf56e4ced790240f3a3bac4722  vendor/github.com/googleapis/gax-go/v2/LICENSE
+sha256  2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067  vendor/golang.org/x/crypto/LICENSE
+sha256  2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067  vendor/golang.org/x/time/LICENSE
 sha256  f69f157b0be75da373605dbc8bbf142e8924ee82d8f44f11bcaf351335bf98cf  vendor/github.com/golang/snappy/LICENSE
 sha256  dd26a7abddd02e2d0aba97805b31f248ef7835d9e10da289b22e3b8ab78b324d  vendor/gopkg.in/square/go-jose.v2/json/LICENSE
 sha256  6a358d2540ca14048f02d366f23787c0a480157e58f058113f0e27168dd4e447  vendor/github.com/pierrec/lz4/LICENSE
diff --git a/package/mender-artifact/mender-artifact.mk b/package/mender-artifact/mender-artifact.mk
index 1031166f34..a5f79ea449 100644
--- a/package/mender-artifact/mender-artifact.mk
+++ b/package/mender-artifact/mender-artifact.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HOST_MENDER_ARTIFACT_VERSION = 3.8.0
+HOST_MENDER_ARTIFACT_VERSION = 3.9.0
 HOST_MENDER_ARTIFACT_SITE = $(call github,mendersoftware,mender-artifact,$(HOST_MENDER_ARTIFACT_VERSION))
 HOST_MENDER_ARTIFACT_LICENSE = Apache2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT, MPL-2.0
 HOST_MENDER_ARTIFACT_LICENSE_FILES = \
@@ -23,6 +23,7 @@ HOST_MENDER_ARTIFACT_LICENSE_FILES = \
 	vendor/github.com/golang/groupcache/LICENSE \
 	vendor/gopkg.in/square/go-jose.v2/LICENSE \
 	vendor/github.com/oklog/run/LICENSE \
+	vendor/github.com/mendersoftware/openssl/LICENSE \
 	vendor/github.com/pkg/errors/LICENSE \
 	vendor/github.com/pmezard/go-difflib/LICENSE \
 	vendor/golang.org/x/sys/LICENSE \
@@ -40,6 +41,8 @@ HOST_MENDER_ARTIFACT_LICENSE_FILES = \
 	vendor/google.golang.org/protobuf/LICENSE \
 	vendor/github.com/golang/protobuf/LICENSE \
 	vendor/github.com/googleapis/gax-go/v2/LICENSE \
+	vendor/golang.org/x/crypto/LICENSE \
+	vendor/golang.org/x/time/LICENSE \
 	vendor/github.com/golang/snappy/LICENSE \
 	vendor/gopkg.in/square/go-jose.v2/json/LICENSE \
 	vendor/github.com/pierrec/lz4/LICENSE \
@@ -84,7 +87,7 @@ HOST_MENDER_ARTIFACT_LICENSE_FILES = \
 	vendor/github.com/hashicorp/go-multierror/LICENSE \
 	vendor/github.com/hashicorp/golang-lru/LICENSE
 
-HOST_MENDER_ARTIFACT_DEPENDENCIES = host-xz
+HOST_MENDER_ARTIFACT_DEPENDENCIES = host-xz host-libopenssl host-pkgconf
 
 # By default, go will attempt to download needed modules before building, which
 # is not desirable. This behavior also causes permission issues when cleaning,
@@ -92,7 +95,14 @@ HOST_MENDER_ARTIFACT_DEPENDENCIES = host-xz
 # includes the modules in the vendor directory, mod=vendor prevents the package
 # from downloading the go modules during the build process and prevents
 # permission issues when cleaning.
-HOST_MENDER_ARTIFACT_GO_ENV = GOFLAGS="-mod=vendor"
+#
+# Mender-artifact requires OpenSSL, and is not yet compatible with OpenSSL3.
+# Mender-artifact also uses pkgconf to find the OpenSSL library.
+# Use host-pkgconf to force mender-artifact to use Buildroots host-openssl, as
+# newer distributions, such as Fedora, are starting to use OpenSSL3.
+HOST_MENDER_ARTIFACT_GO_ENV = \
+	GOFLAGS="-mod=vendor" \
+	PKG_CONFIG_PATH="$(HOST_DIR)/lib/pkgconfig"
 
 HOST_MENDER_ARTIFACT_LDFLAGS = -X github.com/mendersoftware/mender-artifact/cli.Version=$(HOST_MENDER_ARTIFACT_VERSION)
 
-- 
2.37.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [Buildroot] [PATCH 3/4] package/mender-artifact: bump version to 3.9.0
  2022-10-05 21:21 ` [Buildroot] [PATCH 3/4] package/mender-artifact: bump version to 3.9.0 Adam Duskett
@ 2022-10-06 19:42   ` Thomas Petazzoni via buildroot
  0 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-10-06 19:42 UTC (permalink / raw)
  To: Adam Duskett; +Cc: Angelo Compagnucci, buildroot

On Wed,  5 Oct 2022 14:21:49 -0700
Adam Duskett <aduskett@gmail.com> wrote:

> mender-artifact now requires OpenSSL, and is incompatible with OpenSSL3.
> As such, the host-pkgconf and host-libopenssl packages are now dependencies to
> prevent linking errors against OpenSSL3 on newer distributions such as
> Fedora 35.

Even if mender-artifact was compatible with OpenSSL3, it would be a bug
to rely on the system-provided OpenSSL library.

> +# Mender-artifact requires OpenSSL, and is not yet compatible with OpenSSL3.
> +# Mender-artifact also uses pkgconf to find the OpenSSL library.
> +# Use host-pkgconf to force mender-artifact to use Buildroots host-openssl, as
> +# newer distributions, such as Fedora, are starting to use OpenSSL3.
> +HOST_MENDER_ARTIFACT_GO_ENV = \
> +	GOFLAGS="-mod=vendor" \
> +	PKG_CONFIG_PATH="$(HOST_DIR)/lib/pkgconfig"

Why is -mod=vendor needed here?

Also for pkg-config, I would prefer if we were to use the same
variables as defined in HOST_MAKE_ENV (in package/Makefile.in), i.e:

HOST_MAKE_ENV = \
        PATH=$(BR_PATH) \
        PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
        PKG_CONFIG_SYSROOT_DIR="/" \
        PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
        PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
        PKG_CONFIG_LIBDIR="$(HOST_DIR)/lib/pkgconfig:$(HOST_DIR)/share/pkgconfig"

Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [Buildroot] [PATCH 4/4] package/mender-grubenv: bump version to 2ac898f5924d5870f8394ad8ecd3ef1ab1422e3b
  2022-10-05 21:21 [Buildroot] [PATCH 1/4] package/mender: bump version to 3.4.0 Adam Duskett
  2022-10-05 21:21 ` [Buildroot] [PATCH 2/4] package/mender-connect: bump version to 2.1.0 Adam Duskett
  2022-10-05 21:21 ` [Buildroot] [PATCH 3/4] package/mender-artifact: bump version to 3.9.0 Adam Duskett
@ 2022-10-05 21:21 ` Adam Duskett
  2022-10-06 19:46   ` Thomas Petazzoni via buildroot
  2022-10-06 19:41 ` [Buildroot] [PATCH 1/4] package/mender: bump version to 3.4.0 Thomas Petazzoni via buildroot
  3 siblings, 1 reply; 8+ messages in thread
From: Adam Duskett @ 2022-10-05 21:21 UTC (permalink / raw)
  To: buildroot; +Cc: Angelo Compagnucci, Adam Duskett

mender-grubenv no longer uses the mender_grubenv* directories, instead opting
to put the mender_grubenv directories in a grub-mender-grubenv top-level
directory. While there is a legacy install mode which keeps the two separate
directories, it is better to move forward and rip the bandaid off before it
becomes too painful to update in the future if the legacy option is removed
entirely.

- Update the license file sha256 sum due to a year change.

- mender-grubenv no longer installs grub.cfg, so mender_grub.cfg must be copied
  manually to grub.cfg.

- BOOT_DIR replaces ENV_DIR in the Makefile.

- The sleep grub2 module is now a requirement.

- /etc/mender_grubenv.config file must be present on the system for the
  grub-mender-grubenv-{print,set} scripts to work properly.

In addition to the above changes, update the mender example board file to work
with the updated mender-grubenv version.

Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
 board/mender/x86_64/genimage-efi.cfg       |  3 +++
 configs/mender_x86_64_efi_defconfig        |  2 +-
 package/mender-grubenv/mender-grubenv.hash |  4 ++--
 package/mender-grubenv/mender-grubenv.mk   | 22 +++++++++++++++-------
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/board/mender/x86_64/genimage-efi.cfg b/board/mender/x86_64/genimage-efi.cfg
index 10cefe2380..4ed064c498 100644
--- a/board/mender/x86_64/genimage-efi.cfg
+++ b/board/mender/x86_64/genimage-efi.cfg
@@ -3,6 +3,9 @@ image efi-part.vfat {
 		file EFI {
 			image = "efi-part/EFI"
 		}
+		file grub-mender-grubenv {
+		  image = "efi-part/grub-mender-grubenv"
+		}
 		file bzImage {
 			image = "bzImage"
 		}
diff --git a/configs/mender_x86_64_efi_defconfig b/configs/mender_x86_64_efi_defconfig
index 6919a60c90..02081035ff 100644
--- a/configs/mender_x86_64_efi_defconfig
+++ b/configs/mender_x86_64_efi_defconfig
@@ -19,7 +19,7 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_TARGET_GRUB2=y
 BR2_TARGET_GRUB2_X86_64_EFI=y
 # Add mandatory modules from MENDER_GRUBENV_MANDATORY_MODULES
-BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 fat squash4 part_msdos part_gpt normal efi_gop loadenv hashsum echo halt gcry_sha256 test regexp"
+BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 fat squash4 part_msdos part_gpt normal efi_gop loadenv hashsum echo halt gcry_sha256 test regexp sleep"
 BR2_TARGET_GRUB2_INSTALL_TOOLS=y
 
 # Required tools to create a mender image
diff --git a/package/mender-grubenv/mender-grubenv.hash b/package/mender-grubenv/mender-grubenv.hash
index 3be5f51a9e..193bff073b 100644
--- a/package/mender-grubenv/mender-grubenv.hash
+++ b/package/mender-grubenv/mender-grubenv.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  00a574d2bed8d54ba6739700da789a420a02de900df56dd2cfbe0df460a98dca  mender-grubenv-1a7db967495bbe8be53b7a69dcb42822f39d9a74.tar.gz
-sha256  b4acfcfa2a0ba1a8c82ec3965fbcee886cff8394ca4214e0ddac0a36beb1e05a  LICENSE
+sha256  b7a08eb3d996afb38c1a4f7c51b7eb44aec6197ff713ce75e4f39d5b448cfc82  mender-grubenv-2ac898f5924d5870f8394ad8ecd3ef1ab1422e3b.tar.gz
+sha256  1033348db7606a7e61b6484f293847cf8d7a35766efebb97e304d4bd5d7f3f6b  LICENSE
diff --git a/package/mender-grubenv/mender-grubenv.mk b/package/mender-grubenv/mender-grubenv.mk
index 9d5be8d8f4..8679ad9236 100644
--- a/package/mender-grubenv/mender-grubenv.mk
+++ b/package/mender-grubenv/mender-grubenv.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MENDER_GRUBENV_VERSION = 1a7db967495bbe8be53b7a69dcb42822f39d9a74
+MENDER_GRUBENV_VERSION = 2ac898f5924d5870f8394ad8ecd3ef1ab1422e3b
 MENDER_GRUBENV_SITE = $(call github,mendersoftware,grub-mender-grubenv,$(MENDER_GRUBENV_VERSION))
 MENDER_GRUBENV_LICENSE = Apache-2.0
 MENDER_GRUBENV_LICENSE_FILES = LICENSE
@@ -30,13 +30,15 @@ MENDER_GRUBENV_MODULES_MISSING_PC = \
 	$(filter-out $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES_PC)),\
 		$(MENDER_GRUBENV_MANDATORY_MODULES))
 
-MENDER_GRUBENV_MAKE_ENV += ENV_DIR=/boot/grub
+MENDER_GRUBENV_MAKE_ENV += BOOT_DIR=/boot/grub
 
 define MENDER_GRUBENV_INSTALL_I386_CFG
 	mkdir -p $(BINARIES_DIR)/boot-part/grub
+	cp -dpfr $(@D)/mender_grub.cfg \
+		$(TARGET_DIR)/boot/grub/grub.cfg
 	cp -dpfr $(TARGET_DIR)/boot/grub/grub.cfg \
-		$(TARGET_DIR)/boot/grub/mender_grubenv* \
-		$(BINARIES_DIR)/boot-part/grub
+		$(TARGET_DIR)/boot/grub/grub-mender-grubenv \
+		$(BINARIES_DIR)/boot-part/
 endef
 endif # BR2_TARGET_GRUB2_HAS_LEGACY_BOOT
 
@@ -45,13 +47,16 @@ MENDER_GRUBENV_MODULES_MISSING_EFI = \
 	$(filter-out $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI)),\
 		$(MENDER_GRUBENV_MANDATORY_MODULES))
 
-MENDER_GRUBENV_MAKE_ENV += ENV_DIR=/boot/EFI/BOOT
+MENDER_GRUBENV_MAKE_ENV += BOOT_DIR=/boot/EFI/BOOT
 
 define MENDER_GRUBENV_INSTALL_EFI_CFG
 	mkdir -p $(BINARIES_DIR)/efi-part/EFI/BOOT
+	cp -dpfr $(@D)/mender_grub.cfg \
+		$(TARGET_DIR)/boot/EFI/BOOT/grub.cfg
 	cp -dpfr $(TARGET_DIR)/boot/EFI/BOOT/grub.cfg \
-		$(TARGET_DIR)/boot/EFI/BOOT/mender_grubenv* \
 		$(BINARIES_DIR)/efi-part/EFI/BOOT
+	cp -dpfr $(TARGET_DIR)/boot/EFI/BOOT/grub-mender-grubenv \
+		$(BINARIES_DIR)/efi-part/
 endef
 endif # BR2_TARGET_GRUB2_HAS_EFI_BOOT
 
@@ -75,7 +80,10 @@ define MENDER_GRUBENV_BUILD_CMDS
 endef
 
 define MENDER_GRUBENV_INSTALL_TARGET_CMDS
-	$(MENDER_GRUBENV_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
+	$(MENDER_GRUBENV_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) \
+		install install-boot-env
+	# The grub-mender-grubenv-* utilities use this file to function.
+	echo 'ENV_DIR=/boot/grub-mender-grubenv' > $(TARGET_DIR)/etc/mender_grubenv.config
 endef
 
 define MENDER_GRUBENV_INSTALL_IMAGES_CMDS
-- 
2.37.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [Buildroot] [PATCH 4/4] package/mender-grubenv: bump version to 2ac898f5924d5870f8394ad8ecd3ef1ab1422e3b
  2022-10-05 21:21 ` [Buildroot] [PATCH 4/4] package/mender-grubenv: bump version to 2ac898f5924d5870f8394ad8ecd3ef1ab1422e3b Adam Duskett
@ 2022-10-06 19:46   ` Thomas Petazzoni via buildroot
  0 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-10-06 19:46 UTC (permalink / raw)
  To: Adam Duskett; +Cc: Angelo Compagnucci, buildroot

On Wed,  5 Oct 2022 14:21:50 -0700
Adam Duskett <aduskett@gmail.com> wrote:

> diff --git a/board/mender/x86_64/genimage-efi.cfg b/board/mender/x86_64/genimage-efi.cfg
> index 10cefe2380..4ed064c498 100644
> --- a/board/mender/x86_64/genimage-efi.cfg
> +++ b/board/mender/x86_64/genimage-efi.cfg
> @@ -3,6 +3,9 @@ image efi-part.vfat {
>  		file EFI {
>  			image = "efi-part/EFI"
>  		}
> +		file grub-mender-grubenv {
> +		  image = "efi-part/grub-mender-grubenv"

Indentation here was not correct. I fixed that small nit and applied to
master. Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [Buildroot] [PATCH 1/4] package/mender: bump version to 3.4.0
  2022-10-05 21:21 [Buildroot] [PATCH 1/4] package/mender: bump version to 3.4.0 Adam Duskett
                   ` (2 preceding siblings ...)
  2022-10-05 21:21 ` [Buildroot] [PATCH 4/4] package/mender-grubenv: bump version to 2ac898f5924d5870f8394ad8ecd3ef1ab1422e3b Adam Duskett
@ 2022-10-06 19:41 ` Thomas Petazzoni via buildroot
  3 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-10-06 19:41 UTC (permalink / raw)
  To: Adam Duskett; +Cc: Angelo Compagnucci, buildroot

On Wed,  5 Oct 2022 14:21:47 -0700
Adam Duskett <aduskett@gmail.com> wrote:

> Updated vendor/github.com/mendersoftware/mender-artifact/LICENSE hash due to a
> year change.
> 
> Signed-off-by: Adam Duskett <aduskett@gmail.com>
> ---
>  package/mender/mender.hash | 6 +++---
>  package/mender/mender.mk   | 2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2022-10-06 19:46 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-05 21:21 [Buildroot] [PATCH 1/4] package/mender: bump version to 3.4.0 Adam Duskett
2022-10-05 21:21 ` [Buildroot] [PATCH 2/4] package/mender-connect: bump version to 2.1.0 Adam Duskett
2022-10-06 19:41   ` Thomas Petazzoni via buildroot
2022-10-05 21:21 ` [Buildroot] [PATCH 3/4] package/mender-artifact: bump version to 3.9.0 Adam Duskett
2022-10-06 19:42   ` Thomas Petazzoni via buildroot
2022-10-05 21:21 ` [Buildroot] [PATCH 4/4] package/mender-grubenv: bump version to 2ac898f5924d5870f8394ad8ecd3ef1ab1422e3b Adam Duskett
2022-10-06 19:46   ` Thomas Petazzoni via buildroot
2022-10-06 19:41 ` [Buildroot] [PATCH 1/4] package/mender: bump version to 3.4.0 Thomas Petazzoni via buildroot

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.