Skip to contentSkip to conversation

connman: fix systemd build wih pkgconf 1.5.3

PATCH New Fabrice Fontaine 2 participants 2 messages Dec 16, 2018 – Dec 19, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 connman: fix systemd build wih pkgconf 1.5.3

Since the bump to 1.5.3, pkgconf prepends the sysroot to all absolute paths found in the .pc file. This is correct when the paths refer to something in STAGING_DIR (e.g. libdir, includedir), but not when it refers to something used for the target.

connman uses the tmpfilesdir variable from systemd.pc to decide where to install things. Since DESTDIR is prepended to the install destination, this will end up in the wrong location.

Until a better solution is found in pkgconf, pass the tmpfilesdir to use explicitly instead of relying on systemd.pc.

Fixes:
- http://autobuild.buildroot.org/results/6a13e6dfc58b2b3f8fbad6d6d6462370a75a8ad4

---
 package/connman/connman.mk | 1 +
 1 file changed, 1 insertion(+)
package/connman/connman.mk +1 -0
index b67d1c4b86..ce73c5acc1 100644
@@ -13,6 +13,7 @@ CONNMAN_LICENSE = GPL-2.0
 CONNMAN_LICENSE_FILES = COPYING
 CONNMAN_CONF_OPTS += \
 	--with-dbusconfdir=/etc \
+	--with-tmpfilesdir=/usr/lib/tmpfiles.d \
 	$(if $(BR2_PACKAGE_CONNMAN_DEBUG),--enable-debug,--disable-debug) \
 	$(if $(BR2_PACKAGE_CONNMAN_ETHERNET),--enable-ethernet,--disable-ethernet) \
 	$(if $(BR2_PACKAGE_CONNMAN_WIFI),--enable-wifi,--disable-wifi) \
Signature · 1 line
2.14.1
#1 lore raw

PATCH 1/1 connman: fix systemd build wih pkgconf 1.5.3

Hi Fabrice,

Quoted 9 lines

Since the bump to 1.5.3, pkgconf prepends the sysroot to all absolute paths found in the .pc file. This is correct when the paths refer to something in STAGING_DIR (e.g. libdir, includedir), but not when it refers to something used for the target.

connman uses the tmpfilesdir variable from systemd.pc to decide where to install things. Since DESTDIR is prepended to the install destination, this will end up in the wrong location.

Quoted 7 lines

Until a better solution is found in pkgconf, pass the tmpfilesdir to use explicitly instead of relying on systemd.pc.

Fixes:
- http://autobuild.buildroot.org/results/6a13e6dfc58b2b3f8fbad6d6d6462370a75a8ad4

Thanks for your fix!

Kind regards,
Petr