diff mbox series

[1/1] package/mender: bump version to 2.0.0

Message ID CABWPoFEDQS+9+NscGhw-qWs_PQNaiQvMyHwYb=UrXU1n_SUqxg@mail.gmail.com
State Changes Requested
Headers show
Series [1/1] package/mender: bump version to 2.0.0 | expand

Commit Message

Raul Hidalgo Caballero May 27, 2019, 8 a.m. UTC

Comments

Thomas Petazzoni May 27, 2019, 9:14 a.m. UTC | #1 
Hello Raul,

On Mon, 27 May 2019 10:00:25 +0200
Raul Hidalgo Caballero <deinok@deinok.com> wrote:

> 

Here as well, please send with git send-email. But in addition, I'd
like to mention we already had a patch bumping mender to 2.0.0 from
Adam Duskett, but it had some minor issues. I'm sure Adam will send a
new iteration of it soon.

Your patch is probably incorrect, because you bump to 2.0.0 without
updating the hash of the license files, while they apparently changed
between 1.7.0 and 2.0.0, so your patch most likely breaks "make
legal-info".

Best regards,

Thomas
Thomas Petazzoni May 27, 2019, 12:52 p.m. UTC | #2 
Hello Raul,

Please keep the Buildroot mailing list in Cc (i.e use "Reply All"
instead of "Reply"), and also you should prefer bottom-posting instead
of top-posting.

On Mon, 27 May 2019 14:43:58 +0200
Raul Hidalgo Caballero <deinok@deinok.com> wrote:

> Okey, I will wait for Adam.
> Also, what kind of new issues does it have?

Are you asking about the issues caused by your patch, or Adam's patch ?

In Adam's patch, the only minor issue is that he was changing the hash
of the different license files (which is correct since they changed in
Mender 2.0.0), but he didn't explain what the license changes were in
the commit log.

Best regards,

Thomas
diff mbox series

Patch

From 257c4b0cb1cc4d2a989b5e306a5f8811c44ea4eb Mon Sep 17 00:00:00 2001
From: Raul Hidalgo Caballero <deinok@deinok.com>
Date: Mon, 27 May 2019 09:16:02 +0200
Subject: [PATCH 1/1] package/mender: bump version to 2.0.0

Signed-off-by: deinok <deinok@deinok.com>
---
 package/mender/Config.in   |  1 +
 package/mender/mender.conf | 16 ++++++++--------
 package/mender/mender.hash |  2 +-
 package/mender/mender.mk   |  3 ++-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/package/mender/Config.in b/package/mender/Config.in
index 5ab2304e49..3fc93f9f06 100644
--- a/package/mender/Config.in
+++ b/package/mender/Config.in
@@ -5,6 +5,7 @@  config BR2_PACKAGE_MENDER
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_UBOOT_TOOLS # runtime
 	select BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV # runtime
+	select BR2_PACKAGE_XZ
 	help
 	  Mender is an open source over-the-air (OTA) software updater
 	  for embedded Linux devices. Mender comprises a client
diff --git a/package/mender/mender.conf b/package/mender/mender.conf
index 979f16aaf6..7fb2afdf36 100644
--- a/package/mender/mender.conf
+++ b/package/mender/mender.conf
@@ -1,10 +1,10 @@ 
 {
-  "InventoryPollIntervalSeconds": 1800,
-  "UpdatePollIntervalSeconds": 1800,
-  "RetryPollIntervalSeconds": 300,
-  "RootfsPartA": "mmcblk0p2",
-  "RootfsPartB": "mmcblk0p3",
-  "ServerCertificate": "/etc/mender/server.crt",
-  "ServerURL": "https://docker.mender.io",
-  "TenantToken": "dummy"
+	"InventoryPollIntervalSeconds": 1800,
+	"UpdatePollIntervalSeconds": 1800,
+	"RetryPollIntervalSeconds": 300,
+	"RootfsPartA": "/dev/mmcblk0p2",
+	"RootfsPartB": "/dev/mmcblk0p3",
+	"ServerCertificate": "/etc/mender/server.crt",
+	"ServerURL": "https://hosted.mender.io",
+	"TenantToken": "dummy"
 }
diff --git a/package/mender/mender.hash b/package/mender/mender.hash
index 89aec239b1..71ba23afdf 100644
--- a/package/mender/mender.hash
+++ b/package/mender/mender.hash
@@ -1,5 +1,5 @@ 
 # 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
diff --git a/package/mender/mender.mk b/package/mender/mender.mk
index 07f6e5e5f9..132b09c738 100644
--- a/package/mender/mender.mk
+++ b/package/mender/mender.mk
@@ -4,10 +4,11 @@ 
 #
 ################################################################################
 
-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
+MENDER_DEPENDENCIES = xz
 
 # Vendor license paths generated with:
 #    awk '{print $2}' LIC_FILES_CHKSUM.sha256 | grep vendor
-- 
2.17.1