diff options
| author | Saul Wold <sgw@linux.intel.com> | 2012-06-05 18:22:53 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-21 13:02:59 +0100 |
| commit | 28a1a0fbf65cd9220c2d9d63a9fa9bc239d69a3e (patch) | |
| tree | dc2b7cf40ce339ba1f528d8fe4b9707dfc8a2079 | |
| parent | b33b5e3dd1b220068ae6824310170ef655f5714c (diff) | |
| download | poky-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>
| -rw-r--r-- | meta/recipes-extended/cups/cups14.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-extended/cups/cups_1.4.6.bb | 2 |
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 | ||
| 59 | python do_package_append() { | 60 | 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 @@ | |||
| 1 | require cups14.inc | 1 | require cups14.inc |
| 2 | 2 | ||
| 3 | PR = "r3" | 3 | PR = "r4" |
| 4 | DEPENDS += "libusb \ | 4 | DEPENDS += "libusb \ |
| 5 | ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 5 | ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
| 6 | 6 | ||
