* [ptxdist] [PATCH 1/3] rauc: fix PTXCONF_RAUC_CREATE handling
@ 2023-06-30 20:49 Enrico Jorns
2023-06-30 20:49 ` [ptxdist] [PATCH 2/3] rauc: extend and align option pinning with configure order Enrico Jorns
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Enrico Jorns @ 2023-06-30 20:49 UTC (permalink / raw)
To: ptxdist; +Cc: ejo
The existing --disable-create/--disable-create configure options were
not removed when the PTXCONF_RAUC_CREATE kconfig was introduced.
As a result of this, create could not be enabled for the target (since
it was forced to --disable-create afterwards) and the --enable-create
line was duplicated within the host-rauc recipe.
Fixes: c2ad273712cfb89c292dd5a72e8e1ee87a997ab7
("RAUC: leverage --disable-create option to shrink size for target RAUC")
Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
---
rules/host-rauc.make | 1 -
rules/rauc.make | 1 -
2 files changed, 2 deletions(-)
diff --git a/rules/host-rauc.make b/rules/host-rauc.make
index f0716da04..e5190bb8e 100644
--- a/rules/host-rauc.make
+++ b/rules/host-rauc.make
@@ -27,7 +27,6 @@ HOST_RAUC_CONF_OPT := \
--disable-Werror \
--disable-code-coverage \
--disable-valgrind \
- --enable-create \
--disable-service \
--enable-create \
--disable-network \
diff --git a/rules/rauc.make b/rules/rauc.make
index 0502fd370..35a4e8445 100644
--- a/rules/rauc.make
+++ b/rules/rauc.make
@@ -45,7 +45,6 @@ RAUC_CONF_OPT := \
--disable-valgrind \
--$(call ptx/endis,PTXCONF_RAUC_CREATE)-create \
--$(call ptx/endis,PTXCONF_RAUC_SERVICE)-service \
- --disable-create \
--$(call ptx/endis,PTXCONF_RAUC_NETWORK)-network \
--$(call ptx/endis,PTXCONF_RAUC_STREAMING)-streaming \
--$(call ptx/endis,PTXCONF_RAUC_JSON)-json \
--
2.39.2
^ permalink raw reply [flat|nested] 8+ messages in thread* [ptxdist] [PATCH 2/3] rauc: extend and align option pinning with configure order
2023-06-30 20:49 [ptxdist] [PATCH 1/3] rauc: fix PTXCONF_RAUC_CREATE handling Enrico Jorns
@ 2023-06-30 20:49 ` Enrico Jorns
2023-07-04 9:18 ` Michael Tretter
2023-07-08 7:03 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-06-30 20:49 ` [ptxdist] [PATCH 3/3] rauc: version bump 1.9 -> 1.10 Enrico Jorns
2023-07-08 7:03 ` [ptxdist] [APPLIED] rauc: fix PTXCONF_RAUC_CREATE handling Michael Olbrich
2 siblings, 2 replies; 8+ messages in thread
From: Enrico Jorns @ 2023-06-30 20:49 UTC (permalink / raw)
To: ptxdist; +Cc: ejo
Adds missing pinned configuration options and fixes ordering between
create and service option.
Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
---
rules/host-rauc.make | 2 ++
rules/rauc.make | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/rules/host-rauc.make b/rules/host-rauc.make
index e5190bb8e..0dc727e6d 100644
--- a/rules/host-rauc.make
+++ b/rules/host-rauc.make
@@ -30,9 +30,11 @@ HOST_RAUC_CONF_OPT := \
--disable-service \
--enable-create \
--disable-network \
+ --disable-streaming \
--disable-json \
--disable-gpt \
--with-gcov=gcov \
+ --with-streaming-user=nobody \
--with-systemdunitdir=/usr/lib/systemd/system \
--with-dbuspolicydir=/usr/share/dbus-1/system.d \
--with-dbussystemservicedir=/usr/share/dbus-1/system-services \
diff --git a/rules/rauc.make b/rules/rauc.make
index 35a4e8445..14e9f5ced 100644
--- a/rules/rauc.make
+++ b/rules/rauc.make
@@ -43,13 +43,14 @@ RAUC_CONF_OPT := \
--disable-Werror \
--disable-code-coverage \
--disable-valgrind \
- --$(call ptx/endis,PTXCONF_RAUC_CREATE)-create \
--$(call ptx/endis,PTXCONF_RAUC_SERVICE)-service \
+ --$(call ptx/endis,PTXCONF_RAUC_CREATE)-create \
--$(call ptx/endis,PTXCONF_RAUC_NETWORK)-network \
--$(call ptx/endis,PTXCONF_RAUC_STREAMING)-streaming \
--$(call ptx/endis,PTXCONF_RAUC_JSON)-json \
--$(call ptx/endis,PTXCONF_RAUC_GPT)-gpt \
--with-gcov=gcov \
+ --with-streaming_user=nobody \
--with-systemdunitdir=/usr/lib/systemd/system \
--with-dbuspolicydir=/usr/share/dbus-1/system.d \
--with-dbussystemservicedir=/usr/share/dbus-1/system-services \
--
2.39.2
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 2/3] rauc: extend and align option pinning with configure order
2023-06-30 20:49 ` [ptxdist] [PATCH 2/3] rauc: extend and align option pinning with configure order Enrico Jorns
@ 2023-07-04 9:18 ` Michael Tretter
2023-07-04 9:25 ` Enrico Jörns
2023-07-08 7:03 ` [ptxdist] [APPLIED] " Michael Olbrich
1 sibling, 1 reply; 8+ messages in thread
From: Michael Tretter @ 2023-07-04 9:18 UTC (permalink / raw)
To: ptxdist; +Cc: ejo
On Fri, 30 Jun 2023 22:49:26 +0200, Enrico Jorns wrote:
> Adds missing pinned configuration options and fixes ordering between
> create and service option.
>
> Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
> ---
> rules/host-rauc.make | 2 ++
> rules/rauc.make | 3 ++-
> 2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/rules/host-rauc.make b/rules/host-rauc.make
> index e5190bb8e..0dc727e6d 100644
> --- a/rules/host-rauc.make
> +++ b/rules/host-rauc.make
> @@ -30,9 +30,11 @@ HOST_RAUC_CONF_OPT := \
> --disable-service \
> --enable-create \
> --disable-network \
> + --disable-streaming \
> --disable-json \
> --disable-gpt \
> --with-gcov=gcov \
> + --with-streaming-user=nobody \
> --with-systemdunitdir=/usr/lib/systemd/system \
> --with-dbuspolicydir=/usr/share/dbus-1/system.d \
> --with-dbussystemservicedir=/usr/share/dbus-1/system-services \
> diff --git a/rules/rauc.make b/rules/rauc.make
> index 35a4e8445..14e9f5ced 100644
> --- a/rules/rauc.make
> +++ b/rules/rauc.make
> @@ -43,13 +43,14 @@ RAUC_CONF_OPT := \
> --disable-Werror \
> --disable-code-coverage \
> --disable-valgrind \
> - --$(call ptx/endis,PTXCONF_RAUC_CREATE)-create \
> --$(call ptx/endis,PTXCONF_RAUC_SERVICE)-service \
> + --$(call ptx/endis,PTXCONF_RAUC_CREATE)-create \
Maybe move the reordering of this option to the previous patch. It already
touches the create option.
> --$(call ptx/endis,PTXCONF_RAUC_NETWORK)-network \
> --$(call ptx/endis,PTXCONF_RAUC_STREAMING)-streaming \
> --$(call ptx/endis,PTXCONF_RAUC_JSON)-json \
> --$(call ptx/endis,PTXCONF_RAUC_GPT)-gpt \
> --with-gcov=gcov \
> + --with-streaming_user=nobody \
The option is inconsistent with the name of the option in the host-rauc
package. Should there be an underscore or a dash between streaming and user?
Michael
> --with-systemdunitdir=/usr/lib/systemd/system \
> --with-dbuspolicydir=/usr/share/dbus-1/system.d \
> --with-dbussystemservicedir=/usr/share/dbus-1/system-services \
> --
> 2.39.2
>
>
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 2/3] rauc: extend and align option pinning with configure order
2023-07-04 9:18 ` Michael Tretter
@ 2023-07-04 9:25 ` Enrico Jörns
0 siblings, 0 replies; 8+ messages in thread
From: Enrico Jörns @ 2023-07-04 9:25 UTC (permalink / raw)
To: Michael Tretter, ptxdist; +Cc: ejo
Am Dienstag, dem 04.07.2023 um 11:18 +0200 schrieb Michael Tretter:
> On Fri, 30 Jun 2023 22:49:26 +0200, Enrico Jorns wrote:
> > Adds missing pinned configuration options and fixes ordering between
> > create and service option.
> >
> > Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
> > ---
> > rules/host-rauc.make | 2 ++
> > rules/rauc.make | 3 ++-
> > 2 files changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/rules/host-rauc.make b/rules/host-rauc.make
> > index e5190bb8e..0dc727e6d 100644
> > --- a/rules/host-rauc.make
> > +++ b/rules/host-rauc.make
> > @@ -30,9 +30,11 @@ HOST_RAUC_CONF_OPT := \
> > --disable-service \
> > --enable-create \
> > --disable-network \
> > + --disable-streaming \
> > --disable-json \
> > --disable-gpt \
> > --with-gcov=gcov \
> > + --with-streaming-user=nobody \
> > --with-systemdunitdir=/usr/lib/systemd/system \
> > --with-dbuspolicydir=/usr/share/dbus-1/system.d \
> > --with-dbussystemservicedir=/usr/share/dbus-1/system-services \
> > diff --git a/rules/rauc.make b/rules/rauc.make
> > index 35a4e8445..14e9f5ced 100644
> > --- a/rules/rauc.make
> > +++ b/rules/rauc.make
> > @@ -43,13 +43,14 @@ RAUC_CONF_OPT := \
> > --disable-Werror \
> > --disable-code-coverage \
> > --disable-valgrind \
> > - --$(call ptx/endis,PTXCONF_RAUC_CREATE)-create \
> > --$(call ptx/endis,PTXCONF_RAUC_SERVICE)-service \
> > + --$(call ptx/endis,PTXCONF_RAUC_CREATE)-create \
>
> Maybe move the reordering of this option to the previous patch. It already
> touches the create option.
My intention was to keep the error fix the potentially changes behavior separate from the reordering
which does not change any behavior.
> > --$(call ptx/endis,PTXCONF_RAUC_NETWORK)-network \
> > --$(call ptx/endis,PTXCONF_RAUC_STREAMING)-streaming \
> > --$(call ptx/endis,PTXCONF_RAUC_JSON)-json \
> > --$(call ptx/endis,PTXCONF_RAUC_GPT)-gpt \
> > --with-gcov=gcov \
> > + --with-streaming_user=nobody \
>
> The option is inconsistent with the name of the option in the host-rauc
> package. Should there be an underscore or a dash between streaming and user?
Oh, good catch. I actually was confused by option naming here since this was inconsistent in RAUC
itself (see https://github.com/rauc/rauc/pull/1178 ).
Seems I fixed this for the target make only. So the right on is with undescore.
Enrico
> Michael
>
> > --with-systemdunitdir=/usr/lib/systemd/system \
> > --with-dbuspolicydir=/usr/share/dbus-1/system.d \
> > --with-dbussystemservicedir=/usr/share/dbus-1/system-services \
> > --
> > 2.39.2
> >
> >
> >
>
--
Pengutronix e.K. | Enrico Jörns |
Embedded Linux Consulting & Support | https://www.pengutronix.de/ |
Steuerwalder Str. 21 | Phone: +49-5121-206917-180 |
31137 Hildesheim, Germany | Fax: +49-5121-206917-9 |
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [APPLIED] rauc: extend and align option pinning with configure order
2023-06-30 20:49 ` [ptxdist] [PATCH 2/3] rauc: extend and align option pinning with configure order Enrico Jorns
2023-07-04 9:18 ` Michael Tretter
@ 2023-07-08 7:03 ` Michael Olbrich
1 sibling, 0 replies; 8+ messages in thread
From: Michael Olbrich @ 2023-07-08 7:03 UTC (permalink / raw)
To: ptxdist; +Cc: Enrico Jörns
Thanks, applied as 4e942f893e51f22958994f070b44cd7ea837faad.
Michael
[sent from post-receive hook]
On Sat, 08 Jul 2023 09:03:04 +0200, Enrico Jörns <ejo@pengutronix.de> wrote:
> Adds missing pinned configuration options and fixes ordering between
> create and service option.
>
> Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
> Message-Id: <20230630204927.2700230-2-ejo@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/host-rauc.make b/rules/host-rauc.make
> index e5190bb8e60a..0dc727e6d48d 100644
> --- a/rules/host-rauc.make
> +++ b/rules/host-rauc.make
> @@ -30,9 +30,11 @@ HOST_RAUC_CONF_OPT := \
> --disable-service \
> --enable-create \
> --disable-network \
> + --disable-streaming \
> --disable-json \
> --disable-gpt \
> --with-gcov=gcov \
> + --with-streaming-user=nobody \
> --with-systemdunitdir=/usr/lib/systemd/system \
> --with-dbuspolicydir=/usr/share/dbus-1/system.d \
> --with-dbussystemservicedir=/usr/share/dbus-1/system-services \
> diff --git a/rules/rauc.make b/rules/rauc.make
> index ab8fd53e792a..bed3814086e2 100644
> --- a/rules/rauc.make
> +++ b/rules/rauc.make
> @@ -43,13 +43,14 @@ RAUC_CONF_OPT := \
> --disable-Werror \
> --disable-code-coverage \
> --disable-valgrind \
> - --$(call ptx/endis,PTXCONF_RAUC_CREATE)-create \
> --$(call ptx/endis,PTXCONF_RAUC_SERVICE)-service \
> + --$(call ptx/endis,PTXCONF_RAUC_CREATE)-create \
> --$(call ptx/endis,PTXCONF_RAUC_NETWORK)-network \
> --$(call ptx/endis,PTXCONF_RAUC_STREAMING)-streaming \
> --$(call ptx/endis,PTXCONF_RAUC_JSON)-json \
> --$(call ptx/endis,PTXCONF_RAUC_GPT)-gpt \
> --with-gcov=gcov \
> + --with-streaming_user=nobody \
> --with-systemdunitdir=/usr/lib/systemd/system \
> --with-dbuspolicydir=/usr/share/dbus-1/system.d \
> --with-dbussystemservicedir=/usr/share/dbus-1/system-services \
^ permalink raw reply [flat|nested] 8+ messages in thread
* [ptxdist] [PATCH 3/3] rauc: version bump 1.9 -> 1.10
2023-06-30 20:49 [ptxdist] [PATCH 1/3] rauc: fix PTXCONF_RAUC_CREATE handling Enrico Jorns
2023-06-30 20:49 ` [ptxdist] [PATCH 2/3] rauc: extend and align option pinning with configure order Enrico Jorns
@ 2023-06-30 20:49 ` Enrico Jorns
2023-07-08 7:03 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-07-08 7:03 ` [ptxdist] [APPLIED] rauc: fix PTXCONF_RAUC_CREATE handling Michael Olbrich
2 siblings, 1 reply; 8+ messages in thread
From: Enrico Jorns @ 2023-06-30 20:49 UTC (permalink / raw)
To: ptxdist; +Cc: ejo
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 14e9f5ced..bed381408 100644
--- a/rules/rauc.make
+++ b/rules/rauc.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_RAUC) += rauc
#
# Paths and names
#
-RAUC_VERSION := 1.9
-RAUC_MD5 := 5b6ca0032185828f8f22d9a416319c3a
+RAUC_VERSION := 1.10
+RAUC_MD5 := 28de8bb641402bb77df5d5233925a97d
RAUC := rauc-$(RAUC_VERSION)
RAUC_SUFFIX := tar.xz
RAUC_URL := https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)/$(RAUC)-autotools.$(RAUC_SUFFIX)
--
2.39.2
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [APPLIED] rauc: fix PTXCONF_RAUC_CREATE handling
2023-06-30 20:49 [ptxdist] [PATCH 1/3] rauc: fix PTXCONF_RAUC_CREATE handling Enrico Jorns
2023-06-30 20:49 ` [ptxdist] [PATCH 2/3] rauc: extend and align option pinning with configure order Enrico Jorns
2023-06-30 20:49 ` [ptxdist] [PATCH 3/3] rauc: version bump 1.9 -> 1.10 Enrico Jorns
@ 2023-07-08 7:03 ` Michael Olbrich
2 siblings, 0 replies; 8+ messages in thread
From: Michael Olbrich @ 2023-07-08 7:03 UTC (permalink / raw)
To: ptxdist; +Cc: Enrico Jörns
Thanks, applied as 13713e62b43478e8aa5e284cd6b739c34253db71.
Michael
[sent from post-receive hook]
On Sat, 08 Jul 2023 09:03:02 +0200, Enrico Jörns <ejo@pengutronix.de> wrote:
> The existing --disable-create/--disable-create configure options were
> not removed when the PTXCONF_RAUC_CREATE kconfig was introduced.
>
> As a result of this, create could not be enabled for the target (since
> it was forced to --disable-create afterwards) and the --enable-create
> line was duplicated within the host-rauc recipe.
>
> Fixes: c2ad273712cfb89c292dd5a72e8e1ee87a997ab7
> ("RAUC: leverage --disable-create option to shrink size for target RAUC")
>
> Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
> Message-Id: <20230630204927.2700230-1-ejo@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/host-rauc.make b/rules/host-rauc.make
> index f0716da042b6..e5190bb8e60a 100644
> --- a/rules/host-rauc.make
> +++ b/rules/host-rauc.make
> @@ -27,7 +27,6 @@ HOST_RAUC_CONF_OPT := \
> --disable-Werror \
> --disable-code-coverage \
> --disable-valgrind \
> - --enable-create \
> --disable-service \
> --enable-create \
> --disable-network \
> diff --git a/rules/rauc.make b/rules/rauc.make
> index 0502fd3704ed..35a4e84457b7 100644
> --- a/rules/rauc.make
> +++ b/rules/rauc.make
> @@ -45,7 +45,6 @@ RAUC_CONF_OPT := \
> --disable-valgrind \
> --$(call ptx/endis,PTXCONF_RAUC_CREATE)-create \
> --$(call ptx/endis,PTXCONF_RAUC_SERVICE)-service \
> - --disable-create \
> --$(call ptx/endis,PTXCONF_RAUC_NETWORK)-network \
> --$(call ptx/endis,PTXCONF_RAUC_STREAMING)-streaming \
> --$(call ptx/endis,PTXCONF_RAUC_JSON)-json \
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-07-08 7:04 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-30 20:49 [ptxdist] [PATCH 1/3] rauc: fix PTXCONF_RAUC_CREATE handling Enrico Jorns
2023-06-30 20:49 ` [ptxdist] [PATCH 2/3] rauc: extend and align option pinning with configure order Enrico Jorns
2023-07-04 9:18 ` Michael Tretter
2023-07-04 9:25 ` Enrico Jörns
2023-07-08 7:03 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-06-30 20:49 ` [ptxdist] [PATCH 3/3] rauc: version bump 1.9 -> 1.10 Enrico Jorns
2023-07-08 7:03 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-07-08 7:03 ` [ptxdist] [APPLIED] rauc: fix PTXCONF_RAUC_CREATE handling Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox