aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2018-12-14 16:54:35 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-12-14 22:38:19 +0100
commit53e285daaac453932d4d9a9c5ca65a9f0a9e8c62 (patch)
treeab5ba4241916e5166998f7c979a36598d5d7b672
parent6a6f9306d8788829bcd1febc820c5b231f06fbb5 (diff)
downloadbuildroot-53e285daaac453932d4d9a9c5ca65a9f0a9e8c62.tar.gz
buildroot-53e285daaac453932d4d9a9c5ca65a9f0a9e8c62.tar.bz2
package/alsa-utils: fix systemd build with 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. alsa-utils uses the systemdsystemunitdir 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 systemdsystemunitdir to use explicitly instead of relying on systemd.pc. Fixes: - http://autobuild.buildroot.org/results/d8ad140ae52b4fe8e153de3835f3f17e92b58e53 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/alsa-utils/alsa-utils.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk
index 0bf2b432bd..4ce4aace46 100644
--- a/package/alsa-utils/alsa-utils.mk
+++ b/package/alsa-utils/alsa-utils.mk
@@ -84,6 +84,7 @@ endef
ifeq ($(BR2_PACKAGE_ALSA_UTILS_ALSACTL)$(BR2_INIT_SYSTEMD),yy)
ALSA_UTILS_DEPENDENCIES += systemd
+ALSA_UTILS_CONF_OPTS += --with-systemdsystemunitdir=/usr/lib/systemd/system
define ALSA_UTILS_INSTALL_INIT_SYSTEMD
$(INSTALL) -D -m 0644 $(@D)/alsactl/alsa-restore.service \
$(TARGET_DIR)/usr/lib/systemd/system/alsa-restore.service