diff options
-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 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 | ||
65 | PACKAGES =+ "${PN}-lib ${PN}-libimage" | 65 | PACKAGES =+ "${PN}-lib ${PN}-libimage" |
66 | 66 | ||
67 | FILES_${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 | |||
67 | FILES_${PN}-lib = "${libdir}/libcups.so.*" | 75 | FILES_${PN}-lib = "${libdir}/libcups.so.*" |
68 | 76 | ||
69 | FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*" | 77 | FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*" |
70 | 78 | ||
71 | FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \ | 79 | FILES_${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 @@ | |||
1 | require cups14.inc | 1 | require cups14.inc |
2 | 2 | ||
3 | PR = "r1" | 3 | PR = "r2" |
4 | DEPENDS += "libusb \ | 4 | DEPENDS += "libusb \ |
5 | ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 5 | ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
6 | 6 | ||