All of lore.kernel.org
 help / color / mirror / Atom feed
From: Matthew McClain <mmcclain@uplogix.com>
To: <openembedded-devel@lists.openembedded.org>
Subject: [meta-java][PATCH v2] openjdk-8: 'do_unpack_remove_X11_wrappers' confuses pyro bitbake parser
Date: Wed, 18 Jul 2018 13:12:59 -0500	[thread overview]
Message-ID: <20180718181259.92621-1-mmcclain@uplogix.com> (raw)

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



             reply	other threads:[~2018-07-18 18:13 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-18 18:12 Matthew McClain [this message]
2018-07-31  8:33 ` [meta-java][PATCH v2] openjdk-8: 'do_unpack_remove_X11_wrappers' confuses pyro bitbake parser Richard Leitner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180718181259.92621-1-mmcclain@uplogix.com \
    --to=mmcclain@uplogix.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.