Skip to contentSkip to conversation

package/mender: bump to version 2.0.0

PATCH Superseded aduskett at gmail.com 2 participants 2 messages May 8, 2019 – May 26, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

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

From: Adam Duskett <[email protected]>

In addition:
- Update hashes for license files.
- Add hash for vendor/golang.org/x/text/LICENSE
- Add hash for vendor/github.com/mendersoftware/go-liblzma/LICENSE
- Add new dependency xz, as mender now depends on LZMA.

---
 package/mender/Config.in   |  1 +
 package/mender/mender.hash | 45 ++++++++++++++++++++------------------
 package/mender/mender.mk   |  6 ++++-
 3 files changed, 30 insertions(+), 22 deletions(-)
package/mender/Config.in +1 -0
index 5ab2304e49..e8c29bb33e 100644
@@ -3,6 +3,7 @@ config BR2_PACKAGE_MENDER
 	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_XZ # LZMA
 	select BR2_PACKAGE_UBOOT_TOOLS # runtime
 	select BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV # runtime
 	help
package/mender/mender.hash +24 -21

65 lines not on this page · raw message

package/mender/mender.mk +5 -1
index 07f6e5e5f9..70d84b22f8 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MENDER_VERSION = 1.7.0
+MENDER_VERSION = 2.0.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
@@ -25,6 +25,8 @@ MENDER_LICENSE_FILES = \
 	vendor/golang.org/x/sys/LICENSE \
 	vendor/golang.org/x/net/LICENSE \
 	vendor/github.com/bmatsuo/lmdb-go/LICENSE.md \
+	vendor/golang.org/x/text/LICENSE \
+	vendor/github.com/mendersoftware/go-liblzma/LICENSE \
 	vendor/github.com/davecgh/go-spew/LICENSE \
 	vendor/github.com/Sirupsen/logrus/LICENSE \
 	vendor/github.com/stretchr/testify/LICENSE \
@@ -33,6 +35,8 @@ MENDER_LICENSE_FILES = \
 	vendor/github.com/ungerik/go-sysfs/LICENSE \
 	vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md
 
+MENDER_DEPENDENCIES = xz
+
 MENDER_LDFLAGS = -X main.Version=$(MENDER_VERSION)
 
 define MENDER_INSTALL_CONFIG_FILES
Signature · 1 line
2.21.0
#1 lore raw

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

Hello Adam,

Quoted 4 lines · On Wed, 8 May 2019 11:49:24 -0400 aduskett at gmail.com wrote:

From: Adam Duskett <[email protected]>

In addition:
- Update hashes for license files.

As we have already explain a zillion times already, when the license hashes are changed, there *must* be an explanation in the commit log about what changed in the license file(s).

package/mender/Config.in config BR2_PACKAGE_MENDER · line 6

Quoted 9 lines
package/mender/Config.in +1 -0
index 5ab2304e49..e8c29bb33e 100644
@@ -3,6 +3,7 @@ config BR2_PACKAGE_MENDER
 	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_XZ # LZMA

The "LZMA" comment is not necessary, we typically don't have such comments.

Could you resend with an updated commit log that explains the license file changes ?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com