mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: "Enrico Jörns" <ejo@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] rauc: migrate to meson
Date: Sat,  8 Jul 2023 09:03:05 +0200	[thread overview]
Message-ID: <20230708070305.2206453-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20230630210216.2724278-1-ejo@pengutronix.de>

Thanks, applied as 6e72460fe79714249b8100004886db82f2c2ef78.

Michael

[sent from post-receive hook]

On Sat, 08 Jul 2023 09:03:05 +0200, Enrico Jörns <ejo@pengutronix.de> wrote:
> Since different archive paths are used for the autotools and the meson
> variant of rauc, we need to put them to distinct SRCDIR locations in
> order to differentiate them when picking up. For this, add the -meson
> suffix to RAUC_SOURCE.
> This might be removed again when switching to the next release.
> 
> Also, RAUC_CONF_ENV modification does not seem to be needed since all
> installed paths look valid without it.
> 
> Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
> Message-Id: <20230630210216.2724278-1-ejo@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/host-rauc.in b/rules/host-rauc.in
> index adb90410732c..0dddc742d03e 100644
> --- a/rules/host-rauc.in
> +++ b/rules/host-rauc.in
> @@ -4,5 +4,6 @@ config HOST_RAUC
>  	tristate
>  	default y if ALLYES
>  	select HOST_GLIB
> +	select HOST_MESON
>  	select HOST_OPENSSL
>  	select HOST_SQUASHFS_TOOLS
> diff --git a/rules/host-rauc.make b/rules/host-rauc.make
> index 0dc727e6d48d..438d77bfb1e1 100644
> --- a/rules/host-rauc.make
> +++ b/rules/host-rauc.make
> @@ -18,26 +18,20 @@ HOST_PACKAGES-$(PTXCONF_HOST_RAUC) += host-rauc
>  #
>  # autoconf
>  #
> -HOST_RAUC_CONF_TOOL	:= autoconf
> +HOST_RAUC_CONF_TOOL	:= meson
>  HOST_RAUC_CONF_OPT	:= \
>  	$(HOST_AUTOCONF) \
> -	--enable-debug=info \
> -	--enable-largefile \
> -	--enable-compile-warnings=yes \
> -	--disable-Werror \
> -	--disable-code-coverage \
> -	--disable-valgrind \
> -	--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 \
> -	--with-dbusinterfacesdir=/usr/share/dbus-1/interfaces
> +	-Dcreate=true \
> +	-Ddbusinterfacesdir=/usr/share/dbus-1/interfaces \
> +	-Ddbuspolicydir=/usr/share/dbus-1/system.d \
> +	-Ddbussystemservicedir=/usr/share/dbus-1/system-services \
> +	-Dgpt=disabled \
> +	-Djson=disabled \
> +	-Dnetwork=false \
> +	-Dservice=false \
> +	-Dstreaming=false \
> +	-Dstreaming_user=nobody \
> +	-Dsystemdunitdir=/usr/lib/systemd/system \
> +	-Dtests=false
>  
>  # vim: syntax=make
> diff --git a/rules/rauc.in b/rules/rauc.in
> index db3a87485f47..e67f5131c615 100644
> --- a/rules/rauc.in
> +++ b/rules/rauc.in
> @@ -3,6 +3,7 @@
>  menuconfig RAUC
>  	tristate
>  	prompt "RAUC Update Tool              "
> +	select HOST_MESON
>  	select OPENSSL
>  	select GLIB
>  	select GLIB_LIBMOUNT
> diff --git a/rules/rauc.make b/rules/rauc.make
> index bed3814086e2..38fa864730d0 100644
> --- a/rules/rauc.make
> +++ b/rules/rauc.make
> @@ -1,6 +1,6 @@
>  # -*-makefile-*-
>  #
> -# Copyright (C) 2015 by Enrico Joerns <e.joerns@pengutronix.de>
> +# Copyright (C) 2015-2023 by Enrico Joerns <e.joerns@pengutronix.de>
>  #
>  # For further information about the PTXdist project and license conditions
>  # see the README file.
> @@ -15,11 +15,11 @@ PACKAGES-$(PTXCONF_RAUC) += rauc
>  # Paths and names
>  #
>  RAUC_VERSION	:= 1.10
> -RAUC_MD5	:= 28de8bb641402bb77df5d5233925a97d
> +RAUC_MD5	:= ed1ebd5e0c1081528a3a6f26355cbbcc
>  RAUC		:= rauc-$(RAUC_VERSION)
>  RAUC_SUFFIX	:= tar.xz
> -RAUC_URL	:= https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)/$(RAUC)-autotools.$(RAUC_SUFFIX)
> -RAUC_SOURCE	:= $(SRCDIR)/$(RAUC).$(RAUC_SUFFIX)
> +RAUC_URL	:= https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)/$(RAUC).$(RAUC_SUFFIX)
> +RAUC_SOURCE	:= $(SRCDIR)/$(RAUC)-meson.$(RAUC_SUFFIX)
>  RAUC_DIR	:= $(BUILDDIR)/$(RAUC)
>  RAUC_LICENSE	:= LGPL-2.1-only
>  
> @@ -27,34 +27,24 @@ RAUC_LICENSE	:= LGPL-2.1-only
>  # Prepare
>  # ----------------------------------------------------------------------------
>  
> -RAUC_CONF_ENV	:= \
> -	$(CROSS_ENV) \
> -	PTXDIST_PKG_CONFIG_VAR_NO_SYSROOT=interfaces_dir
> -
>  #
> -# autoconf
> +# meson
>  #
> -RAUC_CONF_TOOL	:= autoconf
> +RAUC_CONF_TOOL	:= meson
>  RAUC_CONF_OPT	:= \
> -	$(CROSS_AUTOCONF_USR) \
> -	--enable-debug=info \
> -	$(GLOBAL_LARGE_FILE_OPTION) \
> -	--enable-compile-warnings=yes \
> -	--disable-Werror \
> -	--disable-code-coverage \
> -	--disable-valgrind \
> -	--$(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 \
> -	--with-dbusinterfacesdir=/usr/share/dbus-1/interfaces
> +	$(CROSS_MESON_USR) \
> +	-Dcreate=$(call ptx/truefalse,PTXCONF_RAUC_CREATE) \
> +	-Ddbusinterfacesdir=/usr/share/dbus-1/interfaces \
> +	-Ddbuspolicydir=/usr/share/dbus-1/system.d \
> +	-Ddbussystemservicedir=/usr/share/dbus-1/system-services \
> +	-Dgpt=$(call ptx/endis,PTXCONF_RAUC_GPT)d \
> +	-Djson=$(call ptx/endis,PTXCONF_RAUC_JSON)d \
> +	-Dnetwork=$(call ptx/truefalse,PTXCONF_RAUC_NETWORK) \
> +	-Dservice=$(call ptx/truefalse,PTXCONF_RAUC_SERVICE) \
> +	-Dstreaming=$(call ptx/truefalse,PTXCONF_RAUC_STREAMING) \
> +	-Dstreaming_user=nobody \
> +	-Dsystemdunitdir=/usr/lib/systemd/system \
> +	-Dtests=false
>  
>  $(STATEDIR)/rauc.prepare:
>  	@$(call targetinfo)



      parent reply	other threads:[~2023-07-08  7:04 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-30 21:02 [ptxdist] [PATCH] " Enrico Jorns
2023-07-04  9:27 ` Michael Tretter
2023-07-08  7:03 ` Michael Olbrich [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230708070305.2206453-1-m.olbrich@pengutronix.de \
    --to=m.olbrich@pengutronix.de \
    --cc=ejo@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox