summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-06-05 18:22:53 -0700
committerSaul Wold <sgw@linux.intel.com>2012-06-19 21:59:52 -0700
commit83f5bd8d2ae2f83060851d76ab87d01da7c4278b (patch)
tree4ad544d0df3791b90584f871046941e27ca1354e
parent91d84900c4ff4c1b9456e6766deda956982f1775 (diff)
downloadopenembedded-core-83f5bd8d2ae2f83060851d76ab87d01da7c4278b.tar.gz
openembedded-core-83f5bd8d2ae2f83060851d76ab87d01da7c4278b.tar.bz2
openembedded-core-83f5bd8d2ae2f83060851d76ab87d01da7c4278b.zip
cups: clean up FILE after PACKAGE reorder
Signed-off-by: Saul Wold <sgw@linux.intel.com>
-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 () {
# This directory gets installed with perms 511, which makes packaging fail
chmod 0711 "${D}/${localstatedir}/run/cups/certs"
+ rmdir ${D}/${libdir}/${BPN}/driver
}
python 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 @@
require cups14.inc
-PR = "r3"
+PR = "r4"
DEPENDS += "libusb \
${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"