[ptxdist] [PATCH 0/6] rauc: some recipe polishing and a version bump to 1.0

[ptxdist] [PATCH 0/6] rauc: some recipe polishing and a version bump to 1.0

[Enrico Jorns]

This series contains a bit of all: a dependency fix, a realignment, a
rewording, a new option, a version bump and a new required dependency

Enrico Jorns (6):
  rauc: needs to depend on host-glib package
  rauc: align if statements in selects statements
  rauc: provide and improve help texts on config options
  rauc: allow to optionally disable SERVICE mode
  rauc: version bump 0.4 -> 1.0
  rauc: force busybox tar to have long options enabled

 rules/rauc.in   | 32 ++++++++++++++++++++++++++++----
 rules/rauc.make |  8 +++++---
 2 files changed, 33 insertions(+), 7 deletions(-)

-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 1/6] rauc: needs to depend on host-glib package

[Enrico Jorns]

RAUC uses gdbus-codegen host tool for creating its gdbus source files.

Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
---
 rules/rauc.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/rauc.in b/rules/rauc.in
index 190eb0b51..0ce6a4cff 100644
--- a/rules/rauc.in
+++ b/rules/rauc.in
@@ -5,6 +5,7 @@ menuconfig RAUC
 	prompt "Rauc Update Tool              "
 	select OPENSSL
 	select GLIB
+	select HOST_GLIB
 	select LIBCURL		if RAUC_NETWORK
 	select JSON_GLIB	if RAUC_JSON
 	select SQUASHFS_TOOLS			if RUNTIME
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/6] rauc: align if statements in selects statements

[Enrico Jorns]

Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
---
 rules/rauc.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/rauc.in b/rules/rauc.in
index 0ce6a4cff..20c5564ed 100644
--- a/rules/rauc.in
+++ b/rules/rauc.in
@@ -6,8 +6,8 @@ menuconfig RAUC
 	select OPENSSL
 	select GLIB
 	select HOST_GLIB
-	select LIBCURL		if RAUC_NETWORK
-	select JSON_GLIB	if RAUC_JSON
+	select LIBCURL				if RAUC_NETWORK
+	select JSON_GLIB			if RAUC_JSON
 	select SQUASHFS_TOOLS			if RUNTIME
 	select SQUASHFS_TOOLS_UNSQUASHFS	if RUNTIME
 	help
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 3/6] rauc: provide and improve help texts on config options

[Enrico Jorns]

Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
---
 rules/rauc.in | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/rules/rauc.in b/rules/rauc.in
index 20c5564ed..96afc9092 100644
--- a/rules/rauc.in
+++ b/rules/rauc.in
@@ -17,18 +17,30 @@ if RAUC
 
 config RAUC_NETWORK
 	bool
-	prompt "network support"
+	prompt "Enable network support"
+	help
+	  Enables network support that allows RAUC to directly fetch bundles
+	  via http/https/ftp/sftp (using libcurl).
+	  Note that network is primarily designed to be used for RAUC'S casync
+	  capabilities, not for fetching full bundles.
 
 config RAUC_JSON
 	bool
 	prompt "JSON support"
+	help
+	  Enables JSON output format for 'rauc info' and 'rauc status'.
+	  Output format can be selected via '--output-format=<json/json-pretty>'
 
 config RAUC_CONFIGURATION
 	prompt "Install RAUC configuration in /etc/rauc"
 	bool
 	default y
 	help
-	  Install a default RAUC configuration that works for most projects.
+	  Installs a RAUC system configuration file and a keyring into /etc/rauc.
+	  By default, this will install some dummy files containing some
+	  example and help text.
+	  The default files must be overwritten in your projectroot to match
+	  your project's and platform's need.
 
 if RAUC_CONFIGURATION
 
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 4/6] rauc: allow to optionally disable SERVICE mode

[Enrico Jorns]

Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
---
 rules/rauc.in   | 10 ++++++++++
 rules/rauc.make |  4 +++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/rules/rauc.in b/rules/rauc.in
index 96afc9092..653939a8b 100644
--- a/rules/rauc.in
+++ b/rules/rauc.in
@@ -15,6 +15,16 @@ menuconfig RAUC
 
 if RAUC
 
+config RAUC_SERVICE
+	bool
+	prompt "Enable service (D-Bus) support"
+	depends on DBUS
+	default y
+	help
+	  Compiles RAUC to act as a separate daemon and comand line interface
+	  that communicate with each other via D-Bus interface.
+	  Only deactivate this if you have a system that does not provide D-Bus!
+
 config RAUC_NETWORK
 	bool
 	prompt "Enable network support"
diff --git a/rules/rauc.make b/rules/rauc.make
index 116fd512b..772cc0082 100644
--- a/rules/rauc.make
+++ b/rules/rauc.make
@@ -41,7 +41,7 @@ RAUC_CONF_OPT	:= \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-code-coverage \
 	--disable-valgrind \
-	--enable-service \
+	--$(call ptx/endis,PTXCONF_RAUC_SERVICE)-service \
 	--$(call ptx/endis,PTXCONF_RAUC_NETWORK)-network \
 	--$(call ptx/endis,PTXCONF_RAUC_JSON)-json \
 	--with-systemdunitdir=/usr/lib/systemd/system \
@@ -71,10 +71,12 @@ ifdef PTXCONF_RAUC_CONFIGURATION
 	@$(call install_alternative, rauc, 0, 0, 0644, /etc/rauc/ca.cert.pem)
 endif
 
+ifdef PTXCONF_RAUC_SERVICE
 	@$(call install_copy, rauc, 0, 0, 0644, -, \
 		/usr/share/dbus-1/system-services/de.pengutronix.rauc.service)
 	@$(call install_copy, rauc, 0, 0, 0644, -, \
 		/usr/share/dbus-1/system.d/de.pengutronix.rauc.conf)
+endif
 
 ifdef PTXCONF_INITMETHOD_SYSTEMD
 	@$(call install_alternative, rauc, 0, 0, 0644, \
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 5/6] rauc: version bump 0.4 -> 1.0

[Enrico Jorns]

Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
---
 rules/rauc.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/rauc.make b/rules/rauc.make
index 772cc0082..88817da78 100644
--- a/rules/rauc.make
+++ b/rules/rauc.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_RAUC) += rauc
 #
 # Paths and names
 #
-RAUC_VERSION	:= 0.4
-RAUC_MD5	:= 52a8f15e9484d590e6261e9bd453ff76
+RAUC_VERSION	:= 1.0
+RAUC_MD5	:= f800eae12063b0004980581aeb4932c0
 RAUC		:= rauc-$(RAUC_VERSION)
 RAUC_SUFFIX	:= tar.xz
 RAUC_URL	:= https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)/$(RAUC).$(RAUC_SUFFIX)
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 6/6] rauc: force busybox tar to have long options enabled

[Enrico Jorns]

Since RAUC 1.0 that calls tar with --numeric-owner argument, one needs
to have long options support enabled when using busybox tar.

Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
---
 rules/rauc.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/rauc.in b/rules/rauc.in
index 653939a8b..0de8c1599 100644
--- a/rules/rauc.in
+++ b/rules/rauc.in
@@ -6,6 +6,7 @@ menuconfig RAUC
 	select OPENSSL
 	select GLIB
 	select HOST_GLIB
+	select BUSYBOX_FEATURE_TAR_LONG_OPTIONS if BUSYBOX_TAR
 	select LIBCURL				if RAUC_NETWORK
 	select JSON_GLIB			if RAUC_JSON
 	select SQUASHFS_TOOLS			if RUNTIME
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de