[oe-commits] [openembedded-core] 13/16: cups: make cups-config a multilib script
git at git.openembedded.org
git at git.openembedded.org
Fri Feb 28 23:14:20 UTC 2020
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit 5f7a3afbde1d04f0ec94a1dd7c560cb02dcbef38
Author: Jeremy Puhlman <jpuhlman at mvista.com>
AuthorDate: Fri Feb 28 14:53:35 2020 -0800
cups: make cups-config a multilib script
cups-config encodes the library dir in the script.
Signed-off-by: Jeremy A. Puhlman <jpuhlman at mvista.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-extended/cups/cups.inc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index 3498281..c5a60bd 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -22,7 +22,7 @@ LEAD_SONAME = "libcupsdriver.so"
CLEANBROKEN = "1"
-inherit autotools-brokensep binconfig useradd systemd pkgconfig
+inherit autotools-brokensep binconfig useradd systemd pkgconfig multilib_script
USERADD_PACKAGES = "${PN}"
GROUPADD_PARAM_${PN} = "--system lpadmin"
@@ -100,6 +100,8 @@ FILES_${PN} += "${datadir}/doc/cups/images \
"
CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf"
+MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/cups-config"
+
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=${libexecdir}/cups:'
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list