summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-extended/hplip/hplip_3.19.12.bb14
1 files changed, 7 insertions, 7 deletions
diff --git a/meta-oe/recipes-extended/hplip/hplip_3.19.12.bb b/meta-oe/recipes-extended/hplip/hplip_3.19.12.bb
index 883a6ffe95..457a974534 100644
--- a/meta-oe/recipes-extended/hplip/hplip_3.19.12.bb
+++ b/meta-oe/recipes-extended/hplip/hplip_3.19.12.bb
@@ -39,8 +39,8 @@ EXTRA_OECONF += "\
39 --enable-foomatic-drv-install \ 39 --enable-foomatic-drv-install \
40 --disable-foomatic-ppd-install \ 40 --disable-foomatic-ppd-install \
41 --disable-foomatic-rip-hplip-install \ 41 --disable-foomatic-rip-hplip-install \
42 --with-cupsbackenddir=${libdir}/cups/backend \ 42 --with-cupsbackenddir=${libexecdir}/cups/backend \
43 --with-cupsfilterdir=${libdir}/cups/filter \ 43 --with-cupsfilterdir=${libexecdir}/cups/filter \
44" 44"
45 45
46EXTRA_OEMAKE = "rulessystemdir=${systemd_unitdir}/system/" 46EXTRA_OEMAKE = "rulessystemdir=${systemd_unitdir}/system/"
@@ -52,7 +52,7 @@ do_install_append() {
52 sed -i -e "s|/usr/bin/python|/usr/bin/env python3|g" ${D}${datadir}/hplip/*.py 52 sed -i -e "s|/usr/bin/python|/usr/bin/env python3|g" ${D}${datadir}/hplip/*.py
53} 53}
54 54
55PACKAGES += "${PN}-ppd ${PN}-cups ${PN}-backend ${PN}-filter ${PN}-hal" 55PACKAGE_BEFORE_PN += "${PN}-ppd ${PN}-cups ${PN}-backend ${PN}-filter ${PN}-hal"
56 56
57RDEPENDS_${PN} += " \ 57RDEPENDS_${PN} += " \
58 python3\ 58 python3\
@@ -70,15 +70,15 @@ RDEPENDS_${PN}-filter += "perl"
70 70
71# need to snag the debug file or OE will fail on backend package 71# need to snag the debug file or OE will fail on backend package
72FILES_${PN}-dbg += "\ 72FILES_${PN}-dbg += "\
73 ${libdir}/cups/backend/.debug \ 73 ${libexecdir}/cups/backend/.debug \
74 ${PYTHON_SITEPACKAGES_DIR}/.debug \ 74 ${PYTHON_SITEPACKAGES_DIR}/.debug \
75 ${libdir}/cups/filter/.debug " 75 ${libexecdir}/cups/filter/.debug "
76 76
77FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la" 77FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la"
78FILES_${PN}-ppd = "${datadir}/ppd" 78FILES_${PN}-ppd = "${datadir}/ppd"
79FILES_${PN}-cups = "${datadir}/cups" 79FILES_${PN}-cups = "${datadir}/cups"
80FILES_${PN}-backend = "${libdir}/cups/backend" 80FILES_${PN}-backend = "${libexecdir}/cups/backend"
81FILES_${PN}-filter = "${libdir}/cups/filter" 81FILES_${PN}-filter = "${libexecdir}/cups/filter"
82FILES_${PN}-hal = "${datadir}/hal" 82FILES_${PN}-hal = "${datadir}/hal"
83 83
84FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/*.so" 84FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/*.so"