summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/cups
diff options
context:
space:
mode:
authorIn Long <inlong_tec@163.com>2014-09-03 15:09:09 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-03 11:09:05 +0100
commitcd8255bb4d8ea54cbf88aaa4c0914573571b91f6 (patch)
treecae5ae54baa6a4e2c808087e5c565fa8fa715a1a /meta/recipes-extended/cups
parentf9c6b40fb116c12701c12bb28b4b2b909578c823 (diff)
downloadpoky-cd8255bb4d8ea54cbf88aaa4c0914573571b91f6.tar.gz
cups: make cups daemon start correctly
The cups daemon needs the lpadmin group to start correctly. Also add 'procps' to RDEPENDS if 'sysvinit' is in DISTRO_FEATURES, because the init script shipped with cups needs it. (From OE-Core rev: a8b2f086034585f3e115db3055575833922e3a59) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/cups')
-rw-r--r--meta/recipes-extended/cups/cups.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index adf21eb17e..162b3fd844 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -12,7 +12,10 @@ SRC_URI = "http://www.cups.org/software/${PV}/${BP}-source.tar.bz2 \
12 12
13LEAD_SONAME = "libcupsdriver.so" 13LEAD_SONAME = "libcupsdriver.so"
14 14
15inherit autotools-brokensep binconfig 15inherit autotools-brokensep binconfig useradd
16
17USERADD_PACKAGES = "${PN}"
18GROUPADD_PARAM_${PN} = "--system lpadmin"
16 19
17PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ 20PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \
18 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" 21 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
@@ -79,6 +82,7 @@ python do_package_append() {
79 82
80PACKAGES =+ "${PN}-lib ${PN}-libimage" 83PACKAGES =+ "${PN}-lib ${PN}-libimage"
81 84
85RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'procps', '', d)}"
82FILES_${PN} += "${libdir}/cups/backend \ 86FILES_${PN} += "${libdir}/cups/backend \
83 ${libdir}/cups/cgi-bin \ 87 ${libdir}/cups/cgi-bin \
84 ${libdir}/cups/filter \ 88 ${libdir}/cups/filter \