diff options
-rw-r--r-- | recipes-core/openjdk/openjdk-8-common.inc | 4 |
1 files 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 () { | |||
39 | tar xjf ${WORKDIR}/${NASHORN_FILE_LOCAL} --transform "s,-${NASHORN_CHANGESET},,g" | 39 | tar xjf ${WORKDIR}/${NASHORN_FILE_LOCAL} --transform "s,-${NASHORN_CHANGESET},,g" |
40 | } | 40 | } |
41 | 41 | ||
42 | do_unpack_remove_X11_wrappers() { | 42 | do_unpack_delete_X11_wrappers() { |
43 | find ${S}/jdk/src/solaris/classes/sun/awt/X11 -maxdepth 1 -name '*.java' -delete | 43 | find ${S}/jdk/src/solaris/classes/sun/awt/X11 -maxdepth 1 -name '*.java' -delete |
44 | } | 44 | } |
45 | 45 | ||
@@ -153,7 +153,7 @@ def jdk_configure_options(d): | |||
153 | return options[3] | 153 | return options[3] |
154 | 154 | ||
155 | do_unpack[postfuncs] += "do_unpack_extract_submodules" | 155 | do_unpack[postfuncs] += "do_unpack_extract_submodules" |
156 | do_unpack[postfuncs] += "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'do_unpack_remove_X11_wrappers', d)}" | 156 | do_unpack[postfuncs] += "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'do_unpack_delete_X11_wrappers', d)}" |
157 | 157 | ||
158 | do_configure_prepend() { | 158 | do_configure_prepend() { |
159 | export ${@jdk_environment_options(d)} | 159 | export ${@jdk_environment_options(d)} |