diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2011-09-22 12:12:09 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-22 21:03:15 +0100 |
| commit | 69672a4cb9aef20f64679b12f9006f58418709e3 (patch) | |
| tree | 1ea7850cad65407f87529aa22cdcac7338e4bf90 | |
| parent | cb7cab37b12d8371a135c00ebcabe77403cde5b2 (diff) | |
| download | ast2050-yocto-poky-69672a4cb9aef20f64679b12f9006f58418709e3.zip ast2050-yocto-poky-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.inc | 20 | ||||
| -rw-r--r-- | meta/recipes-extended/cups/cups_1.4.6.bb | 2 |
2 files changed, 15 insertions, 7 deletions
diff --git a/meta/recipes-extended/cups/cups14.inc b/meta/recipes-extended/cups/cups14.inc index e64f239..48f493d 100644 --- a/meta/recipes-extended/cups/cups14.inc +++ b/meta/recipes-extended/cups/cups14.inc @@ -64,16 +64,24 @@ python do_package_append() { PACKAGES =+ "${PN}-lib ${PN}-libimage" +FILES_${PN} += "${exec_prefix}/lib/cups/backend \ + ${exec_prefix}/lib/cups/cgi-bin \ + ${exec_prefix}/lib/cups/filter \ + ${exec_prefix}/lib/cups/monitor \ + ${exec_prefix}/lib/cups/notifier \ + ${exec_prefix}/lib/cups/daemon \ + " + FILES_${PN}-lib = "${libdir}/libcups.so.*" FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*" -FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \ - ${libdir}/cups/cgi-bin/.debug \ - ${libdir}/cups/filter/.debug \ - ${libdir}/cups/monitor/.debug \ - ${libdir}/cups/notifier/.debug \ - ${libdir}/cups/daemon/.debug \ +FILES_${PN}-dbg += "${exec_prefix}/lib/cups/backend/.debug \ + ${exec_prefix}/lib/cups/cgi-bin/.debug \ + ${exec_prefix}/lib/cups/filter/.debug \ + ${exec_prefix}/lib/cups/monitor/.debug \ + ${exec_prefix}/lib/cups/notifier/.debug \ + ${exec_prefix}/lib/cups/daemon/.debug \ " #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 fd20dcc..0dc2d4a 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 @@ require cups14.inc -PR = "r1" +PR = "r2" DEPENDS += "libusb \ ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
