Skip to content

Commit

Permalink
hplip: use libexecdir
Browse files Browse the repository at this point in the history
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.

Signed-off-by: Diego Rondini <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit db7fc11)
Signed-off-by: Armin Kuster <[email protected]>
  • Loading branch information
diegorondini authored and akuster committed Nov 10, 2020
1 parent d89968b commit 636daeb
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions meta-oe/recipes-extended/hplip/hplip_3.19.12.bb
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ EXTRA_OECONF += "\
--enable-foomatic-drv-install \
--disable-foomatic-ppd-install \
--disable-foomatic-rip-hplip-install \
--with-cupsbackenddir=${libdir}/cups/backend \
--with-cupsfilterdir=${libdir}/cups/filter \
--with-cupsbackenddir=${libexecdir}/cups/backend \
--with-cupsfilterdir=${libexecdir}/cups/filter \
"

EXTRA_OEMAKE = "rulessystemdir=${systemd_unitdir}/system/"
Expand All @@ -52,7 +52,7 @@ do_install_append() {
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} += " \
python3\
Expand All @@ -70,15 +70,15 @@ RDEPENDS_${PN}-filter += "perl"

# need to snag the debug file or OE will fail on backend package
FILES_${PN}-dbg += "\
${libdir}/cups/backend/.debug \
${libexecdir}/cups/backend/.debug \
${PYTHON_SITEPACKAGES_DIR}/.debug \
${libdir}/cups/filter/.debug "
${libexecdir}/cups/filter/.debug "

FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la"
FILES_${PN}-ppd = "${datadir}/ppd"
FILES_${PN}-cups = "${datadir}/cups"
FILES_${PN}-backend = "${libdir}/cups/backend"
FILES_${PN}-filter = "${libdir}/cups/filter"
FILES_${PN}-backend = "${libexecdir}/cups/backend"
FILES_${PN}-filter = "${libexecdir}/cups/filter"
FILES_${PN}-hal = "${datadir}/hal"

FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/*.so"
Expand Down

0 comments on commit 636daeb

Please sign in to comment.