diff options
| author |   Diego Rondini <diego.rondini@kynetics.com> | 2020-01-08 17:48:55 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-10 21:11:25 +0000 |
| commit | 2ce6ef29b9bb4f16ed9d78e166d455b7a6d968bf (patch) | |
| tree | f1e35f7a03dce8069e06677b0a009c3d2198dd38 | |
| parent | f599b6c77f3585c8917f4d685689da4cc8a8bf04 (diff) | |
| download | openembedded-core-contrib-2ce6ef29b9bb4f16ed9d78e166d455b7a6d968bf.tar.gz | |
cups: fix crossscripts
Fix crossscripts to report the correct "serverbin" value.
While the packaged "cups-config --serverbin" reported
"/usr/libexec/cups" the crossscripts version reported
"/usr/lib/cups", causing packaging issues when building for example
cups-filters.
Also fix FILES_${PN} to use ${libexecdir}; previously it was working
just because "${libexecdir}/*" was part of the default values in
bitbake.conf.
Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-extended/cups/cups.inc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index b94bc1d412..34982819b9 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -84,12 +84,7 @@ do_install () { PACKAGES =+ "${PN}-lib ${PN}-libimage" RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'procps', '', d)}" -FILES_${PN} += "${libdir}/cups/backend \ - ${libdir}/cups/cgi-bin \ - ${libdir}/cups/filter \ - ${libdir}/cups/monitor \ - ${libdir}/cups/notifier \ - ${libdir}/cups/daemon \ +FILES_${PN} += "${libexecdir}/cups/ \ " FILES_${PN}-lib = "${libdir}/libcups.so.*" @@ -107,5 +102,5 @@ CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf" 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:' + sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e 's:cups_serverbin=.*:cups_serverbin=${libexecdir}/cups:' } |