From c3dc179b0a3c8ce43ae6b7086b04d76815021451 Mon Sep 17 00:00:00 2001 From: Matthew McClain Date: Wed, 18 Jul 2018 13:12:59 -0500 Subject: openjdk-8: 'do_unpack_remove_X11_wrappers' confuses pyro bitbake parser 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 Signed-off-by: Richard Leitner --- 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 0af320d..6bd9e72 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_LOCAL} --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)} -- cgit v1.2.3-54-g00ecf