diff mbox series

package/mender_grubenv: bump to version 1a7db967495bbe8be53b7a69dcb42822f39d9a74

Message ID 20211103195520.147558-5-aduskett@gmail.com
State Accepted
Headers show
Series package/mender_grubenv: bump to version 1a7db967495bbe8be53b7a69dcb42822f39d9a74 | expand

Commit Message

Adam Duskett Nov. 3, 2021, 7:55 p.m. UTC 
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 <aduskett@gmail.com>
---
 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(-)

Comments

Thomas Petazzoni Nov. 3, 2021, 9:20 p.m. UTC | #1 
On Wed,  3 Nov 2021 12:55:20 -0700
Adam Duskett <aduskett@gmail.com> 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
> 
>   - Update the LICENSE hash as the year has changed.
> 
> Signed-off-by: Adam Duskett <aduskett@gmail.com>
> ---
>  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
diff mbox series

Patch

diff --git a/package/mender-grubenv/Config.in b/package/mender-grubenv/Config.in
index 28b4bb7074..97f785ad3f 100644
--- a/package/mender-grubenv/Config.in
+++ b/package/mender-grubenv/Config.in
@@ -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
diff --git a/package/mender-grubenv/mender-grubenv.hash b/package/mender-grubenv/mender-grubenv.hash
index b6b9db72a7..fcc4e02cbe 100644
--- a/package/mender-grubenv/mender-grubenv.hash
+++ b/package/mender-grubenv/mender-grubenv.hash
@@ -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
diff --git a/package/mender-grubenv/mender-grubenv.mk b/package/mender-grubenv/mender-grubenv.mk
index 1be722233c..08c6a5f240 100644
--- a/package/mender-grubenv/mender-grubenv.mk
+++ b/package/mender-grubenv/mender-grubenv.mk
@@ -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