package/mender: bump to version 2.0.0
PATCH v2 1/1 package/mender: bump to version 2.0.0
From: Adam Duskett <[email protected]>
In addition:
- Update hashes for license files due to copyright year change.
- 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.
---
v1 -> v2:
- Remove LZMA comment (Thomas)
- Add "due to copyright year" at the end of "Update hashes for license files. (Thomas)
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
@@ -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 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
@@ -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
Thomas Petazzoni
AppliedPATCH v2 1/1 package/mender: bump to version 2.0.0
Hello Adam,
Quoted 9 lines · On Wed, 29 May 2019 08:37:27 -0400 aduskett at gmail.com wrote:
From: Adam Duskett <[email protected]>
In addition:
- Update hashes for license files due to copyright year change.
- 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.Signed-off-by Adam Duskett <[email protected]>
I've applied to next, but there were still a few issues to fix up.
package/mender/mender.hash line 5
Quoted 12 lines
package/mender/mender.hash +2
-2@@ -1,41 +1,44 @@ # Locally computed: -sha256 caee18d1b8446df0cbb9a9c5a1c040d7eb1924332da94c3489494443a8077eb8 1.7.0.tar.gz +sha256 af37a11c4189097b485254c35450f289b078bc61f6a230d6540743f202d81b98 2.0.0.tar.gz # Apache-2.0 license, locally computed -sha256 98ed35b5a138f58164b5c0dbccd9d7f01ef4d84b9dba01e896f0a3241c50c0f7 LICENSE +sha256 beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 LICENSE
So, we have the hash for the LICENSE once.
package/mender/mender.hash line 11
Quoted 12 lines
package/mender/mender.hash +1
-6# Vendor licenses # Generated with sed '/^[A-Za-z0-9_]/s/^/sha256 /' LIC_FILES_CHKSUM.sha256 # Apache-2.0 license. -sha256 98ed35b5a138f58164b5c0dbccd9d7f01ef4d84b9dba01e896f0a3241c50c0f7 vendor/github.com/mendersoftware/mendertesting/LICENSE -sha256 3591f687e2d6f49c83b1ec69577e8110afbde80be5ec81791bd86d2838ccd3de vendor/github.com/mendersoftware/log/LICENSE -sha256 bbb303820971c294a9a8e5eba5affcf1379036e877ea61c11cbf9400b2949483 vendor/github.com/mendersoftware/log/COPYING -sha256 3591f687e2d6f49c83b1ec69577e8110afbde80be5ec81791bd86d2838ccd3de vendor/github.com/mendersoftware/scopestack/LICENSE -sha256 bbb303820971c294a9a8e5eba5affcf1379036e877ea61c11cbf9400b2949483 vendor/github.com/mendersoftware/scopestack/COPYING -sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 vendor/github.com/mendersoftware/mender-artifact/LICENSE +sha256 beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 LICENSE
And then a second time.
package/mender/mender.hash line 17
Quoted 6 lines
package/mender/mender.hash +6
-0+sha256 beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 vendor/github.com/mendersoftware/mendertesting/LICENSE +sha256 3591f687e2d6f49c83b1ec69577e8110afbde80be5ec81791bd86d2838ccd3de vendor/github.com/mendersoftware/log/LICENSE +sha256 bbb303820971c294a9a8e5eba5affcf1379036e877ea61c11cbf9400b2949483 vendor/github.com/mendersoftware/log/COPYING +sha256 3591f687e2d6f49c83b1ec69577e8110afbde80be5ec81791bd86d2838ccd3de vendor/github.com/mendersoftware/scopestack/LICENSE +sha256 bbb303820971c294a9a8e5eba5affcf1379036e877ea61c11cbf9400b2949483 vendor/github.com/mendersoftware/scopestack/COPYING +sha256 beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 vendor/github.com/mendersoftware/mender-artifact/LICENSE
In addition, in all the changes in this file, you are switching between one space between the hash type and the hash itself to two white spaces. Due to this, the patch has a lot of noise: even if the hash didn't change, your white space change causes a modification. So I reverted all those white space changes to minimize the patch, and make it clear which hashes have changed.
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com