From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 04 Jul 2023 11:25:17 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qGcHe-00EbNr-IB for lore@lore.pengutronix.de; Tue, 04 Jul 2023 11:25:17 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1qGcHc-0005RU-MQ; Tue, 04 Jul 2023 11:25:16 +0200 Received: from ptz.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::77] helo=[IPv6:::1]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1qGcHS-0005R9-On; Tue, 04 Jul 2023 11:25:06 +0200 Message-ID: From: Enrico =?ISO-8859-1?Q?J=F6rns?= To: Michael Tretter , ptxdist@pengutronix.de Date: Tue, 04 Jul 2023 11:25:06 +0200 In-Reply-To: <20230704091808.GB13288@pengutronix.de> References: <20230630204927.2700230-1-ejo@pengutronix.de> <20230630204927.2700230-2-ejo@pengutronix.de> <20230704091808.GB13288@pengutronix.de> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.38.3-1+deb11u2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [PATCH 2/3] rauc: extend and align option pinning with configure order X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: ejo Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false 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 > > --- > >  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    |