summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDiego Rondini <diego.rondini@kynetics.com>2020-01-08 17:48:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-10 21:18:22 +0000
commit1128c128ce64f5e7f5f0f0f83471d61d91d48cca (patch)
tree5045fb7f2ae0d8deb82c2db5d41264c2572fa42e /meta
parent019f8d3c0023b3d74790896148c174060cb2a604 (diff)
downloadpoky-1128c128ce64f5e7f5f0f0f83471d61d91d48cca.tar.gz
cups: fix crossscripts
Fix crossscripts to report the correct "serverbin" value. While the packaged "cups-config --serverbin" reported "/usr/libexec/cups" the crossscripts version reported "/usr/lib/cups", causing packaging issues when building for example cups-filters. Also fix FILES_${PN} to use ${libexecdir}; previously it was working just because "${libexecdir}/*" was part of the default values in bitbake.conf. (From OE-Core rev: 2ce6ef29b9bb4f16ed9d78e166d455b7a6d968bf) Signed-off-by: Diego Rondini <diego.rondini@kynetics.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/cups/cups.inc9
1 files changed, 2 insertions, 7 deletions
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index b94bc1d412..34982819b9 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -84,12 +84,7 @@ do_install () {
84PACKAGES =+ "${PN}-lib ${PN}-libimage" 84PACKAGES =+ "${PN}-lib ${PN}-libimage"
85 85
86RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'procps', '', d)}" 86RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'procps', '', d)}"
87FILES_${PN} += "${libdir}/cups/backend \ 87FILES_${PN} += "${libexecdir}/cups/ \
88 ${libdir}/cups/cgi-bin \
89 ${libdir}/cups/filter \
90 ${libdir}/cups/monitor \
91 ${libdir}/cups/notifier \
92 ${libdir}/cups/daemon \
93 " 88 "
94 89
95FILES_${PN}-lib = "${libdir}/libcups.so.*" 90FILES_${PN}-lib = "${libdir}/libcups.so.*"
@@ -107,5 +102,5 @@ CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf"
107 102
108SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess" 103SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess"
109cups_sysroot_preprocess () { 104cups_sysroot_preprocess () {
110 sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e 's:cups_serverbin=.*:cups_serverbin=${libdir}/cups:' 105 sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e 's:cups_serverbin=.*:cups_serverbin=${libexecdir}/cups:'
111} 106}