From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 25 Jun 2021 11:41:29 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lwiL3-0001Sc-NJ for lore@lore.pengutronix.de; Fri, 25 Jun 2021 11:41:29 +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 1lwiL3-0007D9-8P; Fri, 25 Jun 2021 11:41:29 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lwiKU-0007CX-Ji; Fri, 25 Jun 2021 11:40:54 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lwiKT-0002gC-Rn; Fri, 25 Jun 2021 11:40:53 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1lwiKT-005dST-Qr; Fri, 25 Jun 2021 11:40:53 +0200 Date: Fri, 25 Jun 2021 11:40:53 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Message-ID: <20210625094053.GA4015839@pengutronix.de> Mail-Followup-To: ptxdist@pengutronix.de, Jon Ringle References: <20210622163504.11158-1-jon@ringle.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210622163504.11158-1-jon@ringle.org> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [ptxdist] [PATCH] host-systemd: Add option to install dev files 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: Jon Ringle Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 On Tue, Jun 22, 2021 at 04:35:04PM +0000, jon@ringle.org wrote: > From: Jon Ringle > > 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 > --- > 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