diff mbox series

[3/4] package/mender: bump version to 2.5.0

Message ID 20210320222835.3951325-4-aduskett@gmail.com
State Accepted
Headers show
Series mender updates | expand

Commit Message

Adam Duskett March 20, 2021, 10:28 p.m. UTC 
From: Adam Duskett <Aduskett@rivian.com>

Other changes:
  - Add host-pkgconf as a dependency. It's used to find OpenSSL.
  - Set new license hashes.

Signed-off-by: Adam Duskett <Aduskett@rivian.com>
---
 package/mender/mender.hash | 13 ++++++++-----
 package/mender/mender.mk   |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

Comments

Thomas Petazzoni March 30, 2021, 8:30 p.m. UTC | #1 
On Sat, 20 Mar 2021 15:28:34 -0700
aduskett@gmail.com wrote:

> From: Adam Duskett <Aduskett@rivian.com>
> 
> Other changes:
>   - Add host-pkgconf as a dependency. It's used to find OpenSSL.
>   - Set new license hashes.
> 
> Signed-off-by: Adam Duskett <Aduskett@rivian.com>
> ---
>  package/mender/mender.hash | 13 ++++++++-----
>  package/mender/mender.mk   |  4 ++--
>  2 files changed, 10 insertions(+), 7 deletions(-)

Applied to master, thanks.

Thomas
diff mbox series

Patch

diff --git a/package/mender/mender.hash b/package/mender/mender.hash
index 43bb92d6ed..52e321f7e7 100644
--- a/package/mender/mender.hash
+++ b/package/mender/mender.hash
@@ -1,31 +1,33 @@ 
 # Locally computed:
-sha256  ff9dccef31b0c6c1710ee767f8f05bc8038034e50968b207ee1a09a10f801ab4  2.4.2.tar.gz
+sha256  339bf97b3680315baf93143745b14b8638c5402094f94a4cc5a6ea63a2568da8  2.5.0.tar.gz
 
 # Vendor licenses
 # Generated with sed '/^[A-Za-z0-9_]/s/^/sha256  /' LIC_FILES_CHKSUM.sha256
 
 # Apache-2.0 license.
 sha256  b4acfcfa2a0ba1a8c82ec3965fbcee886cff8394ca4214e0ddac0a36beb1e05a  LICENSE
-sha256  32714818ad6f98ee0185a52e23a475d89122e3efd2b2c26c733781c28e798c99  vendor/github.com/mendersoftware/mendertesting/LICENSE
 sha256  32714818ad6f98ee0185a52e23a475d89122e3efd2b2c26c733781c28e798c99  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  f4a394d9345ba64dd2796dc552c31af99c4b686a46c0eeda6538038732f771a9  vendor/github.com/mendersoftware/progressbar/LICENSE
 #
 # BSD 2 Clause license.
 sha256  8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86  vendor/github.com/pkg/errors/LICENSE
+sha256  e4646a82a976369d7ae8f6ed5c11d35dc0af18433a8ccc24c85b459ad8b95128  vendor/github.com/godbus/dbus/LICENSE
 #
 # BSD 3 Clause license.
+sha256  16f848582e4b276a7392cd34496b7a33d6f65c0e190c163ff3a056a7c61219ce  vendor/github.com/klauspost/compress/LICENSE
 sha256  2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477  vendor/github.com/pmezard/go-difflib/LICENSE
 sha256  2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067  vendor/golang.org/x/crypto/LICENSE
 sha256  2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067  vendor/golang.org/x/sys/LICENSE
-sha256  2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067  vendor/golang.org/x/net/LICENSE
 sha256  0634b008cee55ca01f0888d2f5aba2d34e66c3f52c31a4e16a5d5d33d0c2a03e  vendor/github.com/bmatsuo/lmdb-go/LICENSE.md
-sha256  2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067  vendor/golang.org/x/text/LICENSE
 sha256  87640bc4df2ceb1559f268a3db1ba859ab780f7ba5b1b4545173d4680a3d918b  vendor/github.com/remyoudompheng/go-liblzma/LICENSE
 #
 # ISC license.
 sha256  1b93a317849ee09d3d7e4f1d20c2b78ddb230b4becb12d7c224c927b9d470251  vendor/github.com/davecgh/go-spew/LICENSE
 #
 # MIT license.
+sha256  6d2de1cde19c4d2bd8bcd9aaa1d581f4cfa3db9cf71896140330eaa2f2687685  vendor/github.com/klauspost/pgzip/LICENSE
 sha256  51a0c9ec7f8b7634181b8d4c03e5b5d204ac21d6e72f46c313973424664b2e6b  vendor/github.com/sirupsen/logrus/LICENSE
 sha256  f8e536c1c7b695810427095dc85f5f80d44ff7c10535e8a9486cf393e2599189  vendor/github.com/stretchr/testify/LICENSE
 sha256  ffa15bdce332058a03a1d923910864fb6e58bf6df66a0e3914284725b327183e  vendor/github.com/ungerik/go-sysfs/LICENSE
@@ -33,9 +35,10 @@  sha256  da277af11b85227490377fbcac6afccc68be560c4fff36ac05ca62de55345fd7  vendor
 sha256  b2663894033a05fd80261176cd8da1d72546e25842d5c1abcc852ca23b6b61b0  vendor/github.com/stretchr/objx/LICENSE
 sha256  95b8ef9c4137a8f75ddd3101ffdc4cfd594fa875b261697b68baddc16b0e537c  vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE
 sha256  d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b  vendor/gopkg.in/yaml.v3/LICENSE
+sha256  08eab1118c80885fa1fa6a6dd7303f65a379fcb3733e063d20d1bbc2c76e6fa1  vendor/github.com/mattn/go-isatty/LICENSE
 #
 # OpenLDAP Public License
 sha256  310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569  vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md
 
 # sha256 of all the vendor licenses combined
-sha256  d872f963cdd188b384eb673bf11002e4afb94830710f420a3f3d322695801847  LIC_FILES_CHKSUM.sha256
+sha256  76417c090c1a53d6fb1409998346e59e43f13139732a46dfc8732e0b4aebba2b  LIC_FILES_CHKSUM.sha256
diff --git a/package/mender/mender.mk b/package/mender/mender.mk
index 16d7178a6b..a5b5654ff9 100644
--- a/package/mender/mender.mk
+++ b/package/mender/mender.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-MENDER_VERSION = 2.4.2
+MENDER_VERSION = 2.5.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
@@ -35,7 +35,7 @@  MENDER_LICENSE_FILES = \
 	vendor/gopkg.in/yaml.v3/LICENSE \
 	vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md
 
-MENDER_DEPENDENCIES = openssl xz
+MENDER_DEPENDENCIES = host-pkgconf openssl xz
 
 MENDER_LDFLAGS = -X github.com/mendersoftware/mender/conf.Version=$(MENDER_VERSION)