summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-09-22 12:12:09 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-22 21:03:15 +0100
commit69672a4cb9aef20f64679b12f9006f58418709e3 (patch)
tree1ea7850cad65407f87529aa22cdcac7338e4bf90
parentcb7cab37b12d8371a135c00ebcabe77403cde5b2 (diff)
downloadpoky-69672a4cb9aef20f64679b12f9006f58418709e3.tar.gz
cups: Fix recipe to use the correct cups directories
${libdir} is not used, instead they use a common ${exec_prefix}/lib directory structure for helpers, filters, renderers, etc. (From OE-Core rev: 24ae432b1a3906956381d83c1984687e45c5a1d1) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/cups/cups14.inc20
-rw-r--r--meta/recipes-extended/cups/cups_1.4.6.bb2
2 files changed, 15 insertions, 7 deletions
diff --git a/meta/recipes-extended/cups/cups14.inc b/meta/recipes-extended/cups/cups14.inc
index e64f239a6a..48f493d6c7 100644
--- a/meta/recipes-extended/cups/cups14.inc
+++ b/meta/recipes-extended/cups/cups14.inc
@@ -64,16 +64,24 @@ python do_package_append() {
64 64
65PACKAGES =+ "${PN}-lib ${PN}-libimage" 65PACKAGES =+ "${PN}-lib ${PN}-libimage"
66 66
67FILES_${PN} += "${exec_prefix}/lib/cups/backend \
68 ${exec_prefix}/lib/cups/cgi-bin \
69 ${exec_prefix}/lib/cups/filter \
70 ${exec_prefix}/lib/cups/monitor \
71 ${exec_prefix}/lib/cups/notifier \
72 ${exec_prefix}/lib/cups/daemon \
73 "
74
67FILES_${PN}-lib = "${libdir}/libcups.so.*" 75FILES_${PN}-lib = "${libdir}/libcups.so.*"
68 76
69FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*" 77FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*"
70 78
71FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \ 79FILES_${PN}-dbg += "${exec_prefix}/lib/cups/backend/.debug \
72 ${libdir}/cups/cgi-bin/.debug \ 80 ${exec_prefix}/lib/cups/cgi-bin/.debug \
73 ${libdir}/cups/filter/.debug \ 81 ${exec_prefix}/lib/cups/filter/.debug \
74 ${libdir}/cups/monitor/.debug \ 82 ${exec_prefix}/lib/cups/monitor/.debug \
75 ${libdir}/cups/notifier/.debug \ 83 ${exec_prefix}/lib/cups/notifier/.debug \
76 ${libdir}/cups/daemon/.debug \ 84 ${exec_prefix}/lib/cups/daemon/.debug \
77 " 85 "
78 86
79#package the html for the webgui inside the main packages (~1MB uncompressed) 87#package the html for the webgui inside the main packages (~1MB uncompressed)
diff --git a/meta/recipes-extended/cups/cups_1.4.6.bb b/meta/recipes-extended/cups/cups_1.4.6.bb
index fd20dcceeb..0dc2d4a26b 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 = "r1" 3PR = "r2"
4DEPENDS += "libusb \ 4DEPENDS += "libusb \
5 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 5 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
6 6