From 5ed180ee3bdb304c126ee7b24cd01de1cf237f9f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 16 Mar 2012 15:17:09 +0000 Subject: cups: Ensure cups-config has correct target paths, not sysroot ones for cups_serverbin and cups_datadir variables 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. (From OE-Core rev: edb8eb566968d386f6995b95d54bc7c25a50b02a) Signed-off-by: Richard Purdie --- meta/recipes-extended/cups/cups14.inc | 5 +++++ meta/recipes-extended/cups/cups_1.4.6.bb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'meta/recipes-extended/cups') diff --git a/meta/recipes-extended/cups/cups14.inc b/meta/recipes-extended/cups/cups14.inc index 2bf3ecfd6f..7c1968220d 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 0dc2d4a26b..ec555d791d 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)}" -- cgit v1.2.3-54-g00ecf