| Submitter | Richard Purdie |
|---|---|
| Date | March 16, 2012, 3:20 p.m. |
| Message ID | <1331911237.18586.190.camel@ted> |
| Download | mbox | patch |
| Permalink | /patch/23685/ |
| State | Accepted |
| Commit | edb8eb566968d386f6995b95d54bc7c25a50b02a |
| Headers | show |
Comments
Patch
diff --git a/meta/recipes-extended/cups/cups14.inc b/meta/recipes-extended/cups/cups14.inc index 2bf3ecf..7c19682 100644 --- a/meta/recipes-extended/cups/cups14.inc +++ b/meta/recipes-extended/cups/cups14.inc @@ -91,3 +91,8 @@ FILES_${PN} += "${datadir}/doc/cups/images \ ${datadir}/doc/cups/*.css \ ${datadir}/icons/ \ " + +SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess" +cups_sysroot_preprocess () { + sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e 's:cups_serverbin=.*:cups_serverbin=${libdir}/cups:' +} diff --git a/meta/recipes-extended/cups/cups_1.4.6.bb b/meta/recipes-extended/cups/cups_1.4.6.bb index 0dc2d4a..ec555d7 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 = "r2" +PR = "r3" DEPENDS += "libusb \ ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
These are used by dependent packages to know where to install cups related pieces into therefore we need to remove the sysroot prefix from these. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> ---