[oe] [meta-java][PATCH v2] openjdk-8: 'do_unpack_remove_X11_wrappers' confuses pyro bitbake parser
Matthew McClain
mmcclain at uplogix.com
Wed Jul 18 18:12:59 UTC 2018
When building without X11 support on the sumo or master branches of
meta-java with the pyro branch of poky, meta-oe, etc, the recipe fails
to parse.
Renaming the function to anything else allows the recipe to be parsed. The
problem appears to be the word "_remove_".
Signed-off-by: Matthew McClain <mmcclain at uplogix.com>
---
recipes-core/openjdk/openjdk-8-common.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc
index b2020c3..fbb10be 100644
--- a/recipes-core/openjdk/openjdk-8-common.inc
+++ b/recipes-core/openjdk/openjdk-8-common.inc
@@ -39,7 +39,7 @@ do_unpack_extract_submodules () {
tar xjf ${WORKDIR}/${NASHORN_FILE} --transform "s,-${NASHORN_CHANGESET},,g"
}
-do_unpack_remove_X11_wrappers() {
+do_unpack_delete_X11_wrappers() {
find ${S}/jdk/src/solaris/classes/sun/awt/X11 -maxdepth 1 -name '*.java' -delete
}
@@ -153,7 +153,7 @@ def jdk_configure_options(d):
return options[3]
do_unpack[postfuncs] += "do_unpack_extract_submodules"
-do_unpack[postfuncs] += "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'do_unpack_remove_X11_wrappers', d)}"
+do_unpack[postfuncs] += "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'do_unpack_delete_X11_wrappers', d)}"
do_configure_prepend() {
export ${@jdk_environment_options(d)}
--
2.18.0
More information about the Openembedded-devel
mailing list