mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-03 02:10:04 +00:00
Code Issues Projects Releases Wiki Activity

hplip: use libexecdir

Browse Source 
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.

Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit db7fc115e0)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Diego Rondini
2020-09-10 21:09:56 +02:00
committed by Armin Kuster
parent d89968b63f
commit 636daeba35
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/hplip/hplip_3.19.12.bb
+7 -7
View File
@@ -39,8 +39,8 @@ EXTRA_OECONF += "\
--enable-foomatic-drv-install \ --enable-foomatic-drv-install \
--disable-foomatic-ppd-install \ --disable-foomatic-ppd-install \
--disable-foomatic-rip-hplip-install \ --disable-foomatic-rip-hplip-install \
--with-cupsbackenddir=${libdir}/cups/backend \ --with-cupsbackenddir=${libexecdir}/cups/backend \
--with-cupsfilterdir=${libdir}/cups/filter \ --with-cupsfilterdir=${libexecdir}/cups/filter \
" "
EXTRA_OEMAKE = "rulessystemdir=${systemd_unitdir}/system/" EXTRA_OEMAKE = "rulessystemdir=${systemd_unitdir}/system/"
@@ -52,7 +52,7 @@ do_install_append() {
sed -i -e "s|/usr/bin/python|/usr/bin/env python3|g" ${D}${datadir}/hplip/*.py sed -i -e "s|/usr/bin/python|/usr/bin/env python3|g" ${D}${datadir}/hplip/*.py
} }
PACKAGES += "${PN}-ppd ${PN}-cups ${PN}-backend ${PN}-filter ${PN}-hal" PACKAGE_BEFORE_PN += "${PN}-ppd ${PN}-cups ${PN}-backend ${PN}-filter ${PN}-hal"
RDEPENDS_${PN} += " \ RDEPENDS_${PN} += " \
python3\ python3\
@@ -70,15 +70,15 @@ RDEPENDS_${PN}-filter += "perl"
# need to snag the debug file or OE will fail on backend package # need to snag the debug file or OE will fail on backend package
FILES_${PN}-dbg += "\ FILES_${PN}-dbg += "\
${libdir}/cups/backend/.debug \ ${libexecdir}/cups/backend/.debug \
${PYTHON_SITEPACKAGES_DIR}/.debug \ ${PYTHON_SITEPACKAGES_DIR}/.debug \
${libdir}/cups/filter/.debug " ${libexecdir}/cups/filter/.debug "
FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la" FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la"
FILES_${PN}-ppd = "${datadir}/ppd" FILES_${PN}-ppd = "${datadir}/ppd"
FILES_${PN}-cups = "${datadir}/cups" FILES_${PN}-cups = "${datadir}/cups"
FILES_${PN}-backend = "${libdir}/cups/backend" FILES_${PN}-backend = "${libexecdir}/cups/backend"
FILES_${PN}-filter = "${libdir}/cups/filter" FILES_${PN}-filter = "${libexecdir}/cups/filter"
FILES_${PN}-hal = "${datadir}/hal" FILES_${PN}-hal = "${datadir}/hal"
FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/*.so" FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/*.so"