package/mender: bump to version 3.1.0

PATCH Applied Adam Duskett 2 participants 10 messages Nov 3, 2021

lore

Share & tools

lore

Adam Duskett

author

2021-11-03 19:55 UTC #0 lore raw

PATCH 1/1 package/mender: bump to version 3.1.0

Signed-off-by Adam Duskett <[email protected]>

---
 package/mender/mender.hash | 2 +-
 package/mender/mender.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

package/mender/mender.hash +1 -1

index c2bbbe5fc1..40d82f072f 100644
@@ -1,5 +1,5 @@
 # Locally computed:
-sha256  d68839eb493175a05371eec8e6ec8691ccc22c999614b9954923a0b5ebe56840  2.6.0.tar.gz
+sha256  716ba7110dd68cdafc5caa989706ff67bbac0617c284d666aa81605850be5763  3.1.0.tar.gz
 
 # Vendor licenses
 # Generated with sed '/^[A-Za-z0-9_]/s/^/sha256  /' LIC_FILES_CHKSUM.sha256

package/mender/mender.mk +1 -1

index a110caf551..ec48a716ed 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MENDER_VERSION = 2.6.0
+MENDER_VERSION = 3.1.0
 MENDER_SITE = https://github.com/mendersoftware/mender/archive
 MENDER_SOURCE = $(MENDER_VERSION).tar.gz
 MENDER_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT, OLDAP-2.8

Signature · 6 lines

2.32.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Adam Duskett

author

2021-11-03 19:55 UTC #1 lore raw

PATCH 1/1 package/mender: install io.mender.UpdateManager.conf dbus file

This file adds a DBus endpoint for the UpdateControlMap, which allows a user to set the ID and Priority of a given update process

Signed-off-by Adam Duskett <[email protected]>

---
 package/mender/mender.mk | 3 +++
 1 file changed, 3 insertions(+)

package/mender/mender.mk +3 -0

index ec48a716ed..f1366a9deb 100644
@@ -92,6 +92,9 @@ MENDER_DEPENDENCIES += libglib2
 define MENDER_INSTALL_DBUS_AUTHENTICATION_MANAGER_CONF
 	$(INSTALL) -D -m 0755 $(@D)/support/dbus/io.mender.AuthenticationManager.conf \
 		      $(TARGET_DIR)/etc/dbus-1/system.d/io.mender.AuthenticationManager.conf
+
+	$(INSTALL) -D -m 0755 $(@D)/support/dbus/io.mender.UpdateManager.conf \
+		      $(TARGET_DIR)/etc/dbus-1/system.d/io.mender.UpdateManager.conf
 endef
 MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_DBUS_AUTHENTICATION_MANAGER_CONF
 else

Signature · 6 lines

2.32.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Thomas Petazzoni

Applied

2021-11-03 21:18 UTC #2 lore raw

Re: [Buildroot] [PATCH] package/mender: install io.mender.UpdateManager.conf dbus file

Quoted 7 lines · On Wed, 3 Nov 2021 12:55:17 -0700 Adam Duskett <[email protected]> wrote:

This file adds a DBus endpoint for the UpdateControlMap, which allows a user to set the ID and Priority of a given update process
Signed-off-by Adam Duskett <[email protected]>
---
 package/mender/mender.mk | 3 +++
 1 file changed, 3 insertions(+)

Applied to master, thanks.

Thomas

Signature · 7 lines

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

Adam Duskett

author

2021-11-03 19:55 UTC #3 lore raw

PATCH 1/1 package/mender-artifact: bump to version 3.6.1

In reply to Adam Duskett

Other changes:
- Update license files hash due to the progressbar library changing versions from v0.0.2 to v0.0.3

- Remove HOST_MENDER_ARTIFACT_BUILD_TARGETS = cli/mender-artifact as commit a79edc3e7632f38de0dfeaa5a3c72567318e8079 removed the cli/mender-artifact directory.

- Change -X main.Version= to
-X github.com/mendersoftware/mender-artifact/cli.Version

Signed-off-by Adam Duskett <[email protected]>

---
 package/mender-artifact/mender-artifact.hash | 6 +++---
 package/mender-artifact/mender-artifact.mk   | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

package/mender-artifact/mender-artifact.hash +3 -3

index 175865bb67..27f18862bc 100644
@@ -1,6 +1,6 @@
 # Locally computed:
-sha256  8f5b69a6598dc071e6a0f2102dbd38a003e7db6be5794116d701531d6a740a46  mender-artifact-3.5.1.tar.gz
-sha256  0afbd1092d57f70da125041350363c3761802e807be80c7f1dfc005fea962b25  LIC_FILES_CHKSUM.sha256
+sha256  c46c305616cf53e65b786862addf04d97c388e451f11478886967b494c4ce5d9  mender-artifact-3.6.1.tar.gz
+sha256  ac23df36801aea6a28685b60a742f68f99d357e0d9973d5c36aa2e72599d8e2a  LIC_FILES_CHKSUM.sha256
 
 # License hash extracted from LIC_FILES_CHKSUM.sha256 using the
 # following command:

@@ -10,7 +10,7 @@ sha256  0afbd1092d57f70da125041350363c3761802e807be80c7f1dfc005fea962b25  LIC_FI
 # Apache 2.0 licenses.
 sha256  b4acfcfa2a0ba1a8c82ec3965fbcee886cff8394ca4214e0ddac0a36beb1e05a  LICENSE
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  vendor/github.com/minio/sha256-simd/LICENSE
-sha256  f4a394d9345ba64dd2796dc552c31af99c4b686a46c0eeda6538038732f771a9  vendor/github.com/mendersoftware/progressbar/LICENSE
+sha256  8f5d89b47d7a05a199b77b7e0f362dad391d451ebda4ef48ba11c50c071564c7  vendor/github.com/mendersoftware/progressbar/LICENSE
 #
 # BSD 2 Clause licenses.
 sha256  8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86  vendor/github.com/pkg/errors/LICENSE

package/mender-artifact/mender-artifact.mk +2 -4

index 8a77e67b8c..34d0cd9469 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HOST_MENDER_ARTIFACT_VERSION = 3.5.1
+HOST_MENDER_ARTIFACT_VERSION = 3.6.1
 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
 HOST_MENDER_ARTIFACT_LICENSE_FILES = \

@@ -39,9 +39,7 @@ HOST_MENDER_ARTIFACT_DEPENDENCIES = host-xz
 # permission issues when cleaning.
 HOST_MENDER_ARTIFACT_GO_ENV = GOFLAGS="-mod=vendor"
 
-HOST_MENDER_ARTIFACT_LDFLAGS = -X main.Version=$(HOST_MENDER_ARTIFACT_VERSION)
-
-HOST_MENDER_ARTIFACT_BUILD_TARGETS = cli/mender-artifact
+HOST_MENDER_ARTIFACT_LDFLAGS = -X github.com/mendersoftware/mender-artifact/cli.Version=$(HOST_MENDER_ARTIFACT_VERSION)
 
 HOST_MENDER_ARTIFACT_BIN_NAME = mender-artifact
 HOST_MENDER_ARTIFACT_INSTALL_BINS = $(HOST_MENDER_ARTIFACT_BIN_NAME)

Signature · 6 lines

2.32.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Thomas Petazzoni

Applied

2021-11-03 21:18 UTC #4 lore raw

Re: [Buildroot] [PATCH] package/mender-artifact: bump to version 3.6.1

Quoted 8 lines · On Wed, 3 Nov 2021 12:55:18 -0700 Adam Duskett <[email protected]> wrote:

Other changes:
- Update license files hash due to the progressbar library changing versions from v0.0.2 to v0.0.3
- Remove HOST_MENDER_ARTIFACT_BUILD_TARGETS = cli/mender-artifact as commit a79edc3e7632f38de0dfeaa5a3c72567318e8079 removed the cli/mender-artifact directory.

Quoted 8 lines

- Change -X main.Version= to
-X github.com/mendersoftware/mender-artifact/cli.Version
Signed-off-by Adam Duskett <[email protected]>
---
 package/mender-artifact/mender-artifact.hash | 6 +++---
 package/mender-artifact/mender-artifact.mk   | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

Applied to master, thanks.

Thomas

Signature · 7 lines

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

Adam Duskett

author

2021-11-03 19:56 UTC #5 lore raw

PATCH 1/1 package/mender-grubenv: fix grub module checks

In reply to Adam Duskett

Commit 3efb5e31fc05705ce3c46b1f0ec031978a5cfab6 broke mender-grubenv by splititng up BR2_TARGET_GRUB2_BUILTIN_MODULES and BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI. Indeed, when a user now builds a system with EFI, the MENDER_GRUBENV_MODULES_MISSING list always returns a full list of grub modules, resulting in the error condition on line 46 to trigger.

Add an ifeq that checks BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI if grub_efi is selected.

Signed-off-by Adam Duskett <[email protected]>

---
 package/mender-grubenv/mender-grubenv.mk | 6 ++++++
 1 file changed, 6 insertions(+)

package/mender-grubenv/mender-grubenv.mk +6 -0

index f06dbbe35c..1be722233c 100644
@@ -31,9 +31,15 @@ MENDER_GRUBENV_DEFINES = \
 # 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 regexp
+ifeq ($(BR2_TARGET_GRUB2_X86_64_EFI),y)
+MENDER_GRUBENV_MODULES_MISSING = \
+	$(filter-out $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI)),\
+		$(MENDER_GRUBENV_MANDATORY_MODULES))
+else
 MENDER_GRUBENV_MODULES_MISSING = \
 	$(filter-out $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES)),\
 		$(MENDER_GRUBENV_MANDATORY_MODULES))
+endif
 
 ifeq ($(BR2_PACKAGE_MENDER_GRUBENV)$(BR_BUILDING),yy)
 ifneq ($(MENDER_GRUBENV_MODULES_MISSING),)

Signature · 6 lines

2.32.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Thomas Petazzoni

2021-11-03 21:20 UTC #6 lore raw

Re: [Buildroot] [PATCH] package/mender-grubenv: fix grub module checks

Hello Adam,

Quoted 1 line · On Wed, 3 Nov 2021 12:55:19 -0700 Adam Duskett <[email protected]> wrote:

+ifeq ($(BR2_TARGET_GRUB2_X86_64_EFI),y)

Are you sure this is correct? Indeed I believe BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI is also used for the BR2_TARGET_GRUB2_I386_EFI, BR2_TARGET_GRUB2_ARM_EFI and BR2_TARGET_GRUB2_ARM64_EFI cases, isn't it ?

package/mender-grubenv/mender-grubenv.mk MENDER_GRUBENV_DEFINES = \ · line 40

Quoted 6 lines

package/mender-grubenv/mender-grubenv.mk +4 -0

+MENDER_GRUBENV_MODULES_MISSING = \
+	$(filter-out $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI)),\
+		$(MENDER_GRUBENV_MANDATORY_MODULES))
+else
 MENDER_GRUBENV_MODULES_MISSING = \
 	$(filter-out $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES)),\

Also BR2_TARGET_GRUB2_BUILTIN_MODULES no longer exists, it's BR2_TARGET_GRUB2_BUILTIN_MODULES_PC.

I'm really sorry we overlooked this when doing the changes on grub2 :-/

Best regards,

Thomas

Signature · 7 lines

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

Adam Duskett

author

2021-11-03 19:56 UTC #7 lore raw

PATCH 1/1 package/mender_grubenv: bump to version 1a7db967495bbe8be53b7a69dcb42822f39d9a74

In reply to Adam Duskett

Other changes:
- Drop depends on !BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV as mender-grubenv no longer uses fw_printenv and fw_setenv and instead provides grub-mender-grubenv-print and grub-mender-grubenv-set

- Update the LICENSE hash as the year has changed.

Signed-off-by Adam Duskett <[email protected]>

---
 package/mender-grubenv/Config.in           | 7 -------
 package/mender-grubenv/mender-grubenv.hash | 4 ++--
 package/mender-grubenv/mender-grubenv.mk   | 2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

package/mender-grubenv/Config.in +0 -7

index 28b4bb7074..97f785ad3f 100644
@@ -2,8 +2,6 @@ config BR2_PACKAGE_MENDER_GRUBENV
 	bool "mender-grubenv"
 	depends on BR2_TARGET_GRUB2_ARCH_SUPPORTS
 	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
 	help
 	  Contains the boot scripts and tools used by Mender to

@@ -36,8 +34,3 @@ comment "mender-grubenv needs a grub2 bootloader"
 	depends on BR2_TARGET_GRUB2_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_MENDER
 	depends on !BR2_TARGET_GRUB2
-
-comment "mender-grubenv does not work with uboot-tools fw_printenv"
-	depends on BR2_TARGET_GRUB2_ARCH_SUPPORTS
-	depends on BR2_PACKAGE_MENDER
-	depends on BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV

package/mender-grubenv/mender-grubenv.hash +2 -2

index b6b9db72a7..fcc4e02cbe 100644
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 5be4222a6934813da431ae472a633e766b73f4614020745b777c15c65bcfd032 mender-grubenv-f39c2c7ec7c9c24aae0108a9b04a0e6e61a3e96b.tar.gz
-sha256 32714818ad6f98ee0185a52e23a475d89122e3efd2b2c26c733781c28e798c99 LICENSE
+sha256 00a574d2bed8d54ba6739700da789a420a02de900df56dd2cfbe0df460a98dca mender-grubenv-1a7db967495bbe8be53b7a69dcb42822f39d9a74.tar.gz
+sha256 b4acfcfa2a0ba1a8c82ec3965fbcee886cff8394ca4214e0ddac0a36beb1e05a LICENSE

package/mender-grubenv/mender-grubenv.mk +1 -1

index 1be722233c..08c6a5f240 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MENDER_GRUBENV_VERSION = f39c2c7ec7c9c24aae0108a9b04a0e6e61a3e96b
+MENDER_GRUBENV_VERSION = 1a7db967495bbe8be53b7a69dcb42822f39d9a74
 MENDER_GRUBENV_SITE = $(call github,mendersoftware,grub-mender-grubenv,$(MENDER_GRUBENV_VERSION))
 MENDER_GRUBENV_LICENSE = Apache-2.0
 MENDER_GRUBENV_LICENSE_FILES = LICENSE

Signature · 6 lines

2.32.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Thomas Petazzoni

Applied

2021-11-03 21:20 UTC #8 lore raw

Re: [Buildroot] [PATCH] package/mender_grubenv: bump to version 1a7db967495bbe8be53b7a69dcb42822f39d9a74

Quoted 5 lines · On Wed, 3 Nov 2021 12:55:20 -0700 Adam Duskett <[email protected]> wrote:

Other changes:
- Drop depends on !BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV as mender-grubenv no longer uses fw_printenv and fw_setenv and instead provides grub-mender-grubenv-print and grub-mender-grubenv-set

Quoted 8 lines

- Update the LICENSE hash as the year has changed.
Signed-off-by Adam Duskett <[email protected]>
---
 package/mender-grubenv/Config.in           | 7 -------
 package/mender-grubenv/mender-grubenv.hash | 4 ++--
 package/mender-grubenv/mender-grubenv.mk   | 2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

Applied to master, thanks.

Thomas

Signature · 7 lines

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

Thomas Petazzoni

Applied

2021-11-03 21:17 UTC #9 lore raw

In reply to Adam Duskett

Quoted 5 lines · On Wed, 3 Nov 2021 12:55:16 -0700 Adam Duskett <[email protected]> wrote:

Signed-off-by Adam Duskett <[email protected]>

---
 package/mender/mender.hash | 2 +-
 package/mender/mender.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas

Signature · 7 lines

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