[PATCH] cups: explicitly configure with systemd when needed

Andrew Shadura
2015-10-21T17:41:19Z

Add PACKAGECONFIG for systemd, enable it when systemd is enabled
in DISTRO_FEATURES. Pass the correct path to systemd units,
ensure they're installed into the package.

Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk>
---
I hope this patch will be merged before jethro is released :)

meta/recipes-extended/cups/cups.inc | 3 +++
1 file changed, 3 insertions(+)

diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index 2c34da9..ad980fc 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -24,10 +24,12 @@ GROUPADD_PARAM_${PN} = "--system lpadmin"
SYSTEMD_SERVICE_${PN} = "cups.socket cups.path cups.service"

PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi"
PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl"
PACKAGECONFIG[pam] = "--enable-pam, --disable-pam, libpam"
+PACKAGECONFIG[systemd] = "--with-systemd=${systemd_system_unitdir},--without-systemd,systemd"
PACKAGECONFIG[xinetd] = "--with-xinetd=${sysconfdir}/xinetd.d,--without-xinetd,xinetd"

EXTRA_OECONF = " \
@@ -100,6 +102,7 @@ FILES_${PN} += "${libdir}/cups/backend \
${libdir}/cups/monitor \
${libdir}/cups/notifier \
${libdir}/cups/daemon \
+ ${systemd_system_unitdir} \
"

FILES_${PN}-lib = "${libdir}/libcups.so.*"
--
2.1.4