summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJeremy Puhlman <jpuhlman@mvista.com>2020-02-28 14:53:35 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-29 13:04:48 +0000
commit8f796d8e8ede87aba5e402192a47786f7e12e26e (patch)
tree1568a3f12eaf7aa0e439a06c0689eafceb42c225 /meta
parent4c745fb71221775f224a5583b9430cce7edca604 (diff)
downloadpoky-8f796d8e8ede87aba5e402192a47786f7e12e26e.tar.gz
cups: make cups-config a multilib script
cups-config encodes the library dir in the script. (From OE-Core rev: 0e19b25fbf1d760c06dd6a2cb8e291c7482330c4) Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/cups/cups.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index 34982819b9..c5a60bde12 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -22,7 +22,7 @@ LEAD_SONAME = "libcupsdriver.so"
22 22
23CLEANBROKEN = "1" 23CLEANBROKEN = "1"
24 24
25inherit autotools-brokensep binconfig useradd systemd pkgconfig 25inherit autotools-brokensep binconfig useradd systemd pkgconfig multilib_script
26 26
27USERADD_PACKAGES = "${PN}" 27USERADD_PACKAGES = "${PN}"
28GROUPADD_PARAM_${PN} = "--system lpadmin" 28GROUPADD_PARAM_${PN} = "--system lpadmin"
@@ -100,6 +100,8 @@ FILES_${PN} += "${datadir}/doc/cups/images \
100 " 100 "
101CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf" 101CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf"
102 102
103MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/cups-config"
104
103SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess" 105SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess"
104cups_sysroot_preprocess () { 106cups_sysroot_preprocess () {
105 sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e 's:cups_serverbin=.*:cups_serverbin=${libexecdir}/cups:' 107 sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e 's:cups_serverbin=.*:cups_serverbin=${libexecdir}/cups:'