From 5bef7ca2515663d8a18f3074e6763c708319473b Mon Sep 17 00:00:00 2001 From: Diego Rondini Date: Fri, 10 Jan 2020 21:52:06 +0000 Subject: [PATCH 1/2] 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 --- .../recipes-printing/cups/cups-filters.inc | 30 +++++-------------- 1 file 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 45bdab3836c..589bb90e6e5 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 From c761765616394e38ac0962f2d68cc8259b3323aa Mon Sep 17 00:00:00 2001 From: Diego Rondini Date: Thu, 16 Jan 2020 09:14:20 +0000 Subject: [PATCH 2/2] cups-filters: upgrade 1.26.0 -> 1.26.2 Signed-off-by: Diego Rondini --- meta-oe/recipes-printing/cups/cups-filters_1.26.0.bb | 4 ---- meta-oe/recipes-printing/cups/cups-filters_1.26.2.bb | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 meta-oe/recipes-printing/cups/cups-filters_1.26.0.bb create mode 100644 meta-oe/recipes-printing/cups/cups-filters_1.26.2.bb diff --git a/meta-oe/recipes-printing/cups/cups-filters_1.26.0.bb b/meta-oe/recipes-printing/cups/cups-filters_1.26.0.bb deleted file mode 100644 index 619602a6cc0..00000000000 --- a/meta-oe/recipes-printing/cups/cups-filters_1.26.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -include cups-filters.inc - -SRC_URI[md5sum] = "afb278c77bb195c2a32fc64e5c8378fb" -SRC_URI[sha256sum] = "ff8679fcd0c31c25d229262c7ad100ba161ef6b2aa455a2df673dd74ef93f488" diff --git a/meta-oe/recipes-printing/cups/cups-filters_1.26.2.bb b/meta-oe/recipes-printing/cups/cups-filters_1.26.2.bb new file mode 100644 index 00000000000..d76ef090193 --- /dev/null +++ b/meta-oe/recipes-printing/cups/cups-filters_1.26.2.bb @@ -0,0 +1,4 @@ +include cups-filters.inc + +SRC_URI[md5sum] = "970095596bf2b8cfe91ac91c0b51297a" +SRC_URI[sha256sum] = "0069aef1358522f1901a64749ec753d28a2d6a832758bce58ffcd722b28c0e66"