summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-06-05 18:22:53 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-21 13:02:59 +0100
commit28a1a0fbf65cd9220c2d9d63a9fa9bc239d69a3e (patch)
treedc2b7cf40ce339ba1f528d8fe4b9707dfc8a2079 /meta/recipes-extended
parentb33b5e3dd1b220068ae6824310170ef655f5714c (diff)
downloadpoky-28a1a0fbf65cd9220c2d9d63a9fa9bc239d69a3e.tar.gz
cups: clean up FILE after PACKAGE reorder
(From OE-Core rev: 83f5bd8d2ae2f83060851d76ab87d01da7c4278b) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/cups/cups14.inc1
-rw-r--r--meta/recipes-extended/cups/cups_1.4.6.bb2
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-extended/cups/cups14.inc b/meta/recipes-extended/cups/cups14.inc
index 85d8ca232f..9cae33c5b6 100644
--- a/meta/recipes-extended/cups/cups14.inc
+++ b/meta/recipes-extended/cups/cups14.inc
@@ -54,6 +54,7 @@ fakeroot do_install () {
54 54
55 # This directory gets installed with perms 511, which makes packaging fail 55 # This directory gets installed with perms 511, which makes packaging fail
56 chmod 0711 "${D}/${localstatedir}/run/cups/certs" 56 chmod 0711 "${D}/${localstatedir}/run/cups/certs"
57 rmdir ${D}/${libdir}/${BPN}/driver
57} 58}
58 59
59python do_package_append() { 60python do_package_append() {
diff --git a/meta/recipes-extended/cups/cups_1.4.6.bb b/meta/recipes-extended/cups/cups_1.4.6.bb
index ec555d791d..98251380da 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 = "r3" 3PR = "r4"
4DEPENDS += "libusb \ 4DEPENDS += "libusb \
5 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 5 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
6 6