diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2018-09-24 21:03:13 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-10 17:59:09 +0100 |
commit | 8a2e53b525ebc4f50c7384af056cbe67a3913282 (patch) | |
tree | da92fb45e663b36ec7d2d29e23ba7dbc7ab35c97 /meta/recipes-core | |
parent | d4f4f5662884683ff24ac5a29a9a7f979a0948b9 (diff) | |
download | poky-8a2e53b525ebc4f50c7384af056cbe67a3913282.tar.gz |
libxml2: Make it compatible with externalsrc
Fetch the test tar ball to a subdirectory in ${S}. This avoids the
following error after having done `devtool modify libxml2`:
| DEBUG: Executing shell function do_configure
| find: ‘.../build/tmp/work/mips32r2el-nf-poky-linux/libxml2/2.9.4-r0/xmlconf/’: No such file or directory
(From OE-Core rev: d0d55add6cb01252a46d829ade75666920b676fa)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.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.bb | 6 |
1 files changed, 3 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 d35f60832a..740bf56a5a 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.8.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.8.bb | |||
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://Copyright;md5=2044417e2e5006b65a8b9067b683fcf1 \ | |||
12 | DEPENDS = "zlib virtual/libiconv" | 12 | DEPENDS = "zlib virtual/libiconv" |
13 | 13 | ||
14 | SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ | 14 | SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ |
15 | http://www.w3.org/XML/Test/xmlts20080827.tar.gz;name=testtar \ | 15 | http://www.w3.org/XML/Test/xmlts20080827.tar.gz;subdir=${BP};name=testtar \ |
16 | file://libxml-64bit.patch \ | 16 | file://libxml-64bit.patch \ |
17 | file://runtest.patch \ | 17 | file://runtest.patch \ |
18 | file://run-ptest \ | 18 | file://run-ptest \ |
@@ -77,7 +77,7 @@ FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" | |||
77 | 77 | ||
78 | do_configure_prepend () { | 78 | do_configure_prepend () { |
79 | # executables take longer to package: these should not be executable | 79 | # executables take longer to package: these should not be executable |
80 | find ${WORKDIR}/xmlconf/ -type f -exec chmod -x {} \+ | 80 | find ${S}/xmlconf/ -type f -exec chmod -x {} \+ |
81 | } | 81 | } |
82 | 82 | ||
83 | do_compile_ptest() { | 83 | do_compile_ptest() { |
@@ -85,7 +85,7 @@ do_compile_ptest() { | |||
85 | } | 85 | } |
86 | 86 | ||
87 | do_install_ptest () { | 87 | do_install_ptest () { |
88 | cp -r ${WORKDIR}/xmlconf ${D}${PTEST_PATH} | 88 | cp -r ${S}/xmlconf ${D}${PTEST_PATH} |
89 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then | 89 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then |
90 | sed -i -e 's|^\(PYTHON = \).*|\1${USRBINPATH}/${PYTHON_PN}|' \ | 90 | sed -i -e 's|^\(PYTHON = \).*|\1${USRBINPATH}/${PYTHON_PN}|' \ |
91 | ${D}${PTEST_PATH}/python/tests/Makefile | 91 | ${D}${PTEST_PATH}/python/tests/Makefile |