* [meta-java][PATCH v2] openjdk-8: 'do_unpack_remove_X11_wrappers' confuses pyro bitbake parser
@ 2018-07-18 18:12 Matthew McClain
2018-07-31 8:33 ` Richard Leitner
0 siblings, 1 reply; 2+ messages in thread
From: Matthew McClain @ 2018-07-18 18:12 UTC (permalink / raw)
To: openembedded-devel
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@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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [meta-java][PATCH v2] openjdk-8: 'do_unpack_remove_X11_wrappers' confuses pyro bitbake parser
2018-07-18 18:12 [meta-java][PATCH v2] openjdk-8: 'do_unpack_remove_X11_wrappers' confuses pyro bitbake parser Matthew McClain
@ 2018-07-31 8:33 ` Richard Leitner
0 siblings, 0 replies; 2+ messages in thread
From: Richard Leitner @ 2018-07-31 8:33 UTC (permalink / raw)
To: Matthew McClain, openembedded-devel
Hi,
this is a note to let you know that I've just added this patch to the
master-next branch of the meta-java repository at
git://git.yoctoproject.org/meta-java
As soon as it has gone through some more testing it will likely be
merged to the master branch.
If you have any questions, please let me know.
regards;Richard.L
On 07/18/2018 08:12 PM, Matthew McClain wrote:
> 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@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)}
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-07-31 8:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-18 18:12 [meta-java][PATCH v2] openjdk-8: 'do_unpack_remove_X11_wrappers' confuses pyro bitbake parser Matthew McClain
2018-07-31 8:33 ` Richard Leitner
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.