cups: Ensure cups-config has correct target paths, not sysroot ones for cups_serverbin and cups_datadir variables

PATCH New Richard Purdie 1 participant 1 message Mar 16, 2012

Share & tools

Richard Purdie

author

2012-03-16 15:29 UTC #0 lore raw

PATCH 1/1 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.

Signed-off-by Richard Purdie <[email protected]>

---

meta/recipes-extended/cups/cups14.inc +5 -0

index 2bf3ecf..7c19682 100644
@@ -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:'
+}

meta/recipes-extended/cups/cups_1.4.6.bb +1 -1

index 0dc2d4a..ec555d7 100644
@@ -1,6 +1,6 @@
 require cups14.inc
 
-PR = "r2"
+PR = "r3"
 DEPENDS += "libusb \
        ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"