mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] host-systemd: Add option to install dev files
@ 2021-06-22 16:35 jon
  2021-06-25  9:40 ` Michael Olbrich
  0 siblings, 1 reply; 4+ messages in thread
From: jon @ 2021-06-22 16:35 UTC (permalink / raw)
  To: ptxdist; +Cc: Jon Ringle

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=/ \
 	-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


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [ptxdist] [PATCH] host-systemd: Add option to install dev files
  2021-06-22 16:35 [ptxdist] [PATCH] host-systemd: Add option to install dev files jon
@ 2021-06-25  9:40 ` Michael Olbrich
       [not found]   ` <CAMwGMjzr_sOSJRwd+544XJYxQ_sD+oLXQmK-sxi7seu9AR_QwA@mail.gmail.com>
  0 siblings, 1 reply; 4+ messages in thread
From: Michael Olbrich @ 2021-06-25  9:40 UTC (permalink / raw)
  To: ptxdist; +Cc: Jon Ringle

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


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [ptxdist] [PATCH] host-systemd: Add option to install dev files
       [not found]   ` <CAMwGMjzr_sOSJRwd+544XJYxQ_sD+oLXQmK-sxi7seu9AR_QwA@mail.gmail.com>
@ 2021-07-08  4:59     ` Michael Olbrich
       [not found]       ` <CAMwGMjw8rXn5vfJp+UNvyWaD4x4d_PSPz9Ucr4HLK2Mh1niSYQ@mail.gmail.com>
  0 siblings, 1 reply; 4+ messages in thread
From: Michael Olbrich @ 2021-07-08  4:59 UTC (permalink / raw)
  To: ptxdist

On Wed, Jul 07, 2021 at 05:06:56PM -0400, Jon Ringle wrote:
> On Fri, Jun 25, 2021 at 5:41 AM Michael Olbrich <m.olbrich@pengutronix.de>
> wrote:
> 
> > 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"
> >
> > This breaks hwdb for the host package?
> 
> 
> > 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.
> >
> >
> I'm trying to work out how the systemd-hwdb package relates to the
> host-systemd package...

host-systemd provides the systemd-hwdb host tool that the systemd-hwdb
package uses to generate the hwdb database at build-time.

The (relative) path, where the database is created is hardcoded and defined
by the rootprefix.

Michael

-- 
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


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [ptxdist] [PATCH] host-systemd: Add option to install dev files
       [not found]       ` <CAMwGMjw8rXn5vfJp+UNvyWaD4x4d_PSPz9Ucr4HLK2Mh1niSYQ@mail.gmail.com>
@ 2021-07-09 14:02         ` Michael Olbrich
  0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2021-07-09 14:02 UTC (permalink / raw)
  To: Jon Ringle; +Cc: ptxdist

On Fri, Jul 09, 2021 at 09:28:32AM -0400, Jon Ringle wrote:
> On Thu, Jul 8, 2021 at 12:59 AM Michael Olbrich <m.olbrich@pengutronix.de>
> wrote:
> 
> > On Wed, Jul 07, 2021 at 05:06:56PM -0400, Jon Ringle wrote:
> > > On Fri, Jun 25, 2021 at 5:41 AM Michael Olbrich <
> > m.olbrich@pengutronix.de>
> > > wrote:
> > >
> > > > 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"
> > > >
> > > > This breaks hwdb for the host package?
> > >
> > >
> > > > 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.
> > > >
> > > >
> > > I'm trying to work out how the systemd-hwdb package relates to the
> > > host-systemd package...
> >
> > host-systemd provides the systemd-hwdb host tool that the systemd-hwdb
> > package uses to generate the hwdb database at build-time.
> >
> > The (relative) path, where the database is created is hardcoded and defined
> > by the rootprefix.
> >
> >
> I have never built systemd-hwdb before, but when I do it fails like this:
> 
> ----------------------------
> target: systemd-hwdb.install
> ----------------------------
> 
> install: creating directory
> '/src/build/platform-ec2k/packages/systemd-hwdb-1/usr/lib/udev'
> /src/build/platform-ec2k/sysroot-host/bin/systemd-hwdb: error while loading
> shared libraries: libsystemd-shared-248.so: cannot open shared object file:
> No such file or directory
> make: *** [/src/build/rules/systemd-hwdb.make:26:
> /src/build/platform-ec2k/state/systemd-hwdb.install] Error 127
> 
> I find this file here:
> jringle@-arm-v7a-linux-gnueabihf:~/build$ find
> /src/build/platform-ec2k/sysroot-host/ -name libsystemd-shared-248.so
> /src/build/platform-ec2k/sysroot-host/lib/systemd/libsystemd-shared-248.so

Take a look at host-systemd.make. We move libsystemd-shared-248.so to
sysroot-host/lib/ in the install stage. It's ugly but it works :-). With
your change, that no longer happens and libsystemd-shared-248.so is not
found. Maybe create a symlink for this after world/install?

Michael

-- 
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


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-07-09 14:03 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-22 16:35 [ptxdist] [PATCH] host-systemd: Add option to install dev files jon
2021-06-25  9:40 ` Michael Olbrich
     [not found]   ` <CAMwGMjzr_sOSJRwd+544XJYxQ_sD+oLXQmK-sxi7seu9AR_QwA@mail.gmail.com>
2021-07-08  4:59     ` Michael Olbrich
     [not found]       ` <CAMwGMjw8rXn5vfJp+UNvyWaD4x4d_PSPz9Ucr4HLK2Mh1niSYQ@mail.gmail.com>
2021-07-09 14:02         ` Michael Olbrich

mailarchive of the ptxdist mailing list

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://lore.ptxdist.org/ptxdist/0 ptxdist/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ptxdist ptxdist/ https://lore.ptxdist.org/ptxdist \
		ptxdist@pengutronix.de
	public-inbox-index ptxdist

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git