aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-printing/cups/cups-filters.inc
diff options
context:
space:
mode:
authorDiego Rondini <diego.rondini@kynetics.com>2020-01-10 21:52:06 +0000
committerKhem Raj <raj.khem@gmail.com>2020-01-17 15:44:06 -0800
commitfc0d5ab6e3d7c409be735fef4e58090ad79e177f (patch)
tree675aecd6c8310d16d3692eb9827fa6836c25a13c /meta-oe/recipes-printing/cups/cups-filters.inc
parent8bb1fabfc5307214d272ddd266e5580b91336f20 (diff)
downloadmeta-openembedded-fc0d5ab6e3d7c409be735fef4e58090ad79e177f.tar.gz
cups-filters: use libexecdir and cleanup
In oe-core commit: 2ce6ef29b9bb4f16ed9d78e166d455b7a6d968bf cups crossscripts have been fixed to report the correct serverbin folder, so backend, filters, etc, need to go in ${libexecdir} now. Additionally cleanup and simplify packaging paths, to avoid specifying files one by one. Signed-off-by: Diego Rondini <diego.rondini@kynetics.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-printing/cups/cups-filters.inc')
-rw-r--r--meta-oe/recipes-printing/cups/cups-filters.inc30
1 files changed, 8 insertions, 22 deletions
diff --git a/meta-oe/recipes-printing/cups/cups-filters.inc b/meta-oe/recipes-printing/cups/cups-filters.inc
index 45bdab383..589bb90e6 100644
--- a/meta-oe/recipes-printing/cups/cups-filters.inc
+++ b/meta-oe/recipes-printing/cups/cups-filters.inc
@@ -47,8 +47,7 @@ PACKAGES =+ "\
"
FILES_${PN}-gst = "\
- ${libdir}/cups/filter/gstopxl \
- ${libdir}/cups/filter/gstoraster \
+ ${libexecdir}/cups/filter/gsto* \
"
FILES_${PN}-data = "\
@@ -56,37 +55,24 @@ FILES_${PN}-data = "\
"
FILES_${PN}-dbg += "\
- ${libdir}/cups/filter/.debug \
- ${libdir}/cups/backend/.debug \
+ ${libexecdir}/cups/backend/.debug \
+ ${libexecdir}/cups/driver/.debug \
+ ${libexecdir}/cups/filter/.debug \
"
FILES_${PN} += "\
- ${libdir}/cups/filter \
- ${libdir}/cups/backend \
- ${libdir}/cups/driver \
+ ${libexecdir}/cups \
+ ${datadir}/ppd/ \
${datadir}/cups/charsets \
${datadir}/cups/drv \
${datadir}/cups/mime \
${datadir}/cups/ppdc \
- ${datadir}/ppd/cupsfilters \
- ${datadir}/cups/braille \
${datadir}/cups/banners \
- ${datadir}/cups/braille/index.sh \
- ${datadir}/cups/braille/cups-braille.sh \
- ${datadir}/cups/braille/indexv3.sh \
- ${datadir}/cups/braille/indexv4.sh \
- ${datadir}/cups/banners/topsecret \
- ${datadir}/cups/banners/secret \
- ${datadir}/cups/banners/confidential \
- ${datadir}/cups/banners/unclassified \
- ${datadir}/cups/banners/form \
- ${datadir}/cups/banners/classified \
- ${datadir}/cups/banners/standard \
"
do_install_append() {
- # remove banners, braille dirs
- rm -rf ${D}${datadir}/cups/{banners,braille}
+ # remove braille dir
+ rm -rf ${D}${datadir}/cups/braille
# remove sysroot path contamination from pkgconfig file
sed -i -e 's:${STAGING_DIR_TARGET}::' ${D}/${libdir}/pkgconfig/libcupsfilters.pc