summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-10-09 18:04:18 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-10 12:47:35 +0100
commitb235f7071262b22e6ea9b4bd3d1173109d542ee8 (patch)
tree928167847be972a80a8232332fc8f1630419f04d /meta/recipes-core
parent2499589fb60ca4fce0b425bc239532378886feb7 (diff)
downloadpoky-b235f7071262b22e6ea9b4bd3d1173109d542ee8.tar.gz
libxml2: move xmlcatalog and xmllint back into libxml2-utils
Packaging of libxml2-utils has been broken since 2011: http://git.openembedded.org/openembedded-core/commit/?id=76052861cc95fd4ad4c4b9eb6ce4cd1065ad4dc9 (From OE-Core rev: 6f49e72dbb36d0a42993e7c788c17ff03571ece7) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/libxml/libxml2_2.9.8.bb7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-core/libxml/libxml2_2.9.8.bb b/meta/recipes-core/libxml/libxml2_2.9.8.bb
index f01cb2cd34..d35f60832a 100644
--- a/meta/recipes-core/libxml/libxml2_2.9.8.bb
+++ b/meta/recipes-core/libxml/libxml2_2.9.8.bb
@@ -67,12 +67,13 @@ python populate_packages_prepend () {
67 d.setVar('PKG_libxml2', '${MLPREFIX}libxml2') 67 d.setVar('PKG_libxml2', '${MLPREFIX}libxml2')
68} 68}
69 69
70PACKAGES += "${PN}-utils ${PN}-python" 70PACKAGE_BEFORE_PN += "${PN}-utils"
71PACKAGES += "${PN}-python"
71 72
72FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" 73FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a"
73FILES_${PN}-dev += "${libdir}/xml2Conf.sh ${libdir}/cmake/*" 74FILES_${PN}-dev += "${libdir}/xml2Conf.sh ${libdir}/cmake/*"
74FILES_${PN}-utils += "${bindir}/*" 75FILES_${PN}-utils = "${bindir}/*"
75FILES_${PN}-python += "${PYTHON_SITEPACKAGES_DIR}" 76FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}"
76 77
77do_configure_prepend () { 78do_configure_prepend () {
78 # executables take longer to package: these should not be executable 79 # executables take longer to package: these should not be executable