Skip to contentSkip to conversation

package/rauc: bump to version 1.7

PATCH Applied Heiko Thiery 2 participants 4 messages Jun 4, 2022 – Jun 5, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/rauc: bump to version 1.7

Drop patch that is already in upstream.

---
 ...src-verify_hash.c-include-inttypes.h.patch | 38 -------------------
 package/rauc/rauc.hash                        |  2 +-
 package/rauc/rauc.mk                          |  2 +-
 3 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 package/rauc/0001-src-verify_hash.c-include-inttypes.h.patch
package/rauc/0001-src-verify_hash.c-include-inttypes.h.patch deleted +0 -38
deleted file mode 100644
index 916c8cca0b..0000000000
@@ -1,38 +0,0 @@
-From b19a9c26d88a913417e77aaf60c72cdbf393d1f6 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Tue, 31 May 2022 21:22:36 +0200
-Subject: [PATCH] src/verify_hash.c: include inttypes.h
-
-Include inttypes.h to avoid the following build failure:
-
-In file included from /nvmedata/autobuild/instance-22/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/include/glib-2.0/glib.h:62,
-                 from src/verity_hash.c:26:
-src/verity_hash.c: In function 'verify_zero':
-src/verity_hash.c:69:55: error: expected ')' before 'PRIu64'
-   69 |    g_message("Spare area is not zeroed at position %" PRIu64 ".",
-      |                                                       ^~~~~~
-
-Fixes:
- - http://autobuild.buildroot.org/results/1a093c0e194a061836884419d2f50506105db01e
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
-[Upstream status: https://github.com/rauc/rauc/pull/914]
----
- src/verity_hash.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/verity_hash.c b/src/verity_hash.c
-index db82a78..3b2c2a0 100644
---- a/src/verity_hash.c
-+++ b/src/verity_hash.c
-@@ -19,6 +19,7 @@
-  */
- 
- #include <errno.h>
-+#include <inttypes.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--- 
-2.35.1
-
package/rauc/rauc.hash +1 -1
index f6c1446de4..677d358158 100644
@@ -1,4 +1,4 @@
 # Locally calculated, after verifying against
 # https://github.com/rauc/rauc/releases/download/v1.6/rauc-1.6.tar.xz.asc
-sha256  86013788dd02321b7c3f913ad3a1f8802afbc784ec076fa278524a9e1ef9e7b0  rauc-1.6.tar.xz
+sha256  8b7d37cc1eb57df4f03de3c943dd7be290b78d47be28881e8b1f070e1d5e55df  rauc-1.7.tar.xz
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING
package/rauc/rauc.mk +1 -1
index 0520b30521..90b2317d4b 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RAUC_VERSION = 1.6
+RAUC_VERSION = 1.7
 RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)
 RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz
 RAUC_LICENSE = LGPL-2.1
Signature · 6 lines
2.20.1

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

PATCH 2/2 package/rauc: add option to enable/disable streaming support

RAUC 1.7 introduces streaming update support. Make this configurable and add required dependency to libnl.

---
 package/rauc/Config.in | 13 +++++++++++++
 package/rauc/rauc.mk   |  7 +++++++
 2 files changed, 20 insertions(+)
package/rauc/Config.in +13 -0
index 1170e50845..fe029c73ca 100644
@@ -40,6 +40,19 @@ config BR2_PACKAGE_RAUC_NETWORK
 	  This option enables support for updating firmware over
 	  the network using libcurl.
 
+comment "rauc streaming support needs network support"
+	depends on !BR2_PACKAGE_RAUC_NETWORK
+
+if BR2_PACKAGE_RAUC_NETWORK
+
+config BR2_PACKAGE_RAUC_STREAMING
+	bool "streaming update support"
+	select BR2_PACKAGE_LIBNL
+	help
+	  This option enables support for streaming update mode.
+
+endif
+
 config BR2_PACKAGE_RAUC_JSON
 	bool "JSON output support"
 	select BR2_PACKAGE_JSON_GLIB
package/rauc/rauc.mk +7 -0
index 90b2317d4b..8bfb0b79ba 100644
@@ -52,6 +52,13 @@ else
 RAUC_CONF_OPTS += --disable-json
 endif
 
+ifeq ($(BR2_PACKAGE_RAUC_STREAMING),y)
+RAUC_CONF_OPTS += --enable-streaming
+RAUC_DEPENDENCIES += libnl
+else
+RAUC_CONF_OPTS += --disable-streaming
+endif
+
 HOST_RAUC_DEPENDENCIES = \
 	host-pkgconf \
 	host-openssl \
Signature · 6 lines
2.20.1

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

Re: [Buildroot] [PATCH 2/2] package/rauc: add option to enable/disable streaming support

Quoted 14 lines · On Sat, 4 Jun 2022 13:55:00 +0200 Heiko Thiery <[email protected]> wrote:

RAUC 1.7 introduces streaming update support. Make this configurable and add required dependency to libnl.

---
 package/rauc/Config.in | 13 +++++++++++++
 package/rauc/rauc.mk   |  7 +++++++
 2 files changed, 20 insertions(+)
package/rauc/Config.in +0 -0
index 1170e50845..fe029c73ca 100644

package/rauc/Config.in config BR2_PACKAGE_RAUC_NETWORK · line 44

Quoted 5 lines
package/rauc/Config.in +2 -0
@@ -40,6 +40,19 @@ config BR2_PACKAGE_RAUC_NETWORK
 	  This option enables support for updating firmware over
 	  the network using libcurl.
 
+comment "rauc streaming support needs network support"
+	depends on !BR2_PACKAGE_RAUC_NETWORK

I found this comment to not be very useful, it's pretty obvious that streaming will only be available with network support enabled IMO, so I dropped this comment and applied to next. Of course, I can always be convinced differently by you or my fellow co-maintainers :-)

Thomas

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#3 lore raw
In reply to Heiko Thiery
Quoted 9 lines · On Sat, 4 Jun 2022 13:54:58 +0200 Heiko Thiery <[email protected]> wrote:

Drop patch that is already in upstream.

---
 ...src-verify_hash.c-include-inttypes.h.patch | 38 -------------------
 package/rauc/rauc.hash                        |  2 +-
 package/rauc/rauc.mk                          |  2 +-
 3 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 package/rauc/0001-src-verify_hash.c-include-inttypes.h.patch

Applied to next, thanks.

Thomas

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot