Patchwork [21/39] cups: clean up FILE after PACKAGE reorder

login
register
mail settings
Submitter Saul Wold
Date June 19, 2012, 3:59 p.m.
Message ID <f8c6858c9815fe3856823e1de8f59f79b070293f.1340121099.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/30185/
State Accepted
Commit 83f5bd8d2ae2f83060851d76ab87d01da7c4278b
Headers show

Comments

Saul Wold - June 19, 2012, 3:59 p.m.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/cups/cups14.inc    |    1 +
 meta/recipes-extended/cups/cups_1.4.6.bb |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

Patch

diff --git a/meta/recipes-extended/cups/cups14.inc b/meta/recipes-extended/cups/cups14.inc
index 85d8ca2..9cae33c 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 ec555d7..9825138 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)}"