Re: [ptxdist] [PATCH] host-systemd: Add option to install dev files

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

On Tue, Jun 22, 2021 at 04:35:04PM +0000, jon@ringle.org wrote:
> From: Jon Ringle <jringle@gridpoint.com>
> 
> Doing a full install that include dev files is
> helpful if a project needs this support.
> 
> I created a host-sdbus-cpp project that depends
> on libsystemd. The -Drootprefix=/ was required
> to have cmake pkg-config work properly.
> 
> Signed-off-by: Jon Ringle <jringle@gridpoint.com>
> ---
>  rules/host-systemd.in   | 7 +++++++
>  rules/host-systemd.make | 7 +++++++
>  2 files changed, 14 insertions(+)
> 
> diff --git a/rules/host-systemd.in b/rules/host-systemd.in
> index f80d9de10..828694f80 100644
> --- a/rules/host-systemd.in
> +++ b/rules/host-systemd.in
> @@ -7,3 +7,10 @@ config HOST_SYSTEMD
>  	select HOST_GPERF
>  	select HOST_UTIL_LINUX_NG
>  	select HOST_LIBCAP
> +
> +config HOST_SYSTEMD_INSTALL_DEV
> +	bool
> +	default n
> +	help
> +	 Install host systemd development headers/libs
> +
> diff --git a/rules/host-systemd.make b/rules/host-systemd.make
> index 42409d7b5..58b44a683 100644
> --- a/rules/host-systemd.make
> +++ b/rules/host-systemd.make
> @@ -20,6 +20,7 @@ HOST_SYSTEMD_CONF_TOOL	:= meson
>  HOST_SYSTEMD_CONF_OPT	:= \
>  	$(HOST_MESON_OPT) \
>  	-Dprefix=/usr \
> +	-Drootprefix=/ \

This breaks hwdb: The path for the output file is hardcoded as
"${destdir}${rootprefix}/lib/udev/hwdb.bin"

Hmmm, maybe we could add '/usr' to the destdir. Please try that. This is
the '--root' argument the systemd-hwdb package.
If it works then the systemd-hwdb package should generate a hwdb that is
about 10MB in size.

If it works, remove the prefix instead of adding the rootprefix.

Michael

>  	-Dacl=false \
>  	-Dadm-group=true \
>  	-Danalyze=false \
> @@ -157,7 +158,9 @@ HOST_SYSTEMD_CONF_OPT	:= \
>  	-Dzlib=false \
>  	-Dzstd=false
>  
> +ifndef PTXCONF_HOST_SYSTEMD_INSTALL_DEV
>  HOST_SYSTEMD_MAKE_OPT := systemd-hwdb
> +endif
>  
>  # ----------------------------------------------------------------------------
>  # Install
> @@ -165,11 +168,15 @@ HOST_SYSTEMD_MAKE_OPT := systemd-hwdb
>  
>  $(STATEDIR)/host-systemd.install:
>  	@$(call targetinfo)
> +ifdef PTXCONF_HOST_SYSTEMD_INSTALL_DEV
> +	@$(call world/install, HOST_SYSTEMD)
> +else
>  	@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-$(SYSTEMD_VERSION_MAJOR).so \
>  		$(HOST_SYSTEMD_PKGDIR)/lib/libsystemd-shared-$(SYSTEMD_VERSION_MAJOR).so
>  	@$(call touch)
> +endif
>  
>  # vim: syntax=make
> -- 
> 2.25.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de