Patchwork [1/2] cups: Fix recipe to use the correct cups directories

login
register
mail settings
Submitter Mark Hatle
Date Sept. 22, 2011, 5:12 p.m.
Message ID <aeb0b32b617dee13a5656591dc9d5a38a04d1c88.1316711477.git.mark.hatle@windriver.com>
Download mbox | patch
Permalink /patch/12009/
State New, archived
Headers show

Comments

Mark Hatle - Sept. 22, 2011, 5:12 p.m.
${libdir} is not used, instead they use a common ${exec_prefix}/lib
directory structure for helpers, filters, renderers, etc.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 meta/recipes-extended/cups/cups14.inc    |   20 ++++++++++++++------
 meta/recipes-extended/cups/cups_1.4.6.bb |    2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

Patch

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)}"