Re: [ptxdist] [PATCH v2 2/2] host-systemd: Add option to install hwdb only (enabled by default)

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Tue, Jul 31, 2018 at 08:22:34PM -0400, jon@ringle.org wrote:
> From: Jon Ringle <jringle@gridpoint.com>
> 
> Signed-off-by: Jon Ringle <jringle@gridpoint.com>
> ---
>  rules/host-systemd.in   | 12 ++++++++++--
>  rules/host-systemd.make |  6 ++++++
>  2 files changed, 16 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/host-systemd.in b/rules/host-systemd.in
> index 4d82ffc..58fb8d1 100644
> --- a/rules/host-systemd.in
> +++ b/rules/host-systemd.in
> @@ -1,7 +1,8 @@
> -## SECTION=hosttools_noprompt
> +## SECTION=hosttools
>  
> -config HOST_SYSTEMD
> +menuconfig HOST_SYSTEMD
>  	bool
> +	prompt "host systemd                  "
>  	default ALLYES
>  	select HOST_MESON
>  	select HOST_GPERF
> @@ -9,3 +10,10 @@ config HOST_SYSTEMD
>  	select HOST_COREUTILS
>  	select HOST_UTIL_LINUX_NG
>  	select HOST_LIBCAP
> +
> +config HOST_SYSTEMD_HWDB_ONLY
> +	bool
> +	prompt "systemd-hwdb only"
> +	depends on HOST_SYSTEMD && SYSTEMD_UDEV_HWDB
> +	default y

I'd like to avoid prompts for host packages like this. And the logic should
be inverted. Add an option to build the 'full' systemd and select it from
your package.

Michael

> +
> diff --git a/rules/host-systemd.make b/rules/host-systemd.make
> index f134f13..212114a 100644
> --- a/rules/host-systemd.make
> +++ b/rules/host-systemd.make
> @@ -121,7 +121,9 @@ HOST_SYSTEMD_CONF_OPT	:= \
>  	-Dxz=false \
>  	-Dzlib=false
>  
> +ifdef PTXCONF_HOST_SYSTEMD_HWDB_ONLY
>  HOST_SYSTEMD_MAKE_OPT := systemd-hwdb
> +endif
>  
>  # ----------------------------------------------------------------------------
>  # Install
> @@ -129,11 +131,15 @@ HOST_SYSTEMD_MAKE_OPT := systemd-hwdb
>  
>  $(STATEDIR)/host-systemd.install:
>  	@$(call targetinfo)
> +ifdef PTXCONF_HOST_SYSTEMD_HWDB_ONLY
>  	@rm -rf $(HOST_SYSTEMD_PKGDIR)
>  	@install -vD -m755 $(HOST_SYSTEMD_DIR)-build/systemd-hwdb \
>  		$(HOST_SYSTEMD_PKGDIR)/bin/systemd-hwdb
>  	@install -vD -m755 $(HOST_SYSTEMD_DIR)-build/src/shared/libsystemd-shared-$(HOST_SYSTEMD_VERSION).so \
>  		$(HOST_SYSTEMD_PKGDIR)/lib/libsystemd-shared-$(HOST_SYSTEMD_VERSION).so
> +else
> +	@$(call world/install, HOST_SYSTEMD)
> +endif
>  	@$(call touch)
>  
>  # vim: syntax=make
> -- 
> 1.9.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de