cups-filters: use libexecdir and cleanup

diegorondini · kraj · commit fc0d5ab6e3d7 · 2020-01-17T15:44:06.000-08:00
In oe-core commit: 2ce6ef2 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>
diff --git a/meta-oe/recipes-printing/cups/cups-filters.inc b/meta-oe/recipes-printing/cups/cups-filters.inc
@@ -47,46 +47,32 @@ PACKAGES =+ "\
         "
 
 FILES_${PN}-gst = "\
-	${libdir}/cups/filter/gstopxl \
-	${libdir}/cups/filter/gstoraster \
+	${libexecdir}/cups/filter/gsto* \
 	"
 
 FILES_${PN}-data = "\
 	${datadir}/cups/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
