Skip to contentSkip to conversation

package/mender: bump to version 3.3.0

PATCH Applied Adam Duskett 3 participants 8 messages Jun 22, 2022 – Jul 23, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 package/mender: bump to version 3.3.0

License hash changes:

New:
- vendor/github.com/gorilla/websocket/LICENSE: BSD-2-Clause
- vendor/github.com/klauspost/cpuid/v2/LICENSE: MIT
- vendor/golang.org/x/term/LICENSE: BSD-2-Clause

Removed:
- vendor/golang.org/x/crypto/LICENSE
- vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE

Updated:
- LICENSE: Update copyright year

- vendor/github.com/mendersoftware/mender-artifact/LICENSE:
- Updated copyright year

- vendor/github.com/klauspost/compress/LICENSE:
- Added Apache 2.0 license for gzhttp/* directory

---
 package/mender/mender.hash | 15 ++++++++-------
 package/mender/mender.mk   |  7 ++++---
 2 files changed, 12 insertions(+), 10 deletions(-)
package/mender/mender.hash +8 -7
index 40d82f072f..0fa8064ca4 100644
@@ -1,12 +1,12 @@
 # Locally computed:
-sha256  716ba7110dd68cdafc5caa989706ff67bbac0617c284d666aa81605850be5763  3.1.0.tar.gz
+sha256  9d8b2438e358dacde58c3692bd038ed9938392f1a526c49d919f73a2dff77eee  3.3.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/mender-artifact/LICENSE
+sha256  1033348db7606a7e61b6484f293847cf8d7a35766efebb97e304d4bd5d7f3f6b  LICENSE
+sha256  b4acfcfa2a0ba1a8c82ec3965fbcee886cff8394ca4214e0ddac0a36beb1e05a  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  8f5d89b47d7a05a199b77b7e0f362dad391d451ebda4ef48ba11c50c071564c7  vendor/github.com/mendersoftware/progressbar/LICENSE
@@ -14,26 +14,27 @@ sha256  8f5d89b47d7a05a199b77b7e0f362dad391d451ebda4ef48ba11c50c071564c7  vendor
 # BSD 2 Clause license.
 sha256  8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86  vendor/github.com/pkg/errors/LICENSE
 sha256  e4646a82a976369d7ae8f6ed5c11d35dc0af18433a8ccc24c85b459ad8b95128  vendor/github.com/godbus/dbus/LICENSE
+sha256  2be1b548b0387ca8948e1bb9434e709126904d15f622cc2d0d8e7f186e4d122d  vendor/github.com/gorilla/websocket/LICENSE
 #
 # BSD 3 Clause license.
-sha256  16f848582e4b276a7392cd34496b7a33d6f65c0e190c163ff3a056a7c61219ce  vendor/github.com/klauspost/compress/LICENSE
+sha256  0d9e582ee4bff57bf1189c9e514e6da7ce277f9cd3bc2d488b22fbb39a6d87cf  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  0634b008cee55ca01f0888d2f5aba2d34e66c3f52c31a4e16a5d5d33d0c2a03e  vendor/github.com/bmatsuo/lmdb-go/LICENSE.md
 sha256  87640bc4df2ceb1559f268a3db1ba859ab780f7ba5b1b4545173d4680a3d918b  vendor/github.com/remyoudompheng/go-liblzma/LICENSE
+sha256  2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067  vendor/golang.org/x/term/LICENSE
 #
 # ISC license.
 sha256  1b93a317849ee09d3d7e4f1d20c2b78ddb230b4becb12d7c224c927b9d470251  vendor/github.com/davecgh/go-spew/LICENSE
 #
 # MIT license.
 sha256  6d2de1cde19c4d2bd8bcd9aaa1d581f4cfa3db9cf71896140330eaa2f2687685  vendor/github.com/klauspost/pgzip/LICENSE
+sha256  5d966570d7a442d4e969892860a914e542c97f262c873baee8f0aa48e1f40212  vendor/github.com/klauspost/cpuid/v2/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
 sha256  da277af11b85227490377fbcac6afccc68be560c4fff36ac05ca62de55345fd7  vendor/github.com/urfave/cli/v2/LICENSE
 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
 #
@@ -41,4 +42,4 @@ sha256  08eab1118c80885fa1fa6a6dd7303f65a379fcb3733e063d20d1bbc2c76e6fa1  vendor
 sha256  310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569  vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md
 
 # sha256 of all the vendor licenses combined
-sha256  4f3541ea69b9b6e3959679576c146b42ba9a840a9dc4e593bff43e5e3a313d24  LIC_FILES_CHKSUM.sha256
+sha256  e6d8321e71be932e08b8923fe9e24e06a95c7e74a6b86e6f73696436ae0ea54f  LIC_FILES_CHKSUM.sha256
package/mender/mender.mk +4 -3
index ddf3e43be2..f25e24f54c 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MENDER_VERSION = 3.1.0
+MENDER_VERSION = 3.3.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
@@ -20,20 +20,21 @@ MENDER_LICENSE_FILES = \
 	vendor/github.com/mendersoftware/progressbar/LICENSE \
 	vendor/github.com/pkg/errors/LICENSE \
 	vendor/github.com/godbus/dbus/LICENSE \
+	vendor/github.com/gorilla/websocket/LICENSE \
 	vendor/github.com/klauspost/compress/LICENSE \
 	vendor/github.com/pmezard/go-difflib/LICENSE \
-	vendor/golang.org/x/crypto/LICENSE \
 	vendor/golang.org/x/sys/LICENSE \
 	vendor/github.com/bmatsuo/lmdb-go/LICENSE.md \
 	vendor/github.com/remyoudompheng/go-liblzma/LICENSE \
+	vendor/golang.org/x/term/LICENSE \
 	vendor/github.com/davecgh/go-spew/LICENSE \
 	vendor/github.com/klauspost/pgzip/LICENSE \
+	vendor/github.com/klauspost/cpuid/v2/LICENSE \
 	vendor/github.com/sirupsen/logrus/LICENSE \
 	vendor/github.com/stretchr/testify/LICENSE \
 	vendor/github.com/ungerik/go-sysfs/LICENSE \
 	vendor/github.com/urfave/cli/v2/LICENSE \
 	vendor/github.com/stretchr/objx/LICENSE \
-	vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE \
 	vendor/gopkg.in/yaml.v3/LICENSE \
 	vendor/github.com/mattn/go-isatty/LICENSE \
 	vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md
Signature · 6 lines
2.36.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH 2/5 package/mender/mender.mk: add bootloader-integration inventory script

This script is installed in the official meta-mender yocto recipe. Install it here as well.

---
 package/mender/mender.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/mender/mender.mk +1 -1
index f25e24f54c..03e76fc55d 100644
@@ -61,7 +61,7 @@ define MENDER_INSTALL_CONFIG_FILES
 
 	$(INSTALL) -D -m 0755 $(@D)/support/mender-device-identity \
 		$(TARGET_DIR)/usr/share/mender/identity/mender-device-identity
-	$(foreach f,hostinfo network os rootfs-type, \
+	$(foreach f,bootloader-integration hostinfo network os rootfs-type, \
 		$(INSTALL) -D -m 0755 $(@D)/support/mender-inventory-$(f) \
 			$(TARGET_DIR)/usr/share/mender/inventory/mender-inventory-$(f)
 	)
Signature · 6 lines
2.36.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw

PATCH 3/5 package/mender/S42mender: fix check-pkg and shellcheck warnings

In reply to Adam Duskett

Copy the basic syntax of package/polkit/S50polkit and change the following:

- Add DAEMON, DAEMON_PATH, PIDFILE and DAEMON_ARGS variables.
- Fix shellcheck warning SC2166 on line 16.
- Fix shellcheck warning SC2181 on lines 29 and 34 by assigning the return code from the start-stop-daemon binary to a variable, and then check the value of the variable.

---
 package/mender/S42mender | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)
package/mender/S42mender +13 -9
index dc60f94f8b..29008beca0 100644
@@ -2,6 +2,10 @@
 #
 # Starts mender service.
 #
+DAEMON="mender"
+DAEMON_PATH="/usr/bin/mender"
+PIDFILE="/var/run/${DAEMON}.pid"
+DAEMON_ARGS="-daemon"
 
 start() {
 	# If /var/lib/mender is a symlink to /var/run/mender, and
@@ -9,8 +13,7 @@ start() {
 	#     create the directory pointed to by the symlink.
 	#   - the filesystem is RW (i.e. we can rm the symlink),
 	#     replace the symlink with an actual directory
-	if [ -L /var/lib/mender \
-	     -a "$(readlink /var/lib/mender)" = "/var/run/mender" ]
+	if [ -L /var/lib/mender ] && [ "$(readlink /var/lib/mender)" = "/var/run/mender" ]
 	then
 		if rm -f /var/lib/mender >/dev/null 2>&1; then
 			mkdir -p /var/lib/mender
@@ -23,15 +26,16 @@ start() {
 
 	printf "Starting mender service: "
 	umask 077
-
-	start-stop-daemon -S -q -b -m -p /var/run/mender.pid \
-		--exec /usr/bin/mender -- daemon
-	[ $? = 0 ] && echo "OK" || echo "FAIL"
+	start-stop-daemon -bmSqp "$PIDFILE" -x ${DAEMON_PATH} -- ${DAEMON_ARGS}
+	status=$?
+	[ "${status}" = 0 ] && echo "OK" || echo "FAIL"
 }
+
 stop() {
 	printf "Stopping mender service: "
-	start-stop-daemon -K -q -p /var/run/mender.pid
-	[ $? = 0 ] && echo "OK" || echo "FAIL"
+	start-stop-daemon -Kqp "$PIDFILE"
+	status=$?
+	[ "${status}" = 0 ] && echo "OK" || echo "FAIL"
 }
 restart() {
 	stop
@@ -49,7 +53,7 @@ case "$1" in
 		restart
 		;;
 	*)
-		echo "Usage: $0 {start|stop|restart}"
+		echo "Usage: $0 {start|stop|reload|restart}"
 		exit 1
 esac
 
Signature · 6 lines
2.36.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#3 lore raw

Re: [Buildroot] [PATCH 3/5] package/mender/S42mender: fix check-pkg and shellcheck warnings

Adam, All,

On 2022-06-22 11:48 -0700, Adam Duskett spake thusly:

Quoted 9 lines

Copy the basic syntax of package/polkit/S50polkit and change the following:

- Add DAEMON, DAEMON_PATH, PIDFILE and DAEMON_ARGS variables.
- Fix shellcheck warning SC2166 on line 16.
- Fix shellcheck warning SC2181 on lines 29 and 34 by assigning the return code from the start-stop-daemon binary to a variable, and then check the value of the variable.

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 68 lines
---
 package/mender/S42mender | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)
package/mender/S42mender +13 -9
index dc60f94f8b..29008beca0 100644
@@ -2,6 +2,10 @@
 #
 # Starts mender service.
 #
+DAEMON="mender"
+DAEMON_PATH="/usr/bin/mender"
+PIDFILE="/var/run/${DAEMON}.pid"
+DAEMON_ARGS="-daemon"
 
 start() {
 	# If /var/lib/mender is a symlink to /var/run/mender, and
@@ -9,8 +13,7 @@ start() {
 	#     create the directory pointed to by the symlink.
 	#   - the filesystem is RW (i.e. we can rm the symlink),
 	#     replace the symlink with an actual directory
-	if [ -L /var/lib/mender \
-	     -a "$(readlink /var/lib/mender)" = "/var/run/mender" ]
+	if [ -L /var/lib/mender ] && [ "$(readlink /var/lib/mender)" = "/var/run/mender" ]
 	then
 		if rm -f /var/lib/mender >/dev/null 2>&1; then
 			mkdir -p /var/lib/mender
@@ -23,15 +26,16 @@ start() {
 
 	printf "Starting mender service: "
 	umask 077
-
-	start-stop-daemon -S -q -b -m -p /var/run/mender.pid \
-		--exec /usr/bin/mender -- daemon
-	[ $? = 0 ] && echo "OK" || echo "FAIL"
+	start-stop-daemon -bmSqp "$PIDFILE" -x ${DAEMON_PATH} -- ${DAEMON_ARGS}
+	status=$?
+	[ "${status}" = 0 ] && echo "OK" || echo "FAIL"
 }
+
 stop() {
 	printf "Stopping mender service: "
-	start-stop-daemon -K -q -p /var/run/mender.pid
-	[ $? = 0 ] && echo "OK" || echo "FAIL"
+	start-stop-daemon -Kqp "$PIDFILE"
+	status=$?
+	[ "${status}" = 0 ] && echo "OK" || echo "FAIL"
 }
 restart() {
 	stop
@@ -49,7 +53,7 @@ case "$1" in
 		restart
 		;;
 	*)
-		echo "Usage: $0 {start|stop|restart}"
+		echo "Usage: $0 {start|stop|reload|restart}"
 		exit 1
 esac
 
Signature · 6 lines
2.36.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#4 lore raw

PATCH 4/5 package/mender-artifact: bump version to 3.8.0

In reply to Adam Duskett

License changes:

New:

Apache2.0:
- vendor/google.golang.org/genproto/LICENSE
- vendor/google.golang.org/grpc/LICENSE
- vendor/google.golang.org/appengine/LICENSE
- vendor/cloud.google.com/go/LICENSE
- vendor/cloud.google.com/go/kms/LICENSE
- vendor/cloud.google.com/go/iam/LICENSE
- vendor/cloud.google.com/go/compute/LICENSE
- vendor/go.opencensus.io/LICENSE
- vendor/github.com/golang/groupcache/LICENSE
- vendor/gopkg.in/square/go-jose.v2/LICENSE
- vendor/github.com/oklog/run/LICENSE

BSD-3-Clause:
- vendor/github.com/remyoudompheng/go-liblzma/LICENSE
- vendor/github.com/klauspost/compress/LICENSE
- vendor/github.com/google/go-cmp/LICENSE
- vendor/golang.org/x/net/LICENSE
- vendor/golang.org/x/oauth2/LICENSE
- vendor/golang.org/x/text/LICENSE
- vendor/golang.org/x/crypto/LICENSE
- vendor/golang.org/x/time/LICENSE
- vendor/google.golang.org/api/LICENSE
- vendor/google.golang.org/api/internal/third_party/uritemplates/LICENSE
- vendor/google.golang.org/protobuf/LICENSE
- vendor/github.com/golang/protobuf/LICENSE
- vendor/github.com/googleapis/gax-go/v2/LICENSE
- vendor/github.com/golang/snappy/LICENSE
- vendor/gopkg.in/square/go-jose.v2/json/LICENSE
- vendor/github.com/pierrec/lz4/LICENSE

ISC:
- vendor/github.com/klauspost/cpuid/v2/LICENSE
- vendor/go.uber.org/atomic/LICENSE.txt
- vendor/github.com/mitchellh/go-homedir/LICENSE
- vendor/github.com/mitchellh/go-testing-interface/LICENSE
- vendor/github.com/mitchellh/mapstructure/LICENSE
- vendor/github.com/mitchellh/copystructure/LICENSE
- vendor/github.com/mitchellh/reflectwalk/LICENSE
- vendor/github.com/ryanuber/go-glob/LICENSE
- vendor/github.com/mattn/go-colorable/LICENSE
- vendor/github.com/fatih/color/LICENSE.md
- vendor/github.com/armon/go-radix/LICENSE
- vendor/github.com/armon/go-metrics/LICENSE
- vendor/github.com/cenkalti/backoff/v3/LICENSE
- vendor/github.com/hashicorp/go-hclog/LICENSE

MPL-2.0:
- vendor/github.com/hashicorp/go-secure-stdlib/strutil/LICENSE
- vendor/github.com/hashicorp/go-secure-stdlib/parseutil/LICENSE
- vendor/github.com/hashicorp/errwrap/LICENSE
- vendor/github.com/hashicorp/hcl/LICENSE
- vendor/github.com/hashicorp/go-cleanhttp/LICENSE
- vendor/github.com/hashicorp/go-version/LICENSE
- vendor/github.com/hashicorp/go-rootcerts/LICENSE
- vendor/github.com/hashicorp/go-retryablehttp/LICENSE
- vendor/github.com/hashicorp/go-uuid/LICENSE
- vendor/github.com/hashicorp/go-plugin/LICENSE
- vendor/github.com/hashicorp/go-sockaddr/LICENSE
- vendor/github.com/hashicorp/vault/sdk/LICENSE
- vendor/github.com/hashicorp/vault/api/LICENSE
- vendor/github.com/hashicorp/yamux/LICENSE
- vendor/github.com/hashicorp/go-immutable-radix/LICENSE
- vendor/github.com/hashicorp/go-multierror/LICENSE
- vendor/github.com/hashicorp/golang-lru/LICENSE

Removed:
- vendor/golang.org/x/crypto/LICENSE
- vendor/github.com/remyoudompheng/go-liblzma/LICENSE
- vendor/github.com/klauspost/compress/LICENSE

Updated:
- LICENSE: Updated copyright year.
- vendor/github.com/klauspost/compress/LICENSE:
- Added Apache 2.0 license for gzhttp/* directory

- vendor/github.com/remyoudompheng/go-liblzma/LICENSE:
- Update license year from 2012 to 2019

---
 package/mender-artifact/mender-artifact.hash | 70 ++++++++++++++++++--
 package/mender-artifact/mender-artifact.mk   | 63 ++++++++++++++++--
 2 files changed, 123 insertions(+), 10 deletions(-)
package/mender-artifact/mender-artifact.hash +64 -6
index 27f18862bc..8262e26bf0 100644
@@ -1,6 +1,6 @@
 # Locally computed:
-sha256  c46c305616cf53e65b786862addf04d97c388e451f11478886967b494c4ce5d9  mender-artifact-3.6.1.tar.gz
-sha256  ac23df36801aea6a28685b60a742f68f99d357e0d9973d5c36aa2e72599d8e2a  LIC_FILES_CHKSUM.sha256
+sha256  d3ed68d8637195ff35de97b12c8fa148cebffb1ee0fd0d43909ec1643c0c296a  mender-artifact-3.8.0.tar.gz
+sha256  b8462a14975e30fb0dff14ed50e7563e833ccce13c2aa93f95386ffe877ed673  LIC_FILES_CHKSUM.sha256
 
 # License hash extracted from LIC_FILES_CHKSUM.sha256 using the
 # following command:
@@ -8,9 +8,21 @@ sha256  ac23df36801aea6a28685b60a742f68f99d357e0d9973d5c36aa2e72599d8e2a  LIC_FI
 #     sed '/^[A-Za-z0-9_]/s/^/sha256  /' LIC_FILES_CHKSUM.sha256
 
 # Apache 2.0 licenses.
-sha256  b4acfcfa2a0ba1a8c82ec3965fbcee886cff8394ca4214e0ddac0a36beb1e05a  LICENSE
+sha256  1033348db7606a7e61b6484f293847cf8d7a35766efebb97e304d4bd5d7f3f6b  LICENSE
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  vendor/github.com/minio/sha256-simd/LICENSE
 sha256  8f5d89b47d7a05a199b77b7e0f362dad391d451ebda4ef48ba11c50c071564c7  vendor/github.com/mendersoftware/progressbar/LICENSE
+sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  vendor/google.golang.org/genproto/LICENSE
+sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  vendor/google.golang.org/grpc/LICENSE
+sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  vendor/google.golang.org/appengine/LICENSE
+sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  vendor/cloud.google.com/go/LICENSE
+sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  vendor/cloud.google.com/go/kms/LICENSE
+sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  vendor/cloud.google.com/go/iam/LICENSE
+sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  vendor/cloud.google.com/go/compute/LICENSE
+sha256  58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd  vendor/go.opencensus.io/LICENSE
+sha256  73ba74dfaa520b49a401b5d21459a8523a146f3b7518a833eea5efa85130bf68  vendor/github.com/golang/groupcache/LICENSE
+sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  vendor/gopkg.in/square/go-jose.v2/LICENSE
+sha256  c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4  vendor/github.com/oklog/run/LICENSE
+
 #
 # BSD 2 Clause licenses.
 sha256  8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86  vendor/github.com/pkg/errors/LICENSE
@@ -18,10 +30,23 @@ sha256  8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86  vendor
 # BSD 3 Clause licenses.
 sha256  2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477  vendor/github.com/pmezard/go-difflib/LICENSE
 sha256  2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067  vendor/golang.org/x/sys/LICENSE
-sha256  2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067  vendor/golang.org/x/crypto/LICENSE
-sha256  a284e538f3e5649ae6a8f32da2bbd18e9daabf2c1ebbfb99ed92e797b159be1a  vendor/github.com/remyoudompheng/go-liblzma/LICENSE
-sha256  16f848582e4b276a7392cd34496b7a33d6f65c0e190c163ff3a056a7c61219ce  vendor/github.com/klauspost/compress/LICENSE
+sha256  87640bc4df2ceb1559f268a3db1ba859ab780f7ba5b1b4545173d4680a3d918b  vendor/github.com/remyoudompheng/go-liblzma/LICENSE
+sha256  0d9e582ee4bff57bf1189c9e514e6da7ce277f9cd3bc2d488b22fbb39a6d87cf  vendor/github.com/klauspost/compress/LICENSE
 sha256  75e1ca97a84a9da6051dee0114333388216f2c4a5a028296b882ff3d57274735  vendor/github.com/russross/blackfriday/v2/LICENSE.txt
+sha256  17b5d209ba8f9684257ecfcff87df6ceda6194143a8fbd074f29727cff6f0c40  vendor/github.com/google/go-cmp/LICENSE
+sha256  2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067  vendor/golang.org/x/net/LICENSE
+sha256  2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067  vendor/golang.org/x/oauth2/LICENSE
+sha256  2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067  vendor/golang.org/x/text/LICENSE
+sha256  2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067  vendor/golang.org/x/crypto/LICENSE
+sha256  2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067  vendor/golang.org/x/time/LICENSE
+sha256  110244b02140866ee37d17fa7449436a377ec3b85a481fbb208f4c87964382de  vendor/google.golang.org/api/LICENSE
+sha256  fc0a2f71df4e8f047902da53d1f85301be43e0f360fc167057a2d04658ed2ba9  vendor/google.golang.org/api/internal/third_party/uritemplates/LICENSE
+sha256  4835612df0098ca95f8e7d9e3bffcb02358d435dbb38057c844c99d7f725eb20  vendor/google.golang.org/protobuf/LICENSE
+sha256  8778a9fc1eaffb03ab873caae251df2d224f6b5502be8777d3cd573a4dd43903  vendor/github.com/golang/protobuf/LICENSE
+sha256  b95218cd9607855a6536384c0262922b30a0c2bf56e4ced790240f3a3bac4722  vendor/github.com/googleapis/gax-go/v2/LICENSE
+sha256  f69f157b0be75da373605dbc8bbf142e8924ee82d8f44f11bcaf351335bf98cf  vendor/github.com/golang/snappy/LICENSE
+sha256  dd26a7abddd02e2d0aba97805b31f248ef7835d9e10da289b22e3b8ab78b324d  vendor/gopkg.in/square/go-jose.v2/json/LICENSE
+sha256  6a358d2540ca14048f02d366f23787c0a480157e58f058113f0e27168dd4e447  vendor/github.com/pierrec/lz4/LICENSE
 #
 # ISC licenses.
 sha256  1b93a317849ee09d3d7e4f1d20c2b78ddb230b4becb12d7c224c927b9d470251  vendor/github.com/davecgh/go-spew/LICENSE
@@ -35,3 +60,36 @@ sha256  a55959c4e3e8917bfa857359bb641115336276a6cc97408fd8197e079fb18470  vendor
 sha256  c8024e31c1de453fea90f22a221968835cc7af9d520274a2576c9ec9976055b0  vendor/github.com/shurcooL/sanitized_anchor_name/LICENSE
 sha256  d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b  vendor/gopkg.in/yaml.v3/LICENSE
 sha256  08eab1118c80885fa1fa6a6dd7303f65a379fcb3733e063d20d1bbc2c76e6fa1  vendor/github.com/mattn/go-isatty/LICENSE
+sha256  5d966570d7a442d4e969892860a914e542c97f262c873baee8f0aa48e1f40212  vendor/github.com/klauspost/cpuid/v2/LICENSE
+sha256  edbb5a4d165ac69376c765b551c0662ff42bea87e1f1eda85f42ac90c34b09d0  vendor/go.uber.org/atomic/LICENSE.txt
+sha256  22adc4abdece712a737573672f082fd61ac2b21df878efb87ffcff4354a07f26  vendor/github.com/mitchellh/go-homedir/LICENSE
+sha256  f48b778b7fccb6650f915cf4527c941a9578f8876a2911d035c4e44641a916be  vendor/github.com/mitchellh/go-testing-interface/LICENSE
+sha256  22adc4abdece712a737573672f082fd61ac2b21df878efb87ffcff4354a07f26  vendor/github.com/mitchellh/mapstructure/LICENSE
+sha256  3c377fad2e5ae1d7081c7c2f16da867a87cca1d1f5f1aa7ed0b8a16bb553142a  vendor/github.com/mitchellh/copystructure/LICENSE
+sha256  22adc4abdece712a737573672f082fd61ac2b21df878efb87ffcff4354a07f26  vendor/github.com/mitchellh/reflectwalk/LICENSE
+sha256  38049e50b486f5394e40b786388f4a006401996e46c7c1cd18925afe7c3b4e34  vendor/github.com/ryanuber/go-glob/LICENSE
+sha256  88a2379b3ca34bf5c57127aff9dcb802bbb60ece0805cdbda65b3bd115f971d9  vendor/github.com/mattn/go-colorable/LICENSE
+sha256  de95ed802d2f90e3c72cb3c9a927cca5f2aec234a3ef1250232db0f8178b2d93  vendor/github.com/fatih/color/LICENSE.md
+sha256  831892cd31b9eef0311bb1de9014527ef5d3592eed7add1f9f829510d2065e62  vendor/github.com/armon/go-radix/LICENSE
+sha256  d0bb61dd59b6d59021893751bdd1205ee88c8206dcabd6b4c68d35b94ee19750  vendor/github.com/armon/go-metrics/LICENSE
+sha256  5c0476add4c38b55d0ed5ac11b85e00c38f26e1caee20dfe3ab58190103d1fbc  vendor/github.com/cenkalti/backoff/v3/LICENSE
+sha256  b8ce983c0e0b1410115d42b65d5471b3666a8d4f4334a52f29f457a39a71b463  vendor/github.com/hashicorp/go-hclog/LICENSE
+#
+# MPL-2.0 licenses.
+sha256  60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d  vendor/github.com/hashicorp/go-secure-stdlib/strutil/LICENSE
+sha256  60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d  vendor/github.com/hashicorp/go-secure-stdlib/parseutil/LICENSE
+sha256  bef1747eda88b9ed46e94830b0d978c3499dad5dfe38d364971760881901dadd  vendor/github.com/hashicorp/errwrap/LICENSE
+sha256  bef1747eda88b9ed46e94830b0d978c3499dad5dfe38d364971760881901dadd  vendor/github.com/hashicorp/hcl/LICENSE
+sha256  60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d  vendor/github.com/hashicorp/go-cleanhttp/LICENSE
+sha256  bef1747eda88b9ed46e94830b0d978c3499dad5dfe38d364971760881901dadd  vendor/github.com/hashicorp/go-version/LICENSE
+sha256  60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d  vendor/github.com/hashicorp/go-rootcerts/LICENSE
+sha256  60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d  vendor/github.com/hashicorp/go-retryablehttp/LICENSE
+sha256  60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d  vendor/github.com/hashicorp/go-uuid/LICENSE
+sha256  a830016911a348a54e89bd54f2f8b0d8fffdeac20aecfba8e36ebbf38a03f5ff  vendor/github.com/hashicorp/go-plugin/LICENSE
+sha256  1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5  vendor/github.com/hashicorp/go-sockaddr/LICENSE
+sha256  60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d  vendor/github.com/hashicorp/vault/sdk/LICENSE
+sha256  60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d  vendor/github.com/hashicorp/vault/api/LICENSE
+sha256  812e9d96e900a093ae4d1d3f22c5f82f568a0a0461c3007a99d00573d41c5461  vendor/github.com/hashicorp/yamux/LICENSE
+sha256  60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d  vendor/github.com/hashicorp/go-immutable-radix/LICENSE
+sha256  a830016911a348a54e89bd54f2f8b0d8fffdeac20aecfba8e36ebbf38a03f5ff  vendor/github.com/hashicorp/go-multierror/LICENSE
+sha256  af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e  vendor/github.com/hashicorp/golang-lru/LICENSE
package/mender-artifact/mender-artifact.mk +59 -4

87 lines not on this page · raw message

Signature · 6 lines
2.36.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#5 lore raw

PATCH 5/5 package/mender-connect: new package

In reply to Adam Duskett

mender-connect is a daemon responsible for handling bidirectional (websocket) communication with the Mender server. The daemon is responsible for implementing a range of troubleshooting features to the device as well as several enhancement to the mender-client.

---
 package/Config.in                          |  1 +
 package/mender-connect/Config.in           | 32 ++++++++++++
 package/mender-connect/S43mender-connect   | 41 +++++++++++++++
 package/mender-connect/mender-connect.hash | 34 ++++++++++++
 package/mender-connect/mender-connect.mk   | 60 ++++++++++++++++++++++
 5 files changed, 168 insertions(+)
 create mode 100644 package/mender-connect/Config.in
 create mode 100644 package/mender-connect/S43mender-connect
 create mode 100644 package/mender-connect/mender-connect.hash
 create mode 100644 package/mender-connect/mender-connect.mk
package/Config.in +1 -0
index f09da05be0..284ee55d88 100644
@@ -2558,6 +2558,7 @@ menu "System tools"
 	source "package/lxc/Config.in"
 	source "package/makedumpfile/Config.in"
 	source "package/mender/Config.in"
+	source "package/mender-connect/Config.in"
 	source "package/mender-grubenv/Config.in"
 	source "package/mfoc/Config.in"
 	source "package/moby-buildkit/Config.in"
package/mender-connect/Config.in new file +32 -0
new file mode 100644
index 0000000000..0567135d99
@@ -0,0 +1,32 @@
+config BR2_PACKAGE_MENDER_CONNECT
+	bool "mender-connect"
+	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 # libglib
+	depends on BR2_USE_WCHAR # libglib -> gettext
+	depends on BR2_USE_MMU # dbus -> fork()
+	select BR2_PACKAGE_DBUS # runtime
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_MENDER # runtime
+	select BR2_PACKAGE_OPENSSL
+	help
+	  mender-connect is a daemon responsible for handling
+	  bidirectional (websocket) communication with the Mender
+	  server. The daemon is responsible for implementing a range of
+	  troubleshooting features to the device as well as several
+	  enhancement to the mender-client.
+
+	  Mender Connect is loosely coupled with the Mender Client. The
+	  main information passed between mender-client and
+	  mender-connect is the device authorization status. Since only
+	  accepted devices can interact with the Mender Server, the
+	  Mender Client passes over DBus the authorization token which
+	  Mender Connect uses to establish a Websocket connection to the
+	  server.
+
+	  https://github.com/mendersoftware/mender-connect
+
+comment "mender-connect needs a toolchain w/ threads"
+	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
package/mender-connect/S43mender-connect new file +41 -0

41 lines not on this page · raw message

package/mender-connect/mender-connect.hash new file +34 -0
new file mode 100644
index 0000000000..cd6cf0f7c0
@@ -0,0 +1,34 @@
+# Locally computed:
+sha256  6410bcd76cebd21e9f18fe5768928d67163e4bb2b6ae76d0e20815400d907657  2.0.2.tar.gz
+sha256  78b3954421ec6499c3f9735b96d52288574ae80c747416a52548d7f526f26e8c  LIC_FILES_CHKSUM.sha256
+
+# Vendor licenses
+# Generated with sed '/^[A-Za-z0-9_]/s/^/sha256  /' LIC_FILES_CHKSUM.sha256
+
+#
+# Apache-2.0
+sha256  1033348db7606a7e61b6484f293847cf8d7a35766efebb97e304d4bd5d7f3f6b  LICENSE
+sha256  3eb823230e5d112e1bd032ccc82ae765cf676d0d6d46a1a1daa2d658b3005b67  vendor/github.com/mendersoftware/go-lib-micro/LICENSE
+#
+# BSD-2-Clause
+sha256  2be1b548b0387ca8948e1bb9434e709126904d15f622cc2d0d8e7f186e4d122d  vendor/github.com/gorilla/websocket/LICENSE
+sha256  8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86  vendor/github.com/pkg/errors/LICENSE
+sha256  1530185dd39cdde7cb2f786a7a5fcf8bc34368b6ae73c15e72bafe88fd80b9a2  vendor/github.com/vmihailenco/msgpack/v5/LICENSE
+sha256  0f02aac22084ef463aa5f42f566feeec6aa4c99653519744a8c25cb079da5b5d  vendor/github.com/vmihailenco/tagparser/v2/LICENSE
+#
+# BSD-3-Clause
+sha256  2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477  vendor/github.com/pmezard/go-difflib/LICENSE
+sha256  2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067  vendor/golang.org/x/sys/LICENSE
+#
+# ISC
+sha256  1b93a317849ee09d3d7e4f1d20c2b78ddb230b4becb12d7c224c927b9d470251  vendor/github.com/davecgh/go-spew/LICENSE
+#
+# MIT
+sha256  a2a1cea59d9c2d71908082f516f86bb560abf857646ecf69d70c121ead14aef4  vendor/github.com/creack/pty/LICENSE
+sha256  caa932df46551b53643952fe03b351d55db97be73b5393b986dcf6b05d3c416a  vendor/github.com/go-ozzo/ozzo-validation/v4/LICENSE
+sha256  92a328e1d5f3269b42e2ce32b4494eafdb3132f204a911c5c95cf3d8465490e4  vendor/github.com/satori/go.uuid/LICENSE
+sha256  51a0c9ec7f8b7634181b8d4c03e5b5d204ac21d6e72f46c313973424664b2e6b  vendor/github.com/sirupsen/logrus/LICENSE
+sha256  b2663894033a05fd80261176cd8da1d72546e25842d5c1abcc852ca23b6b61b0  vendor/github.com/stretchr/objx/LICENSE
+sha256  f8e536c1c7b695810427095dc85f5f80d44ff7c10535e8a9486cf393e2599189  vendor/github.com/stretchr/testify/LICENSE
+sha256  da277af11b85227490377fbcac6afccc68be560c4fff36ac05ca62de55345fd7  vendor/github.com/urfave/cli/v2/LICENSE
+sha256  d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b  vendor/gopkg.in/yaml.v3/LICENSE
package/mender-connect/mender-connect.mk new file +60 -0

60 lines not on this page · raw message

Signature · 6 lines
2.36.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#6 lore raw

Re: [Buildroot] [PATCH 5/5] package/mender-connect: new package

Quoted 36 lines · Adam Duskett

mender-connect is a daemon responsible for handling bidirectional (websocket) communication with the Mender server. The daemon is responsible for implementing a range of troubleshooting features to the device as well as several enhancement to the mender-client.

---
  package/Config.in                          |  1 +
  package/mender-connect/Config.in           | 32 ++++++++++++
  package/mender-connect/S43mender-connect   | 41 +++++++++++++++
  package/mender-connect/mender-connect.hash | 34 ++++++++++++
  package/mender-connect/mender-connect.mk   | 60 ++++++++++++++++++++++
  5 files changed, 168 insertions(+)

create mode 100644 package/mender-connect/Config.in create mode 100644 package/mender-connect/S43mender-connect create mode 100644 package/mender-connect/mender-connect.hash create mode 100644 package/mender-connect/mender-connect.mk

package/Config.in +1 -0
index f09da05be0..284ee55d88 100644
@@ -2558,6 +2558,7 @@ menu "System tools"
  	source "package/lxc/Config.in"
  	source "package/makedumpfile/Config.in"
  	source "package/mender/Config.in"
+	source "package/mender-connect/Config.in"
  	source "package/mender-grubenv/Config.in"
  	source "package/mfoc/Config.in"
  	source "package/moby-buildkit/Config.in"
package/mender-connect/Config.in new file +0 -0
new file mode 100644
index 0000000000..0567135d99

package/mender-connect/Config.in line 7

Quoted 7 lines
package/mender-connect/Config.in new file +7 -0
@@ -0,0 +1,32 @@
+config BR2_PACKAGE_MENDER_CONNECT
+	bool "mender-connect"
+	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 # libglib
+	depends on BR2_USE_WCHAR # libglib -> gettext
+	depends on BR2_USE_MMU # dbus -> fork()

These two have to be added to the comment as well

Quoted 31 lines
package/mender-connect/Config.in new file +25 -0
+	select BR2_PACKAGE_DBUS # runtime
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_MENDER # runtime
+	select BR2_PACKAGE_OPENSSL
+	help
+	  mender-connect is a daemon responsible for handling
+	  bidirectional (websocket) communication with the Mender
+	  server. The daemon is responsible for implementing a range of
+	  troubleshooting features to the device as well as several
+	  enhancement to the mender-client.
+
+	  Mender Connect is loosely coupled with the Mender Client. The
+	  main information passed between mender-client and
+	  mender-connect is the device authorization status. Since only
+	  accepted devices can interact with the Mender Server, the
+	  Mender Client passes over DBus the authorization token which
+	  Mender Connect uses to establish a Websocket connection to the
+	  server.
+
+	  https://github.com/mendersoftware/mender-connect
+
+comment "mender-connect needs a toolchain w/ threads"
+	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
package/mender-connect/S43mender-connect new file +0 -0
new file mode 100644
index 0000000000..abcceb0e02

package/mender-connect/S43mender-connect line 10

Quoted 10 lines
package/mender-connect/S43mender-connect new file +10 -0
@@ -0,0 +1,41 @@
+#!/bin/sh
+DAEMON="mender-connect"
+DAEMON_PATH="/usr/bin/mender-connect"
+PIDFILE="/var/run/${DAEMON}.pid"
+DAEMON_ARGS="-daemon"
+
+start() {
+	printf 'Starting %s: ' "${DAEMON}"
+	umask 077
+	start-stop-daemon -bmSqp "$PIDFILE" -x ${DAEMON_PATH} -- ${DAEMON_ARGS}

I made some changes here to make it match better with our canonical example in
busybox/S01syslogd.

Quoted 77 lines
package/mender-connect/S43mender-connect new file +31 -0
+	status=$?
+	[ "${status}" = 0 ] && echo "OK" || echo "FAIL"
+	return "$status"
+}
+
+stop() {
+	printf 'Stopping %s: ' "${DAEMON}"
+	start-stop-daemon -Kqp "$PIDFILE"
+	status=$?
+	[ "${status}" = 0 ] && echo "OK" || echo "FAIL"
+	return "$status"
+}
+
+restart() {
+	stop
+	sleep 1
+	start
+}
+
+case "$1" in
+	start|stop|restart)
+		"$1";;
+	reload)
+		# Restart, since there is no true "reload" feature.
+		restart;;
+	*)
+		echo "Usage: $0 {start|stop|restart|reload}"
+		exit 1
+esac
+
+exit $?
package/mender-connect/mender-connect.hash new file +34 -0
new file mode 100644
index 0000000000..cd6cf0f7c0
@@ -0,0 +1,34 @@
+# Locally computed:
+sha256  6410bcd76cebd21e9f18fe5768928d67163e4bb2b6ae76d0e20815400d907657  2.0.2.tar.gz
+sha256  78b3954421ec6499c3f9735b96d52288574ae80c747416a52548d7f526f26e8c  LIC_FILES_CHKSUM.sha256
+
+# Vendor licenses
+# Generated with sed '/^[A-Za-z0-9_]/s/^/sha256  /' LIC_FILES_CHKSUM.sha256
+
+#
+# Apache-2.0
+sha256  1033348db7606a7e61b6484f293847cf8d7a35766efebb97e304d4bd5d7f3f6b  LICENSE
+sha256  3eb823230e5d112e1bd032ccc82ae765cf676d0d6d46a1a1daa2d658b3005b67  vendor/github.com/mendersoftware/go-lib-micro/LICENSE
+#
+# BSD-2-Clause
+sha256  2be1b548b0387ca8948e1bb9434e709126904d15f622cc2d0d8e7f186e4d122d  vendor/github.com/gorilla/websocket/LICENSE
+sha256  8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86  vendor/github.com/pkg/errors/LICENSE
+sha256  1530185dd39cdde7cb2f786a7a5fcf8bc34368b6ae73c15e72bafe88fd80b9a2  vendor/github.com/vmihailenco/msgpack/v5/LICENSE
+sha256  0f02aac22084ef463aa5f42f566feeec6aa4c99653519744a8c25cb079da5b5d  vendor/github.com/vmihailenco/tagparser/v2/LICENSE
+#
+# BSD-3-Clause
+sha256  2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477  vendor/github.com/pmezard/go-difflib/LICENSE
+sha256  2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067  vendor/golang.org/x/sys/LICENSE
+#
+# ISC
+sha256  1b93a317849ee09d3d7e4f1d20c2b78ddb230b4becb12d7c224c927b9d470251  vendor/github.com/davecgh/go-spew/LICENSE
+#
+# MIT
+sha256  a2a1cea59d9c2d71908082f516f86bb560abf857646ecf69d70c121ead14aef4  vendor/github.com/creack/pty/LICENSE
+sha256  caa932df46551b53643952fe03b351d55db97be73b5393b986dcf6b05d3c416a  vendor/github.com/go-ozzo/ozzo-validation/v4/LICENSE
+sha256  92a328e1d5f3269b42e2ce32b4494eafdb3132f204a911c5c95cf3d8465490e4  vendor/github.com/satori/go.uuid/LICENSE
+sha256  51a0c9ec7f8b7634181b8d4c03e5b5d204ac21d6e72f46c313973424664b2e6b  vendor/github.com/sirupsen/logrus/LICENSE
+sha256  b2663894033a05fd80261176cd8da1d72546e25842d5c1abcc852ca23b6b61b0  vendor/github.com/stretchr/objx/LICENSE
+sha256  f8e536c1c7b695810427095dc85f5f80d44ff7c10535e8a9486cf393e2599189  vendor/github.com/stretchr/testify/LICENSE
+sha256  da277af11b85227490377fbcac6afccc68be560c4fff36ac05ca62de55345fd7  vendor/github.com/urfave/cli/v2/LICENSE
+sha256  d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b  vendor/gopkg.in/yaml.v3/LICENSE
package/mender-connect/mender-connect.mk new file +0 -0
new file mode 100644
index 0000000000..bb9cfde236

package/mender-connect/mender-connect.mk line 9

Quoted 9 lines
package/mender-connect/mender-connect.mk new file +9 -0
@@ -0,0 +1,60 @@
+################################################################################
+#
+# mender-connect
+#
+################################################################################
+
+MENDER_CONNECT_VERSION = 2.0.2
+MENDER_CONNECT_SOURCE = $(MENDER_CONNECT_VERSION).tar.gz
+MENDER_CONNECT_SITE = https://github.com/mendersoftware/mender-connect/archive

AFAICS there's no reason not to use the github helper here, so I did that.

Applied to master with those changes, thanks.

Regards,
Arnout

Quoted 41 lines
package/mender-connect/mender-connect.mk new file +41 -0
+MENDER_CONNECT_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT
+
+# Vendor license paths generated with:
+#    awk '{print $2}' LIC_FILES_CHKSUM.sha256 | grep vendor
+MENDER_CONNECT_LICENSE_FILES = \
+	LIC_FILES_CHKSUM.sha256 \
+	LICENSE \
+	vendor/github.com/mendersoftware/go-lib-micro/LICENSE \
+	vendor/github.com/gorilla/websocket/LICENSE \
+	vendor/github.com/pkg/errors/LICENSE \
+	vendor/github.com/vmihailenco/msgpack/v5/LICENSE \
+	vendor/github.com/vmihailenco/tagparser/v2/LICENSE \
+	vendor/github.com/pmezard/go-difflib/LICENSE \
+	vendor/golang.org/x/sys/LICENSE \
+	vendor/github.com/davecgh/go-spew/LICENSE \
+	vendor/github.com/creack/pty/LICENSE \
+	vendor/github.com/go-ozzo/ozzo-validation/v4/LICENSE \
+	vendor/github.com/satori/go.uuid/LICENSE \
+	vendor/github.com/sirupsen/logrus/LICENSE \
+	vendor/github.com/stretchr/objx/LICENSE \
+	vendor/github.com/stretchr/testify/LICENSE \
+	vendor/github.com/urfave/cli/v2/LICENSE \
+	vendor/gopkg.in/yaml.v3/LICENSE
+
+MENDER_CONNECT_DEPENDENCIES = \
+	dbus \
+	libglib2 \
+	mender \
+	openssl
+
+MENDER_CONNECT_LDFLAGS = -X github.com/mendersoftware/mender-connect/config.Version=$(MENDER_CONNECT_VERSION)
+
+define MENDER_CONNECT_INSTALL_CONFIG_FILES
+	$(INSTALL) -d -m 755 $(TARGET_DIR)/etc/mender
+
+	$(INSTALL) -D -m 0644 $(@D)/examples/mender-connect.conf \
+		$(TARGET_DIR)/etc/mender/mender-connect.conf
+endef
+MENDER_CONNECT_POST_INSTALL_TARGET_HOOKS += MENDER_CONNECT_INSTALL_CONFIG_FILES
+
+define MENDER_CONNECT_INSTALL_INIT_SYSTEMD

package/mender-connect/mender-connect.mk line 60

Quoted 10 lines
package/mender-connect/mender-connect.mk new file +10 -0
+	$(INSTALL) -D -m 0644 $(@D)/support/mender-connect.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/mender-connect.service
+endef
+
+define MENDER_CONNECT_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 0755 $(MENDER_CONNECT_PKGDIR)/S43mender-connect \
+		$(TARGET_DIR)/etc/init.d/S43mender-connect
+endef
+
+$(eval $(golang-package))

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#7 lore raw
In reply to Adam Duskett
Quoted 11 lines · Adam Duskett

License hash changes:

New:
- vendor/github.com/gorilla/websocket/LICENSE: BSD-2-Clause
- vendor/github.com/klauspost/cpuid/v2/LICENSE: MIT
- vendor/golang.org/x/term/LICENSE: BSD-2-Clause

Removed:
- vendor/golang.org/x/crypto/LICENSE
- vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE

Quoted 8 lines

Updated:
- LICENSE: Update copyright year

- vendor/github.com/mendersoftware/mender-artifact/LICENSE:
- Updated copyright year

- vendor/github.com/klauspost/compress/LICENSE:
- Added Apache 2.0 license for gzhttp/* directory

Thank you for the excellent log of license changes.

Quoted 69 lines
---
  package/mender/mender.hash | 15 ++++++++-------
  package/mender/mender.mk   |  7 ++++---
  2 files changed, 12 insertions(+), 10 deletions(-)
package/mender/mender.hash +8 -7
index 40d82f072f..0fa8064ca4 100644
@@ -1,12 +1,12 @@
  # Locally computed:
-sha256  716ba7110dd68cdafc5caa989706ff67bbac0617c284d666aa81605850be5763  3.1.0.tar.gz
+sha256  9d8b2438e358dacde58c3692bd038ed9938392f1a526c49d919f73a2dff77eee  3.3.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/mender-artifact/LICENSE
+sha256  1033348db7606a7e61b6484f293847cf8d7a35766efebb97e304d4bd5d7f3f6b  LICENSE
+sha256  b4acfcfa2a0ba1a8c82ec3965fbcee886cff8394ca4214e0ddac0a36beb1e05a  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  8f5d89b47d7a05a199b77b7e0f362dad391d451ebda4ef48ba11c50c071564c7  vendor/github.com/mendersoftware/progressbar/LICENSE
@@ -14,26 +14,27 @@ sha256  8f5d89b47d7a05a199b77b7e0f362dad391d451ebda4ef48ba11c50c071564c7  vendor
  # BSD 2 Clause license.
  sha256  8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86  vendor/github.com/pkg/errors/LICENSE
  sha256  e4646a82a976369d7ae8f6ed5c11d35dc0af18433a8ccc24c85b459ad8b95128  vendor/github.com/godbus/dbus/LICENSE
+sha256  2be1b548b0387ca8948e1bb9434e709126904d15f622cc2d0d8e7f186e4d122d  vendor/github.com/gorilla/websocket/LICENSE
  #
  # BSD 3 Clause license.
-sha256  16f848582e4b276a7392cd34496b7a33d6f65c0e190c163ff3a056a7c61219ce  vendor/github.com/klauspost/compress/LICENSE
+sha256  0d9e582ee4bff57bf1189c9e514e6da7ce277f9cd3bc2d488b22fbb39a6d87cf  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  0634b008cee55ca01f0888d2f5aba2d34e66c3f52c31a4e16a5d5d33d0c2a03e  vendor/github.com/bmatsuo/lmdb-go/LICENSE.md
  sha256  87640bc4df2ceb1559f268a3db1ba859ab780f7ba5b1b4545173d4680a3d918b  vendor/github.com/remyoudompheng/go-liblzma/LICENSE
+sha256  2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067  vendor/golang.org/x/term/LICENSE
  #
  # ISC license.
  sha256  1b93a317849ee09d3d7e4f1d20c2b78ddb230b4becb12d7c224c927b9d470251  vendor/github.com/davecgh/go-spew/LICENSE
  #
  # MIT license.
  sha256  6d2de1cde19c4d2bd8bcd9aaa1d581f4cfa3db9cf71896140330eaa2f2687685  vendor/github.com/klauspost/pgzip/LICENSE
+sha256  5d966570d7a442d4e969892860a914e542c97f262c873baee8f0aa48e1f40212  vendor/github.com/klauspost/cpuid/v2/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
  sha256  da277af11b85227490377fbcac6afccc68be560c4fff36ac05ca62de55345fd7  vendor/github.com/urfave/cli/v2/LICENSE
  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
  #
@@ -41,4 +42,4 @@ sha256  08eab1118c80885fa1fa6a6dd7303f65a379fcb3733e063d20d1bbc2c76e6fa1  vendor
  sha256  310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569  vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md
 
  # sha256 of all the vendor licenses combined
-sha256  4f3541ea69b9b6e3959679576c146b42ba9a840a9dc4e593bff43e5e3a313d24  LIC_FILES_CHKSUM.sha256
+sha256  e6d8321e71be932e08b8923fe9e24e06a95c7e74a6b86e6f73696436ae0ea54f  LIC_FILES_CHKSUM.sha256
package/mender/mender.mk +0 -0
index ddf3e43be2..f25e24f54c 100644

package/mender/mender.mk line 8

Quoted 6 lines
package/mender/mender.mk +1 -1
@@ -4,7 +4,7 @@
  #
  ################################################################################
 
-MENDER_VERSION = 3.1.0
+MENDER_VERSION = 3.3.0
  MENDER_SITE = https://github.com/mendersoftware/mender/archive

I took the opportunity to switch this to github-helper.

Applied series to master, with the changes as mentioned in the last patch.

Regards,
Arnout

Quoted 16 lines
package/mender/mender.mk +2 -1
  MENDER_SOURCE = $(MENDER_VERSION).tar.gz
  MENDER_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT, OLDAP-2.8
@@ -20,20 +20,21 @@ MENDER_LICENSE_FILES = \
  	vendor/github.com/mendersoftware/progressbar/LICENSE \
  	vendor/github.com/pkg/errors/LICENSE \
  	vendor/github.com/godbus/dbus/LICENSE \
+	vendor/github.com/gorilla/websocket/LICENSE \
  	vendor/github.com/klauspost/compress/LICENSE \
  	vendor/github.com/pmezard/go-difflib/LICENSE \
-	vendor/golang.org/x/crypto/LICENSE \
  	vendor/golang.org/x/sys/LICENSE \
  	vendor/github.com/bmatsuo/lmdb-go/LICENSE.md \
  	vendor/github.com/remyoudompheng/go-liblzma/LICENSE \
+	vendor/golang.org/x/term/LICENSE \
  	vendor/github.com/davecgh/go-spew/LICENSE \
  	vendor/github.com/klauspost/pgzip/LICENSE \

package/mender/mender.mk MENDER_LICENSE_FILES = \ · line 40

Quoted 10 lines
package/mender/mender.mk +1 -1
+	vendor/github.com/klauspost/cpuid/v2/LICENSE \
  	vendor/github.com/sirupsen/logrus/LICENSE \
  	vendor/github.com/stretchr/testify/LICENSE \
  	vendor/github.com/ungerik/go-sysfs/LICENSE \
  	vendor/github.com/urfave/cli/v2/LICENSE \
  	vendor/github.com/stretchr/objx/LICENSE \
-	vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE \
  	vendor/gopkg.in/yaml.v3/LICENSE \
  	vendor/github.com/mattn/go-isatty/LICENSE \
  	vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot