summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-16 15:17:09 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-16 16:47:44 +0000
commit5ed180ee3bdb304c126ee7b24cd01de1cf237f9f (patch)
tree9dc49aaf2eccbaf51a803d35bd8809ec06d6b92b
parent1871ec8d015ca691a527c0a3e166d076b46dd970 (diff)
downloadpoky-5ed180ee3bdb304c126ee7b24cd01de1cf237f9f.tar.gz
cups: Ensure cups-config has correct target paths, not sysroot ones for cups_serverbin and cups_datadir variables
These are used by dependent packages to know where to install cups related pieces into therefore we need to remove the sysroot prefix from these. (From OE-Core rev: edb8eb566968d386f6995b95d54bc7c25a50b02a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/cups/cups14.inc5
-rw-r--r--meta/recipes-extended/cups/cups_1.4.6.bb2
2 files changed, 6 insertions, 1 deletions
diff --git a/meta/recipes-extended/cups/cups14.inc b/meta/recipes-extended/cups/cups14.inc
index 2bf3ecfd6f..7c1968220d 100644
--- a/meta/recipes-extended/cups/cups14.inc
+++ b/meta/recipes-extended/cups/cups14.inc
@@ -91,3 +91,8 @@ FILES_${PN} += "${datadir}/doc/cups/images \
91 ${datadir}/doc/cups/*.css \ 91 ${datadir}/doc/cups/*.css \
92 ${datadir}/icons/ \ 92 ${datadir}/icons/ \
93 " 93 "
94
95SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess"
96cups_sysroot_preprocess () {
97 sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e 's:cups_serverbin=.*:cups_serverbin=${libdir}/cups:'
98}
diff --git a/meta/recipes-extended/cups/cups_1.4.6.bb b/meta/recipes-extended/cups/cups_1.4.6.bb
index 0dc2d4a26b..ec555d791d 100644
--- a/meta/recipes-extended/cups/cups_1.4.6.bb
+++ b/meta/recipes-extended/cups/cups_1.4.6.bb
@@ -1,6 +1,6 @@
1require cups14.inc 1require cups14.inc
2 2
3PR = "r2" 3PR = "r3"
4DEPENDS += "libusb \ 4DEPENDS += "libusb \
5 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 5 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
6 6