* [meta-java][PATCH 00/15] meta-java: fixes for some issues
@ 2015-12-25 7:56 jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 01/15] java.bbclass: java missing classes during compile jackie.huang
` (15 more replies)
0 siblings, 16 replies; 18+ messages in thread
From: jackie.huang @ 2015-12-25 7:56 UTC (permalink / raw)
To: openembedded-devel
From: Jackie Huang <jackie.huang@windriver.com>
These patches had been in our local branch for some times, I think
they are needed here as well, I rebased and did basic build/runtime
tests on x86-64 and ppc, please review and see if they are fine to
be merged.
--
The following changes since commit c88d019434b5ba0eb7ee1a3b0e27a74587ad9d49:
openjdk-8-native: fix improper do_install and PROVIDES (2015-12-22 23:48:09 -0800)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib.git jhuang0/d_java-fixes_151225_0
http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/d_java-fixes_151225_0
Amy Fong (15):
java.bbclass: java missing classes during compile
inetlib: fix inetlib dependency during compilation
openjdk: autools not to override B var
jamvm.inc: jamvm recipe cleanup
base-files: Define JAVA_HOME by default
Missing inheritance and dependencies in some java packages
openjdk-7: added java tools to the jdk package
openjdk: add keytool link
openjdk: postinst cleanup
icedtea7-native compile failure undefined reference to `main'
openjdk: fix CVE-2014-1876
jamvm-git uprev to 2.0.0
openjdk-7: add depends on attr
icedtea7-native/openjdk-7: fails on hosts with no unzip
openjdk hotspot build system std.h fix
classes/java.bbclass | 9 +-
recipes-core/base-files/base-files_3.0.14.bbappend | 13 ++
recipes-core/classpath/classpath-native_0.99.bb | 2 +-
...etlib-missing-dependency-for-util_classes.patch | 31 ++++
recipes-core/classpathx/inetlib_1.1.1.bb | 1 +
recipes-core/icedtea/icedtea7-native.inc | 4 +-
.../icedtea-CVE-2014-1876-unpack.patch | 44 ++++++
.../openjdk-7-03b147/icedtea-jdk-unzip.patch | 130 +++++++++++++++
.../openjdk-7-03b147/icedtea-makefile-unzip.patch | 167 +++++++++++++++++++
.../icedtea-x11_extension_cleanup.patch | 42 +++++
recipes-core/icedtea/openjdk-7-release-03b147.inc | 7 +
recipes-core/jamvm/jamvm.inc | 7 +-
recipes-core/jamvm/jamvm_git.bb | 4 +-
recipes-core/openjdk/openjdk-7-common.inc | 4 +
recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb | 5 +
recipes-core/openjdk/openjdk-common.inc | 3 +-
recipes-core/openjdk/openjdk-postinst.inc | 24 ++-
.../patches-openjdk-7/icedtea-dtrace-std_h.patch | 40 +++++
.../patches-openjdk-7/icedtea-jdk-unzip.patch | 130 +++++++++++++++
.../patches-openjdk-7/icedtea-makefile-unzip.patch | 176 +++++++++++++++++++++
20 files changed, 825 insertions(+), 18 deletions(-)
create mode 100644 recipes-core/base-files/base-files_3.0.14.bbappend
create mode 100644 recipes-core/classpathx/inetlib-1.1.1/inetlib-missing-dependency-for-util_classes.patch
create mode 100644 recipes-core/icedtea/openjdk-7-03b147/icedtea-CVE-2014-1876-unpack.patch
create mode 100644 recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-unzip.patch
create mode 100644 recipes-core/icedtea/openjdk-7-03b147/icedtea-makefile-unzip.patch
create mode 100644 recipes-core/icedtea/openjdk-7-03b147/icedtea-x11_extension_cleanup.patch
create mode 100644 recipes-core/openjdk/patches-openjdk-7/icedtea-dtrace-std_h.patch
create mode 100644 recipes-core/openjdk/patches-openjdk-7/icedtea-jdk-unzip.patch
create mode 100644 recipes-core/openjdk/patches-openjdk-7/icedtea-makefile-unzip.patch
--
1.9.1
^ permalink raw reply [flat|nested] 18+ messages in thread
* [meta-java][PATCH 01/15] java.bbclass: java missing classes during compile
2015-12-25 7:56 [meta-java][PATCH 00/15] meta-java: fixes for some issues jackie.huang
@ 2015-12-25 7:56 ` jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 02/15] inetlib: fix inetlib dependency during compilation jackie.huang
` (14 subsequent siblings)
15 siblings, 0 replies; 18+ messages in thread
From: jackie.huang @ 2015-12-25 7:56 UTC (permalink / raw)
To: openembedded-devel
From: Amy Fong <amy.fong@windriver.com>
oe_makeclasspath is used to define the classpath argument passed to
javac for a number of packages. The current behaviour takes a number
args specifying jar files to look for and if the files exist, it adds
it to a specified variable.
On some builds, oe_makeclasspath cannot find the jar file.
oe_makeclasspath used an invalid test to see the package is native.
(testing if the build arch and package arch are the same, if so, native)
We test to see if PN matches *-native or *-nativesdk instead.
Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
classes/java.bbclass | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/classes/java.bbclass b/classes/java.bbclass
index 464d8a8..ab51787 100644
--- a/classes/java.bbclass
+++ b/classes/java.bbclass
@@ -98,11 +98,14 @@ oe_makeclasspath() {
case "$1" in
-s)
# take jar files from native staging if this is a -native recipe
- if [ ${PACKAGE_ARCH} = ${BUILD_ARCH} ]; then
+ case "$PN" in
+ *-native|*-nativesdk)
dir=${STAGING_DATADIR_JAVA_NATIVE}
- else
+ ;;
+ *)
dir=${STAGING_DATADIR_JAVA}
- fi
+ ;;
+ esac
;;
-*)
bbfatal "oe_makeclasspath: unknown option: $1"
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [meta-java][PATCH 02/15] inetlib: fix inetlib dependency during compilation
2015-12-25 7:56 [meta-java][PATCH 00/15] meta-java: fixes for some issues jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 01/15] java.bbclass: java missing classes during compile jackie.huang
@ 2015-12-25 7:56 ` jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 03/15] openjdk: autools not to override B var jackie.huang
` (13 subsequent siblings)
15 siblings, 0 replies; 18+ messages in thread
From: jackie.huang @ 2015-12-25 7:56 UTC (permalink / raw)
To: openembedded-devel
From: Amy Fong <amy.fong@windriver.com>
Fix a dependency issue when building many parallel threads for
inetlib. The build failure looks like:
1. ERROR in source/gnu/inet/util/SaslCallbackHandler.java (at line 43)
import javax.security.auth.callback.Callback;
^^^^^^^^^^^^^^
The issue is due to the jar linking before all the objects are
complete.
Signed-off-by: Paul Barrette <paul.barrette@windriver.com>
Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
...etlib-missing-dependency-for-util_classes.patch | 31 ++++++++++++++++++++++
recipes-core/classpathx/inetlib_1.1.1.bb | 1 +
2 files changed, 32 insertions(+)
create mode 100644 recipes-core/classpathx/inetlib-1.1.1/inetlib-missing-dependency-for-util_classes.patch
diff --git a/recipes-core/classpathx/inetlib-1.1.1/inetlib-missing-dependency-for-util_classes.patch b/recipes-core/classpathx/inetlib-1.1.1/inetlib-missing-dependency-for-util_classes.patch
new file mode 100644
index 0000000..6691228
--- /dev/null
+++ b/recipes-core/classpathx/inetlib-1.1.1/inetlib-missing-dependency-for-util_classes.patch
@@ -0,0 +1,31 @@
+From 9779e734630e65ac7f9b27531c521e6555e2b12b Mon Sep 17 00:00:00 2001
+From: Paul Barrette <paul.barrette@windriver.com>
+Date: Wed, 14 May 2014 10:55:31 -0400
+Subject: [PATCH] inetlib: missing dependency for util_classes
+
+Fix a dependency for intermittent build failures, e.g.:
+1. ERROR in source/gnu/inet/util/SaslCallbackHandler.java (at line 43)
+ import javax.security.auth.callback.Callback;
+ ^^^^^^^^^^^^^^
+
+Signed-off-by: Paul Barrette <paul.barrette@windriver.com>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 5694974..ca93170 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -205,7 +205,7 @@ comsat_classes = $(patsubst $(src)/%.java, $(dst)/%.class, $(comsat_sources))
+
+ # Jar
+
+-$(inetlib_jar): $(dst) $(META_INF_FILES) $(smtp_classes) $(imap_classes) $(pop3_classes) $(nntp_classes) $(ftp_classes) $(gopher_classes) $(finger_classes) $(http_classes) $(ldap_classes) $(comsat_classes)
++$(inetlib_jar): $(dst) $(META_INF_FILES) $(util_classes) $(smtp_classes) $(imap_classes) $(pop3_classes) $(nntp_classes) $(ftp_classes) $(gopher_classes) $(finger_classes) $(http_classes) $(ldap_classes) $(comsat_classes)
+ $(JAR) cf $(inetlib_jar) -C $(dst) META-INF -C $(dst) gnu
+
+ $(dst):
+--
+1.8.3.2
+
diff --git a/recipes-core/classpathx/inetlib_1.1.1.bb b/recipes-core/classpathx/inetlib_1.1.1.bb
index f078e33..e42a650 100644
--- a/recipes-core/classpathx/inetlib_1.1.1.bb
+++ b/recipes-core/classpathx/inetlib_1.1.1.bb
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
SRC_URI = "http://ftp.gnu.org/gnu/classpath/${BP}.tar.gz \
file://datadir_java.patch \
+ file://inetlib-missing-dependency-for-util_classes.patch \
"
inherit java-library autotools
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [meta-java][PATCH 03/15] openjdk: autools not to override B var
2015-12-25 7:56 [meta-java][PATCH 00/15] meta-java: fixes for some issues jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 01/15] java.bbclass: java missing classes during compile jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 02/15] inetlib: fix inetlib dependency during compilation jackie.huang
@ 2015-12-25 7:56 ` jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 04/15] jamvm.inc: jamvm recipe cleanup jackie.huang
` (12 subsequent siblings)
15 siblings, 0 replies; 18+ messages in thread
From: jackie.huang @ 2015-12-25 7:56 UTC (permalink / raw)
To: openembedded-devel
From: Amy Fong <amy.fong@windriver.com>
${B} is set before autotools and thus is overrided
by autotools. Some of the patches within icedtea are
expected to be patched against ${S}/build (during
do_configure() phase). As autotools to change B
= "${WORKDIR}/build", so this causes some patches failed
to apply and hence breaks do_configure() with the following
errors:
| patching file openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
| can't find file to patch at input line 13
| Perhaps you used the wrong -p or --strip option?
| The text leading up to this was:
| --------------------------
| |---
| | build/openjdk/corba/make/common/shared/Defs-utils.gmk | 6 +++---
| | build/openjdk/jdk/make/common/Demo.gmk | 2 +-
| | build/openjdk/jdk/make/common/Release.gmk | 2 +-
| | build/openjdk/jdk/make/common/internal/ImportComponents.gmk | 4 ++--
| | build/openjdk/jdk/make/common/shared/Defs-utils.gmk | 6 +++---
| | build/openjdk/jdk/make/common/shared/Sanity.gmk | 2 +-
| | build/openjdk/jdk/make/java/redist/Makefile | 4 ++--
| | 7 files changed, 13 insertions(+), 13 deletions(-)
| |
| |--- a/build/openjdk/corba/make/common/shared/Defs-utils.gmk
| |+++ b/build/openjdk/corba/make/common/shared/Defs-utils.gmk
| --------------------------
| File to patch:
| Skip this patch? [y]
| File to patch:
| Skip this patch? [y]
| Skipping patch.
Signed-off-by: Vu Tran <vu.tran@windriver.com>
Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
recipes-core/openjdk/openjdk-common.inc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/recipes-core/openjdk/openjdk-common.inc b/recipes-core/openjdk/openjdk-common.inc
index dc26522..6a72572 100644
--- a/recipes-core/openjdk/openjdk-common.inc
+++ b/recipes-core/openjdk/openjdk-common.inc
@@ -7,7 +7,6 @@ SECTION = "libs"
ICEDTEA_VERSION = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[1].split("-")[1] or '1.0'}"
S = "${WORKDIR}/${ICEDTEA}"
-B = "${S}/build"
DEPENDS_append_libc-uclibc = " virtual/libiconv "
@@ -19,6 +18,8 @@ DEPENDS_append = " qemu-native "
inherit java autotools gettext qemu pkgconfig
+B = "${S}/build"
+
# OpenJDK uses slightly different names for certain arches. We need to know
# this to create some files which are expected by the build.
def get_jdk_arch(d):
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [meta-java][PATCH 04/15] jamvm.inc: jamvm recipe cleanup
2015-12-25 7:56 [meta-java][PATCH 00/15] meta-java: fixes for some issues jackie.huang
` (2 preceding siblings ...)
2015-12-25 7:56 ` [meta-java][PATCH 03/15] openjdk: autools not to override B var jackie.huang
@ 2015-12-25 7:56 ` jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 05/15] base-files: Define JAVA_HOME by default jackie.huang
` (11 subsequent siblings)
15 siblings, 0 replies; 18+ messages in thread
From: jackie.huang @ 2015-12-25 7:56 UTC (permalink / raw)
To: openembedded-devel
From: Amy Fong <amy.fong@windriver.com>
jamvm.inc's SRC_URI isn't used anymore, all jamvm bb recipes have been
defining their own.
In a rare instance, a build failed because it was using the SRC_URI
defined from jamvm.inc instead (jamvm_git.bb), this cleanup should
prevent this oddity from occuring.
Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
recipes-core/jamvm/jamvm.inc | 5 -----
1 file changed, 5 deletions(-)
diff --git a/recipes-core/jamvm/jamvm.inc b/recipes-core/jamvm/jamvm.inc
index 5893cbc..777b442 100644
--- a/recipes-core/jamvm/jamvm.inc
+++ b/recipes-core/jamvm/jamvm.inc
@@ -15,11 +15,6 @@ RPROVIDES_${PN}_virtclass-native = ""
BBCLASSEXTEND = "native"
-SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz \
- file://jamvm-jni_h-noinst.patch \
- file://libffi.patch \
- "
-
inherit java autotools update-alternatives pkgconfig
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [meta-java][PATCH 05/15] base-files: Define JAVA_HOME by default
2015-12-25 7:56 [meta-java][PATCH 00/15] meta-java: fixes for some issues jackie.huang
` (3 preceding siblings ...)
2015-12-25 7:56 ` [meta-java][PATCH 04/15] jamvm.inc: jamvm recipe cleanup jackie.huang
@ 2015-12-25 7:56 ` jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 06/15] Missing inheritance and dependencies in some java packages jackie.huang
` (10 subsequent siblings)
15 siblings, 0 replies; 18+ messages in thread
From: jackie.huang @ 2015-12-25 7:56 UTC (permalink / raw)
To: openembedded-devel
From: Amy Fong <amy.fong@windriver.com>
In the default /etc/profile, search for and define JAVA_HOME
in the environment variables.
Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
recipes-core/base-files/base-files_3.0.14.bbappend | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 recipes-core/base-files/base-files_3.0.14.bbappend
diff --git a/recipes-core/base-files/base-files_3.0.14.bbappend b/recipes-core/base-files/base-files_3.0.14.bbappend
new file mode 100644
index 0000000..4651185
--- /dev/null
+++ b/recipes-core/base-files/base-files_3.0.14.bbappend
@@ -0,0 +1,13 @@
+do_install_append() {
+ cat >> ${D}${sysconfdir}/profile << EOT
+JAVA_HOME=""
+for dir in ${libdir}/jvm/*; do
+ if [ -x "\${dir}/bin/java" ]; then
+ [ -z "\${JAVA_HOME}" ] && JAVA_HOME="\${dir}"
+ fi
+done
+if [ -n "\${JAVA_HOME}" ]; then
+ export JAVA_HOME=\${JAVA_HOME}
+fi
+EOT
+}
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [meta-java][PATCH 06/15] Missing inheritance and dependencies in some java packages
2015-12-25 7:56 [meta-java][PATCH 00/15] meta-java: fixes for some issues jackie.huang
` (4 preceding siblings ...)
2015-12-25 7:56 ` [meta-java][PATCH 05/15] base-files: Define JAVA_HOME by default jackie.huang
@ 2015-12-25 7:56 ` jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 07/15] openjdk-7: added java tools to the jdk package jackie.huang
` (9 subsequent siblings)
15 siblings, 0 replies; 18+ messages in thread
From: jackie.huang @ 2015-12-25 7:56 UTC (permalink / raw)
To: openembedded-devel
From: Amy Fong <amy.fong@windriver.com>
icedtea7-native, openjdk-7, and jamvm-native requires pkg-config to
configure without running into an error similar to
7554: syntax error near unexpected token `NSS,'
7554: `PKG_CHECK_MODULES(NSS, nss, NSS_FOUND=yes, NSS_FOUND=no)'
classpath-native and jamvm-native both needs to depend on
java-initial-native
Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
recipes-core/classpath/classpath-native_0.99.bb | 2 +-
recipes-core/icedtea/icedtea7-native.inc | 2 +-
recipes-core/jamvm/jamvm.inc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/recipes-core/classpath/classpath-native_0.99.bb b/recipes-core/classpath/classpath-native_0.99.bb
index 02951b9..d49d7d7 100644
--- a/recipes-core/classpath/classpath-native_0.99.bb
+++ b/recipes-core/classpath/classpath-native_0.99.bb
@@ -1,7 +1,7 @@
require classpath-native.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=af0004801732bc4b20d90f351cf80510"
-DEPENDS += "ecj-initial-native"
+DEPENDS += "ecj-initial-native virtual/java-initial-native"
PR = "${INC_PR}.0"
diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc
index 43385e9..b38f3cb 100644
--- a/recipes-core/icedtea/icedtea7-native.inc
+++ b/recipes-core/icedtea/icedtea7-native.inc
@@ -17,7 +17,7 @@ PACKAGECONFIG[x11] = ",--disable-headful,libx11-native xproto-native libxt-nativ
OEMAKE_BUILD_HEADLESS_ONLY = "${@base_contains('PACKAGECONFIG', 'x11', '', 'BUILD_HEADLESS_ONLY=1', d)}"
CFLAGS_append = "${@base_contains('PACKAGECONFIG', 'x11', '', ' -DHEADLESS=true', d)}"
-inherit native java autotools
+inherit native java autotools pkgconfig
JAVA_HOME[unexport] = "1"
diff --git a/recipes-core/jamvm/jamvm.inc b/recipes-core/jamvm/jamvm.inc
index 777b442..880b1e7 100644
--- a/recipes-core/jamvm/jamvm.inc
+++ b/recipes-core/jamvm/jamvm.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://jamvm.sourceforge.net/"
LICENSE = "GPL-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
-DEPENDS = "zlib classpath virtual/javac-native libffi"
+DEPENDS = "zlib classpath virtual/javac-native libffi virtual/java-initial-native"
DEPENDS_virtclass-native = "zlib-native classpath-native ecj-initial-native libffi-native"
RDEPENDS_${PN} = "classpath"
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [meta-java][PATCH 07/15] openjdk-7: added java tools to the jdk package
2015-12-25 7:56 [meta-java][PATCH 00/15] meta-java: fixes for some issues jackie.huang
` (5 preceding siblings ...)
2015-12-25 7:56 ` [meta-java][PATCH 06/15] Missing inheritance and dependencies in some java packages jackie.huang
@ 2015-12-25 7:56 ` jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 08/15] openjdk: add keytool link jackie.huang
` (8 subsequent siblings)
15 siblings, 0 replies; 18+ messages in thread
From: jackie.huang @ 2015-12-25 7:56 UTC (permalink / raw)
To: openembedded-devel
From: Amy Fong <amy.fong@windriver.com>
The jdk package was missing tools like javac and tools.jar. Adding
jvm to the packaging pulls in the tool set.
Signed-off-by: Paul Barrette <paul.barrette@windriver.com>
Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
recipes-core/openjdk/openjdk-7-common.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc
index 4feb80f..37f5911 100644
--- a/recipes-core/openjdk/openjdk-7-common.inc
+++ b/recipes-core/openjdk/openjdk-7-common.inc
@@ -302,6 +302,7 @@ FILES_${JDKPN}-jdk = " \
${JDK_HOME}/bin \
${JDK_HOME}/lib \
${JDK_HOME}/include \
+ ${JDK_HOME}${libdir}/jvm \
"
RDEPENDS_${JDKPN}-jre = "${JDKPN}-java ${JDKPN}-common"
RDEPENDS_${JDKPN}-java = "${JDKPN}-common"
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [meta-java][PATCH 08/15] openjdk: add keytool link
2015-12-25 7:56 [meta-java][PATCH 00/15] meta-java: fixes for some issues jackie.huang
` (6 preceding siblings ...)
2015-12-25 7:56 ` [meta-java][PATCH 07/15] openjdk-7: added java tools to the jdk package jackie.huang
@ 2015-12-25 7:56 ` jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 09/15] openjdk: postinst cleanup jackie.huang
` (7 subsequent siblings)
15 siblings, 0 replies; 18+ messages in thread
From: jackie.huang @ 2015-12-25 7:56 UTC (permalink / raw)
To: openembedded-devel
From: Amy Fong <amy.fong@windriver.com>
Add alternative link keytool
Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
recipes-core/openjdk/openjdk-postinst.inc | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/recipes-core/openjdk/openjdk-postinst.inc b/recipes-core/openjdk/openjdk-postinst.inc
index e309a27..4985d56 100644
--- a/recipes-core/openjdk/openjdk-postinst.inc
+++ b/recipes-core/openjdk/openjdk-postinst.inc
@@ -74,11 +74,13 @@ pkg_prerm_${JDKPN}-vm-zero () {
inherit update-alternatives
-ALTERNATIVE_${JDKPN}-jre = "java"
-ALTERNATIVE_TARGET_${JDKPN}-jre = "${JDK_HOME}/jre/bin/java"
-
+ALTERNATIVE_${JDKPN}-jre = "java keytool"
ALTERNATIVE_${JDKPN}-jdk = "javac"
-ALTERNATIVE_TARGET_${JDKPN}-jdk = "${JDK_HOME}/bin/javac"
+
+ALTERNATIVE_TARGET[java] = "${JDK_HOME}/jre/bin/java"
+ALTERNATIVE_TARGET[javac] = "${JDK_HOME}/bin/javac"
+ALTERNATIVE_TARGET[keytool] = "${JDK_HOME}/jre/bin/keytool"
ALTERNATIVE_LINK_NAME[java] = "${bindir}/java"
ALTERNATIVE_LINK_NAME[javac] = "${bindir}/javac"
+ALTERNATIVE_LINK_NAME[keytool] = "${bindir}/keytool"
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [meta-java][PATCH 09/15] openjdk: postinst cleanup
2015-12-25 7:56 [meta-java][PATCH 00/15] meta-java: fixes for some issues jackie.huang
` (7 preceding siblings ...)
2015-12-25 7:56 ` [meta-java][PATCH 08/15] openjdk: add keytool link jackie.huang
@ 2015-12-25 7:56 ` jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 10/15] icedtea7-native compile failure undefined reference to `main' jackie.huang
` (6 subsequent siblings)
15 siblings, 0 replies; 18+ messages in thread
From: jackie.huang @ 2015-12-25 7:56 UTC (permalink / raw)
To: openembedded-devel
From: Amy Fong <amy.fong@windriver.com>
Some of the postinst rules results in a build error because "ERR" is in
the first line.
Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
recipes-core/openjdk/openjdk-postinst.inc | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/recipes-core/openjdk/openjdk-postinst.inc b/recipes-core/openjdk/openjdk-postinst.inc
index 4985d56..be88714 100644
--- a/recipes-core/openjdk/openjdk-postinst.inc
+++ b/recipes-core/openjdk/openjdk-postinst.inc
@@ -1,6 +1,9 @@
# handles all postinst action for openjdk
+# some of the former results in a build error because "ERR" is in the first line.
+
pkg_postinst_${JDKPN}-vm-shark () {
+ true
if grep -q "\-server ERROR" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
sed -i -e "/\-shark.*/d" -e "s|\(^\-server*\)|\-shark KNOWN\n\1|" -e "/^$/d" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
else
@@ -9,6 +12,7 @@ pkg_postinst_${JDKPN}-vm-shark () {
}
pkg_prerm_${JDKPN}-vm-shark () {
+ true
sed -i -e "/^\-shark.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1`
@@ -19,6 +23,7 @@ pkg_prerm_${JDKPN}-vm-shark () {
}
pkg_postinst_${JDKPN}-vm-cacao () {
+ true
if grep -q "\-server ERROR" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
sed -i -e "/\-cacao.*/d" -e "s|\(^\-server*\)|\-cacao KNOWN\n\1|" -e "/^$/d" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
else
@@ -27,6 +32,7 @@ pkg_postinst_${JDKPN}-vm-cacao () {
}
pkg_prerm_${JDKPN}-vm-cacao () {
+ true
sed -i -e "/^\-cacao.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1`
@@ -37,6 +43,7 @@ pkg_prerm_${JDKPN}-vm-cacao () {
}
pkg_postinst_${JDKPN}-vm-jamvm () {
+ true
if grep -q "\-server ERROR" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
sed -i -e "/\-jamvm.*/d" -e "s|\(^\-server*\)|\-jamvm KNOWN\n\1|" -e "/^$/d" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
else
@@ -45,6 +52,7 @@ pkg_postinst_${JDKPN}-vm-jamvm () {
}
pkg_prerm_${JDKPN}-vm-jamvm () {
+ true
sed -i -e "/^\-jamvm.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1`
@@ -55,6 +63,7 @@ pkg_prerm_${JDKPN}-vm-jamvm () {
}
pkg_postinst_${JDKPN}-vm-zero () {
+ true
if grep -q "KNOWN" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
FIRST_KNOWN=`grep "KNOWN" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1`
sed -i -e "/${FIRST_KNOWN}/d" -e "/^$/d" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
@@ -65,6 +74,7 @@ pkg_postinst_${JDKPN}-vm-zero () {
}
pkg_prerm_${JDKPN}-vm-zero () {
+ true
sed -i -e "/^\-server.*/\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1`
@@ -72,6 +82,10 @@ pkg_prerm_${JDKPN}-vm-zero () {
fi
}
+pkg_postinst_${JDKPN}-jre () {
+ ln -s ${JDK_HOME}/jre $D/${libdir}/jvm/jre
+}
+
inherit update-alternatives
ALTERNATIVE_${JDKPN}-jre = "java keytool"
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [meta-java][PATCH 10/15] icedtea7-native compile failure undefined reference to `main'
2015-12-25 7:56 [meta-java][PATCH 00/15] meta-java: fixes for some issues jackie.huang
` (8 preceding siblings ...)
2015-12-25 7:56 ` [meta-java][PATCH 09/15] openjdk: postinst cleanup jackie.huang
@ 2015-12-25 7:56 ` jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 11/15] openjdk: fix CVE-2014-1876 jackie.huang
` (5 subsequent siblings)
15 siblings, 0 replies; 18+ messages in thread
From: jackie.huang @ 2015-12-25 7:56 UTC (permalink / raw)
To: openembedded-devel
From: Amy Fong <amy.fong@windriver.com>
On hosts without /usr/include/X11/extensions, icedtea7-native compile
results in a build failure while trying to create an object file:
+/data/home/.../git/csu/../sysdeps/x86_64/start.S:118: undefined reference to `main'
[2015-03-31 15:22:53.115930161+00:00] | collect2: error: ld returned 1 exit status
The compile line shows: (-c gets eaten)
... -I -c -o
The makefile tries to do the following which results in a faulty build
line if /usr/include/X11/extensions doesn't exist:
CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
$(wildcard /usr/include/X11/extensions))
This looks like a missed line from the following patch which removes
the need for X11/extensions:
icedtea-ecj-disable-compilation.patch
Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
.../icedtea-x11_extension_cleanup.patch | 42 ++++++++++++++++++++++
recipes-core/icedtea/openjdk-7-release-03b147.inc | 2 ++
2 files changed, 44 insertions(+)
create mode 100644 recipes-core/icedtea/openjdk-7-03b147/icedtea-x11_extension_cleanup.patch
diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-x11_extension_cleanup.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-x11_extension_cleanup.patch
new file mode 100644
index 0000000..1b92c9a
--- /dev/null
+++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-x11_extension_cleanup.patch
@@ -0,0 +1,42 @@
+icedtea7-native compile failure undefined reference to `main'
+
+On hosts without /usr/include/X11/extensions, icedtea7-native compile
+results in a build failure while trying to create an object file:
+
++/data/home/.../git/csu/../sysdeps/x86_64/start.S:118: undefined reference to `main'
+[2015-03-31 15:22:53.115930161+00:00] | collect2: error: ld returned 1 exit status
+
+The compile line shows: (-c gets eaten)
+... -I -c -o
+
+The makefile tries to do the following which results in a faulty build
+line if /usr/include/X11/extensions doesn't exist:
+
+ CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
+ $(wildcard /usr/include/X11/extensions))
+
+This looks like a missed line from the following patch which removes the need for X11/extensions:
+ icedtea-ecj-disable-compilation.patch
+
+Upstream-Status: Pending
+
+Signed-off-by: Amy Fong <amy.fong@windriver.com>
+---
+ openjdk/jdk/make/sun/awt/mawt.gmk | 6 ------
+ 1 file changed, 6 deletions(-)
+
+--- openjdk/jdk/make/sun/awt/mawt.gmk
++++ openjdk/jdk/make/sun/awt/mawt.gmk
+@@ -258,12 +258,6 @@
+ -I$(PLATFORM_SRC)/native/$(PKGDIR) \
+ $(EVENT_MODEL)
+
+-ifeq ($(PLATFORM), linux)
+- # Checking for the X11/extensions headers at the additional location
+- CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
+- $(wildcard /usr/include/X11/extensions))
+-endif
+-
+ ifeq ($(PLATFORM), solaris)
+ CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
+ endif
diff --git a/recipes-core/icedtea/openjdk-7-release-03b147.inc b/recipes-core/icedtea/openjdk-7-release-03b147.inc
index b1cf6e9..dbdc045 100644
--- a/recipes-core/icedtea/openjdk-7-release-03b147.inc
+++ b/recipes-core/icedtea/openjdk-7-release-03b147.inc
@@ -85,6 +85,7 @@ OPENJDK_PATCHES = " \
file://icedtea-disable-x11-in-headless.patch;apply=no \
file://icedtea-disable-sun.applet-for-tools-in-headless.patch;apply=no \
file://icedtea-hotspot-fix-undefined-behaviour.patch;apply=no \
+ file://icedtea-x11_extension_cleanup.patch;apply=no \
"
OPENJDK_HEADLESS_PATCHES = " \
@@ -104,5 +105,6 @@ export DISTRIBUTION_PATCHES = " \
patches/icedtea-openjdk-remove-currency-data-generation-expi.patch \
patches/icedtea-change-to-gdb-debug-format.patch \
patches/icedtea-hotspot-fix-undefined-behaviour.patch \
+ patches/icedtea-x11_extension_cleanup.patch \
${CLEAN_X11_DISTRIBUTION_PATCH} \
"
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [meta-java][PATCH 11/15] openjdk: fix CVE-2014-1876
2015-12-25 7:56 [meta-java][PATCH 00/15] meta-java: fixes for some issues jackie.huang
` (9 preceding siblings ...)
2015-12-25 7:56 ` [meta-java][PATCH 10/15] icedtea7-native compile failure undefined reference to `main' jackie.huang
@ 2015-12-25 7:56 ` jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 12/15] jamvm-git uprev to 2.0.0 jackie.huang
` (4 subsequent siblings)
15 siblings, 0 replies; 18+ messages in thread
From: jackie.huang @ 2015-12-25 7:56 UTC (permalink / raw)
To: openembedded-devel
From: Amy Fong <amy.fong@windriver.com>
Rather than creating /tmp/unpack.log and insecure permissions,
if unpack cannot create teh specified log file, it defaults to writing
to /dev/null, failing that, stderr. (These are the default options if
it cannot write to /tmp/unpack.log)
Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
.../icedtea-CVE-2014-1876-unpack.patch | 44 ++++++++++++++++++++++
recipes-core/icedtea/openjdk-7-release-03b147.inc | 2 +
2 files changed, 46 insertions(+)
create mode 100644 recipes-core/icedtea/openjdk-7-03b147/icedtea-CVE-2014-1876-unpack.patch
diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-CVE-2014-1876-unpack.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-CVE-2014-1876-unpack.patch
new file mode 100644
index 0000000..d0717c4
--- /dev/null
+++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-CVE-2014-1876-unpack.patch
@@ -0,0 +1,44 @@
+This provides a fix for the security vulnerability reported in
+http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-1876
+
+ The unpacker::redirect_stdio function in unpack.cpp in unpack200 in OpenJDK 6,
+ 7, and 8, and Oracle Java JDK, does not securely create temporary files when a
+ log file cannot be opened, which allows local users to overwrite arbitrary
+ files via a symlink attack on /tmp/unpack.log.
+
+Rather than trying to open a /tmp/unpack.log file, this fix comments
+out that segment and goes to the fallback options which include
+redirecting error to /dev/null, or failing that, redirecting to stderr.
+
+Upstream-Status: Pending
+
+Signed-off-by: Amy Fong <amy.fong@windriver.com>
+
+Index: openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
+===================================================================
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
+@@ -4757,6 +4757,15 @@
+ return;
+ } else {
+ char log_file_name[PATH_MAX+100];
++#if 0
++/*
++The unpacker::redirect_stdio function in unpack.cpp in unpack200 in OpenJDK 6,
++7, and 8, and Oracle Java JDK, does not securely create temporary files when a
++log file cannot be opened, which allows local users to overwrite arbitrary
++files via a symlink attack on /tmp/unpack.log.
++
++http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-1876
++*/
+ char tmpdir[PATH_MAX];
+ #ifdef WIN32
+ int n = GetTempPath(PATH_MAX,tmpdir); //API returns with trailing '\'
+@@ -4781,6 +4790,7 @@
+ log_file = errstrm_name = saveStr(log_file_name);
+ return ;
+ }
++#endif
+ #ifndef WIN32
+ sprintf(log_file_name, "/dev/null");
+ // On windows most likely it will fail.
diff --git a/recipes-core/icedtea/openjdk-7-release-03b147.inc b/recipes-core/icedtea/openjdk-7-release-03b147.inc
index dbdc045..83b087c 100644
--- a/recipes-core/icedtea/openjdk-7-release-03b147.inc
+++ b/recipes-core/icedtea/openjdk-7-release-03b147.inc
@@ -86,6 +86,7 @@ OPENJDK_PATCHES = " \
file://icedtea-disable-sun.applet-for-tools-in-headless.patch;apply=no \
file://icedtea-hotspot-fix-undefined-behaviour.patch;apply=no \
file://icedtea-x11_extension_cleanup.patch;apply=no \
+ file://icedtea-CVE-2014-1876-unpack.patch;apply=no \
"
OPENJDK_HEADLESS_PATCHES = " \
@@ -106,5 +107,6 @@ export DISTRIBUTION_PATCHES = " \
patches/icedtea-change-to-gdb-debug-format.patch \
patches/icedtea-hotspot-fix-undefined-behaviour.patch \
patches/icedtea-x11_extension_cleanup.patch \
+ patches/icedtea-CVE-2014-1876-unpack.patch \
${CLEAN_X11_DISTRIBUTION_PATCH} \
"
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [meta-java][PATCH 12/15] jamvm-git uprev to 2.0.0
2015-12-25 7:56 [meta-java][PATCH 00/15] meta-java: fixes for some issues jackie.huang
` (10 preceding siblings ...)
2015-12-25 7:56 ` [meta-java][PATCH 11/15] openjdk: fix CVE-2014-1876 jackie.huang
@ 2015-12-25 7:56 ` jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 13/15] openjdk-7: add depends on attr jackie.huang
` (3 subsequent siblings)
15 siblings, 0 replies; 18+ messages in thread
From: jackie.huang @ 2015-12-25 7:56 UTC (permalink / raw)
To: openembedded-devel
From: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
recipes-core/jamvm/jamvm_git.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes-core/jamvm/jamvm_git.bb b/recipes-core/jamvm/jamvm_git.bb
index 63364aa..6bbfa52 100644
--- a/recipes-core/jamvm/jamvm_git.bb
+++ b/recipes-core/jamvm/jamvm_git.bb
@@ -7,8 +7,8 @@ inherit distro_features_check
REQUIRED_DISTRO_FEATURES = "x11"
-SRCREV = "ebd11bde0a97b57f0d18938c6b65468d3c932719"
-PV = "1.5.5+1.6.0-devel+git${SRCPV}"
+SRCREV = "6cef41d859fbc9ce7868a97cb2cb5dd2b10b9103"
+PV = "2.0.0-devel+git${SRCPV}"
SRC_URI = "git://git.code.sf.net/p/jamvm/code;protocol=git \
file://jamvm-jni_h-noinst.patch \
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [meta-java][PATCH 13/15] openjdk-7: add depends on attr
2015-12-25 7:56 [meta-java][PATCH 00/15] meta-java: fixes for some issues jackie.huang
` (11 preceding siblings ...)
2015-12-25 7:56 ` [meta-java][PATCH 12/15] jamvm-git uprev to 2.0.0 jackie.huang
@ 2015-12-25 7:56 ` jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 14/15] icedtea7-native/openjdk-7: fails on hosts with no unzip jackie.huang
` (2 subsequent siblings)
15 siblings, 0 replies; 18+ messages in thread
From: jackie.huang @ 2015-12-25 7:56 UTC (permalink / raw)
To: openembedded-devel
From: Amy Fong <amy.fong@windriver.com>
openjdk depends on attr, this can result in a configure
failure if the dependency is missing.
checking for sys/epoll.h... (cached) yes
checking attr/xattr.h usability... no
checking attr/xattr.h presence... no
checking for attr/xattr.h... no
configure: error: Could not find required system headers;
install the appropriate files from glibc-headers,
libc6-dev and/or libattr-devel, libattr1-dev or use
--disable-compile-against-syscalls if necessary.
Configure failed. The contents of all config.log files follows to aid debugging
Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
recipes-core/openjdk/openjdk-7-common.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc
index 37f5911..a928103 100644
--- a/recipes-core/openjdk/openjdk-7-common.inc
+++ b/recipes-core/openjdk/openjdk-7-common.inc
@@ -32,6 +32,7 @@ DEPENDS = " \
rhino krb5 \
libxt libxinerama libxrender libxtst libxi \
freetype alsa-lib libffi \
+ attr \
"
# No package should directly depend on this (it should require
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [meta-java][PATCH 14/15] icedtea7-native/openjdk-7: fails on hosts with no unzip
2015-12-25 7:56 [meta-java][PATCH 00/15] meta-java: fixes for some issues jackie.huang
` (12 preceding siblings ...)
2015-12-25 7:56 ` [meta-java][PATCH 13/15] openjdk-7: add depends on attr jackie.huang
@ 2015-12-25 7:56 ` jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 15/15] openjdk hotspot build system std.h fix jackie.huang
2015-12-28 14:10 ` [meta-java][PATCH 00/15] meta-java: fixes for some issues Koen Kooi
15 siblings, 0 replies; 18+ messages in thread
From: jackie.huang @ 2015-12-25 7:56 UTC (permalink / raw)
To: openembedded-devel
From: Amy Fong <amy.fong@windriver.com>
Fails with an error message /usr/bin/unzip not found.
Additionally, icedtea7 enables you to specify an unzip to use by setting
the variable UNZIP, this results in an error because unzip uses UNZIP
to specify options, hence you'll end up with unzip trying to unzip unzip.
Note: Same issue applies to openjdk
Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
recipes-core/icedtea/icedtea7-native.inc | 2 +
.../openjdk-7-03b147/icedtea-jdk-unzip.patch | 130 +++++++++++++++
.../openjdk-7-03b147/icedtea-makefile-unzip.patch | 167 +++++++++++++++++++
recipes-core/icedtea/openjdk-7-release-03b147.inc | 3 +
recipes-core/openjdk/openjdk-7-common.inc | 2 +
recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb | 3 +
.../patches-openjdk-7/icedtea-jdk-unzip.patch | 130 +++++++++++++++
.../patches-openjdk-7/icedtea-makefile-unzip.patch | 176 +++++++++++++++++++++
8 files changed, 613 insertions(+)
create mode 100644 recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-unzip.patch
create mode 100644 recipes-core/icedtea/openjdk-7-03b147/icedtea-makefile-unzip.patch
create mode 100644 recipes-core/openjdk/patches-openjdk-7/icedtea-jdk-unzip.patch
create mode 100644 recipes-core/openjdk/patches-openjdk-7/icedtea-makefile-unzip.patch
diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc
index b38f3cb..cb6b5d3 100644
--- a/recipes-core/icedtea/icedtea7-native.inc
+++ b/recipes-core/icedtea/icedtea7-native.inc
@@ -85,6 +85,7 @@ EXTRA_OECONF = "\
--with-jaxws-src-zip=${DL_DIR}/${JAXWS_FILE} \
--with-jdk-src-zip=${DL_DIR}/${JDK_FILE} \
--with-langtools-src-zip=${DL_DIR}/${LANGTOOLS_FILE} \
+ ac_cv_path_UNZIP_BIN="${STAGING_BINDIR_NATIVE}/unzip" \
"
JDK_DIR = "icedtea7-native"
@@ -163,6 +164,7 @@ EXTRA_OEMAKE = ' \
ZIPEXE="${STAGING_BINDIR_NATIVE}/zip" \
${OEMAKE_BUILD_HEADLESS_ONLY} \
DISABLE_HOTSPOT_OS_VERSION_CHECK=ok \
+ UNZIP_BIN="${STAGING_BINDIR_NATIVE}/unzip" \
'
do_compile() {
diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-unzip.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-unzip.patch
new file mode 100644
index 0000000..8c29730
--- /dev/null
+++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-unzip.patch
@@ -0,0 +1,130 @@
+Use UNZIP_BIN instead of UNZIP.
+
+Fails with an error message /usr/bin/unzip not found.
+Additionally, icedtea7 enables you to specify an unzip to use by setting
+the variable UNZIP, this results in an error because unzip uses UNZIP
+to specify options, hence you'll end up with unzip trying to unzip unzip.
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Amy Fong <amy.fong@windriver.com>
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ openjdk/corba/make/common/shared/Defs-utils.gmk | 6 +++---
+ openjdk/jdk/make/common/Demo.gmk | 2 +-
+ openjdk/jdk/make/common/Release.gmk | 2 +-
+ openjdk/jdk/make/common/internal/ImportComponents.gmk | 4 ++--
+ openjdk/jdk/make/common/shared/Defs-utils.gmk | 6 +++---
+ openjdk/jdk/make/common/shared/Sanity.gmk | 2 +-
+ openjdk/jdk/make/java/redist/Makefile | 4 ++--
+ 7 files changed, 13 insertions(+), 13 deletions(-)
+
+--- openjdk/corba/make/common/shared/Defs-utils.gmk
++++ openjdk/corba/make/common/shared/Defs-utils.gmk
+@@ -129,7 +129,7 @@
+ TRUE = $(UTILS_COMMAND_PATH)true
+ UNAME = $(UTILS_COMMAND_PATH)uname
+ UNIQ = $(UTILS_USR_BIN_PATH)uniq
+-UNZIP = $(UTILS_USR_BIN_PATH)unzip
++# UNZIP = $(UTILS_USR_BIN_PATH)unzip
+ UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx
+ WC = $(UTILS_USR_BIN_PATH)wc
+ WHICH = $(UTILS_USR_BIN_PATH)which
+@@ -146,10 +146,10 @@
+ # Intrinsic unix command, with backslash-escaped character interpretation
+ ECHO = $(UNIXCOMMAND_PATH)echo -e
+ ZIPEXE = $(UNIXCOMMAND_PATH)zip
+- UNZIP = $(UNIXCOMMAND_PATH)unzip
++ # UNZIP = $(UNIXCOMMAND_PATH)unzip
+ else
+ ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
+- UNZIP = $(UTILS_DEVTOOL_PATH)unzip
++ # UNZIP = $(UTILS_DEVTOOL_PATH)unzip
+ endif
+ # Re-define some utilities
+ LEX =# override GNU Make intrinsic: no lex on windows
+--- openjdk/jdk/make/common/Demo.gmk
++++ openjdk/jdk/make/common/Demo.gmk
+@@ -348,7 +348,7 @@
+ $(java-vm-cleanup) )
+ @( $(CD) $(DEMO_DESTDIR) && $(java-vm-cleanup) )
+ @$(ECHO) "Expanding source into demos area at $(DEMO_DESTDIR)"
+- ( $(CD) $(DEMO_DESTDIR) && $(UNZIP) -o src.zip && $(RM) src.zip )
++ ( $(CD) $(DEMO_DESTDIR) && $(UNZIP_BIN) -o src.zip && $(RM) src.zip )
+ endif
+
+ build: sources bundles
+--- openjdk/jdk/make/common/Release.gmk
++++ openjdk/jdk/make/common/Release.gmk
+@@ -909,7 +909,7 @@
+ initial-image-jdk-db: $(DB_ZIP_LIST)
+ $(MKDIR) -p $(JDK_IMAGE_DIR)/db
+ for d in $(DB_ZIP_LIST); do \
+- ($(CD) $(JDK_IMAGE_DIR)/db && $(UNZIP) -o $$d); \
++ ($(CD) $(JDK_IMAGE_DIR)/db && $(UNZIP_BIN) -o $$d); \
+ done
+ $(CP) $(ABS_DB_PATH)/README-JDK.html $(JDK_IMAGE_DIR)/db
+ $(RM) -rf $(DEMODIR)/db
+--- openjdk/jdk/make/common/internal/ImportComponents.gmk
++++ openjdk/jdk/make/common/internal/ImportComponents.gmk
+@@ -97,8 +97,8 @@
+ define Unzipper
+ ( \
+ $(MKDIR) -p $1; \
+- $(ECHO) "( $(CD) $1 && $(UNZIP) -o $2 )"; \
+- ( $(CD) $1 && $(UNZIP) -o $2 ) \
++ $(ECHO) "( $(CD) $1 && $(UNZIP_BIN) -o $2 )"; \
++ ( $(CD) $1 && $(UNZIP_BIN) -o $2 ) \
+ )
+ endef
+
+--- openjdk/jdk/make/common/shared/Defs-utils.gmk
++++ openjdk/jdk/make/common/shared/Defs-utils.gmk
+@@ -145,7 +145,7 @@
+ TRUE = $(UTILS_COMMAND_PATH)true
+ UNAME = $(UTILS_COMMAND_PATH)uname
+ UNIQ = $(UTILS_USR_BIN_PATH)uniq
+-UNZIP = $(UTILS_USR_BIN_PATH)unzip
++# UNZIP = $(UTILS_USR_BIN_PATH)unzip
+ UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx
+ XARGS = $(UTILS_USR_BIN_PATH)xargs
+ WC = $(UTILS_USR_BIN_PATH)wc
+@@ -163,12 +163,12 @@
+ # Intrinsic unix command, with backslash-escaped character interpretation
+ ECHO = $(UNIXCOMMAND_PATH)echo -e
+ ZIPEXE = $(UNIXCOMMAND_PATH)zip
+- UNZIP = $(UNIXCOMMAND_PATH)unzip
++ # UNZIP = $(UNIXCOMMAND_PATH)unzip
+ # Some CYGWIN nawk versions require BINMODE=w for proper '\r' interpretation
+ NAWK = $(UNIXCOMMAND_PATH)awk -v BINMODE=w
+ else
+ ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
+- UNZIP = $(UTILS_DEVTOOL_PATH)unzip
++ # UNZIP = $(UTILS_DEVTOOL_PATH)unzip
+ NAWK = $(UNIXCOMMAND_PATH)awk
+ endif
+ # Re-define some utilities
+--- openjdk/jdk/make/common/shared/Sanity.gmk
++++ openjdk/jdk/make/common/shared/Sanity.gmk
+@@ -151,7 +151,7 @@
+ # Get the version numbers of what we are using
+ _MAKE_VER :=$(shell $(MAKE) --version 2>&1 | $(HEAD) -n 1)
+ _ZIP_VER :=$(shell $(ZIPEXE) -help 2>&1 | $(HEAD) -n 4 | $(EGREP) '^Zip')
+-_UNZIP_VER :=$(shell $(UNZIP) -help 2>&1 | $(HEAD) -n 4 | $(EGREP) '^UnZip')
++_UNZIP_VER :=$(shell $(UNZIP_BIN) -help 2>&1 | $(HEAD) -n 4 | $(EGREP) '^UnZip')
+ _BOOT_VER :=$(shell $(BOOTDIR)/bin/java -version 2>&1 | $(HEAD) -n 1)
+ MAKE_VER :=$(call GetVersion,"$(_MAKE_VER)")
+ ZIP_VER :=$(call GetVersion,"$(_ZIP_VER)")
+--- openjdk/jdk/make/java/redist/Makefile
++++ openjdk/jdk/make/java/redist/Makefile
+@@ -482,8 +482,8 @@
+ define SecUnzipper
+ if [ -f $2 ] ; then \
+ $(MKDIR) -p $1; \
+- $(ECHO) "( $(CD) $1 && $(UNZIP) -o $2 )"; \
+- ( $(CD) $1 && $(UNZIP) -o $2 ); \
++ $(ECHO) "( $(CD) $1 && $(UNZIP_BIN) -o $2 )"; \
++ ( $(CD) $1 && $(UNZIP_BIN) -o $2 ); \
+ fi
+ endef
+
diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-makefile-unzip.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-makefile-unzip.patch
new file mode 100644
index 0000000..9b69a42
--- /dev/null
+++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-makefile-unzip.patch
@@ -0,0 +1,167 @@
+Use UNZIP_BIN instead of UNZIP.
+
+Fails with an error message /usr/bin/unzip not found.
+Additionally, icedtea7 enables you to specify an unzip to use by setting
+the variable UNZIP, this results in an error because unzip uses UNZIP
+to specify options, hence you'll end up with unzip trying to unzip unzip.
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Amy Fong <amy.fong@windriver.com>
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ Makefile.am | 14 +++++++-------
+ Makefile.in | 16 ++++++++--------
+ configure.ac | 2 +-
+ 3 files changed, 16 insertions(+), 16 deletions(-)
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1056,7 +1056,7 @@
+ if ! test -d openjdk ; then \
+ if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \
+ case "$(OPENJDK_SRC_ZIP)" in \
+- *.zip) $(UNZIP) -q $(OPENJDK_SRC_ZIP) ;; \
++ *.zip) $(UNZIP_BIN) -q $(OPENJDK_SRC_ZIP) ;; \
+ *.tar.*) $(TAR) xf $(OPENJDK_SRC_ZIP) ;; \
+ esac; \
+ mv `echo $(ICEDTEA_PREFIX)|sed 's#\.#-#'`-$(OPENJDK_CHANGESET) openjdk ; \
+@@ -1072,7 +1072,7 @@
+ if ! test -d openjdk/corba ; \
+ then \
+ case "$(CORBA_SRC_ZIP)" in \
+- *.zip) $(UNZIP) -q $(CORBA_SRC_ZIP) ;; \
++ *.zip) $(UNZIP_BIN) -q $(CORBA_SRC_ZIP) ;; \
+ *.tar.*) $(TAR) xf $(CORBA_SRC_ZIP) ;; \
+ esac; \
+ mv corba-$(CORBA_CHANGESET) openjdk/corba ; \
+@@ -1086,7 +1086,7 @@
+ if ! test -d openjdk/jaxp ; \
+ then \
+ case "$(JAXP_SRC_ZIP)" in \
+- *.zip) $(UNZIP) -q $(JAXP_SRC_ZIP) ;; \
++ *.zip) $(UNZIP_BIN) -q $(JAXP_SRC_ZIP) ;; \
+ *.tar.*) $(TAR) xf $(JAXP_SRC_ZIP) ;; \
+ esac; \
+ mv jaxp-$(JAXP_CHANGESET) openjdk/jaxp ; \
+@@ -1100,7 +1100,7 @@
+ if ! test -d openjdk/jaxws ; \
+ then \
+ case "$(JAXWS_SRC_ZIP)" in \
+- *.zip) $(UNZIP) -q $(JAXWS_SRC_ZIP) ;; \
++ *.zip) $(UNZIP_BIN) -q $(JAXWS_SRC_ZIP) ;; \
+ *.tar.*) $(TAR) xf $(JAXWS_SRC_ZIP) ;; \
+ esac; \
+ mv jaxws-$(JAXWS_CHANGESET) openjdk/jaxws ; \
+@@ -1114,7 +1114,7 @@
+ if ! test -d openjdk/jdk ; \
+ then \
+ case "$(JDK_SRC_ZIP)" in \
+- *.zip) $(UNZIP) -q $(JDK_SRC_ZIP) ;; \
++ *.zip) $(UNZIP_BIN) -q $(JDK_SRC_ZIP) ;; \
+ *.tar.*) $(TAR) xf $(JDK_SRC_ZIP) ;; \
+ esac; \
+ mv jdk-$(JDK_CHANGESET) openjdk/jdk ; \
+@@ -1128,7 +1128,7 @@
+ if ! test -d openjdk/langtools ; \
+ then \
+ case "$(LANGTOOLS_SRC_ZIP)" in \
+- *.zip) $(UNZIP) -q $(LANGTOOLS_SRC_ZIP) ;; \
++ *.zip) $(UNZIP_BIN) -q $(LANGTOOLS_SRC_ZIP) ;; \
+ *.tar.*) $(TAR) xf $(LANGTOOLS_SRC_ZIP) ;; \
+ esac; \
+ mv langtools-$(LANGTOOLS_CHANGESET) openjdk/langtools ; \
+@@ -1150,7 +1150,7 @@
+ if test -e ${HOTSPOT_SRC_ZIP} ; \
+ then \
+ case "$(HOTSPOT_SRC_ZIP)" in \
+- *.zip) $(UNZIP) -q $(HOTSPOT_SRC_ZIP) ;; \
++ *.zip) $(UNZIP_BIN) -q $(HOTSPOT_SRC_ZIP) ;; \
+ *.tar.*) $(TAR) xf $(HOTSPOT_SRC_ZIP) ;; \
+ esac; \
+ if test "x${HSBUILD}" != "xdefault"; then \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -404,7 +404,7 @@
+ SYSTEM_JDK_DIR = @SYSTEM_JDK_DIR@
+ TAR = @TAR@
+ TZDATA_DIR = @TZDATA_DIR@
+-UNZIP = @UNZIP@
++UNZIP_BIN = @UNZIP_BIN@
+ USING_ECJ = @USING_ECJ@
+ VERSION = @VERSION@
+ VERSION_SUFFIX = @VERSION_SUFFIX@
+@@ -1581,7 +1581,7 @@
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ if ! test -d openjdk ; then \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ case "$(OPENJDK_SRC_ZIP)" in \
+-@OPENJDK_SRC_DIR_FOUND_FALSE@ *.zip) $(UNZIP) -q $(OPENJDK_SRC_ZIP) ;; \
++@OPENJDK_SRC_DIR_FOUND_FALSE@ *.zip) $(UNZIP_BIN) -q $(OPENJDK_SRC_ZIP) ;; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ *.tar.*) $(TAR) xf $(OPENJDK_SRC_ZIP) ;; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ esac; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ mv `echo $(ICEDTEA_PREFIX)|sed 's#\.#-#'`-$(OPENJDK_CHANGESET) openjdk ; \
+@@ -1597,7 +1597,7 @@
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ if ! test -d openjdk/corba ; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ then \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ case "$(CORBA_SRC_ZIP)" in \
+-@OPENJDK_SRC_DIR_FOUND_FALSE@ *.zip) $(UNZIP) -q $(CORBA_SRC_ZIP) ;; \
++@OPENJDK_SRC_DIR_FOUND_FALSE@ *.zip) $(UNZIP_BIN) -q $(CORBA_SRC_ZIP) ;; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ *.tar.*) $(TAR) xf $(CORBA_SRC_ZIP) ;; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ esac; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ mv corba-$(CORBA_CHANGESET) openjdk/corba ; \
+@@ -1611,7 +1611,7 @@
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ if ! test -d openjdk/jaxp ; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ then \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ case "$(JAXP_SRC_ZIP)" in \
+-@OPENJDK_SRC_DIR_FOUND_FALSE@ *.zip) $(UNZIP) -q $(JAXP_SRC_ZIP) ;; \
++@OPENJDK_SRC_DIR_FOUND_FALSE@ *.zip) $(UNZIP_BIN) -q $(JAXP_SRC_ZIP) ;; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ *.tar.*) $(TAR) xf $(JAXP_SRC_ZIP) ;; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ esac; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ mv jaxp-$(JAXP_CHANGESET) openjdk/jaxp ; \
+@@ -1625,7 +1625,7 @@
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ if ! test -d openjdk/jaxws ; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ then \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ case "$(JAXWS_SRC_ZIP)" in \
+-@OPENJDK_SRC_DIR_FOUND_FALSE@ *.zip) $(UNZIP) -q $(JAXWS_SRC_ZIP) ;; \
++@OPENJDK_SRC_DIR_FOUND_FALSE@ *.zip) $(UNZIP_BIN) -q $(JAXWS_SRC_ZIP) ;; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ *.tar.*) $(TAR) xf $(JAXWS_SRC_ZIP) ;; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ esac; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ mv jaxws-$(JAXWS_CHANGESET) openjdk/jaxws ; \
+@@ -1639,7 +1639,7 @@
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ if ! test -d openjdk/jdk ; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ then \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ case "$(JDK_SRC_ZIP)" in \
+-@OPENJDK_SRC_DIR_FOUND_FALSE@ *.zip) $(UNZIP) -q $(JDK_SRC_ZIP) ;; \
++@OPENJDK_SRC_DIR_FOUND_FALSE@ *.zip) $(UNZIP_BIN) -q $(JDK_SRC_ZIP) ;; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ *.tar.*) $(TAR) xf $(JDK_SRC_ZIP) ;; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ esac; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ mv jdk-$(JDK_CHANGESET) openjdk/jdk ; \
+@@ -1653,7 +1653,7 @@
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ if ! test -d openjdk/langtools ; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ then \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ case "$(LANGTOOLS_SRC_ZIP)" in \
+-@OPENJDK_SRC_DIR_FOUND_FALSE@ *.zip) $(UNZIP) -q $(LANGTOOLS_SRC_ZIP) ;; \
++@OPENJDK_SRC_DIR_FOUND_FALSE@ *.zip) $(UNZIP_BIN) -q $(LANGTOOLS_SRC_ZIP) ;; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ *.tar.*) $(TAR) xf $(LANGTOOLS_SRC_ZIP) ;; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ esac; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@ mv langtools-$(LANGTOOLS_CHANGESET) openjdk/langtools ; \
+@@ -1674,7 +1674,7 @@
+ if test -e ${HOTSPOT_SRC_ZIP} ; \
+ then \
+ case "$(HOTSPOT_SRC_ZIP)" in \
+- *.zip) $(UNZIP) -q $(HOTSPOT_SRC_ZIP) ;; \
++ *.zip) $(UNZIP_BIN) -q $(HOTSPOT_SRC_ZIP) ;; \
+ *.tar.*) $(TAR) xf $(HOTSPOT_SRC_ZIP) ;; \
+ esac; \
+ if test "x${HSBUILD}" != "xdefault"; then \
+--- a/configure.ac
++++ b/configure.ac
+@@ -28,7 +28,7 @@
+ IT_FIND_TOOL([SHA256SUM], [sha256sum])
+ IT_FIND_TOOL([WGET], [wget])
+ IT_FIND_TOOL([ZIP], [zip])
+-IT_FIND_TOOL([UNZIP], [unzip])
++IT_FIND_TOOL([UNZIP_BIN], [unzip])
+ IT_FIND_TOOL([CPIO], [cpio])
+ IT_FIND_TOOL([FILE], [file])
+ AC_CHECK_TOOLS([FASTJAR], [fastjar jar])
diff --git a/recipes-core/icedtea/openjdk-7-release-03b147.inc b/recipes-core/icedtea/openjdk-7-release-03b147.inc
index 83b087c..fdf3a89 100644
--- a/recipes-core/icedtea/openjdk-7-release-03b147.inc
+++ b/recipes-core/icedtea/openjdk-7-release-03b147.inc
@@ -71,6 +71,7 @@ ICEDTEA_PATCHES = " \
file://build-hacks-native.patch \
file://icedtea-sane-x86-arch-name.patch \
file://fix-checksums.patch \
+ file://icedtea-makefile-unzip.patch \
"
OPENJDK_PATCHES = " \
@@ -87,6 +88,7 @@ OPENJDK_PATCHES = " \
file://icedtea-hotspot-fix-undefined-behaviour.patch;apply=no \
file://icedtea-x11_extension_cleanup.patch;apply=no \
file://icedtea-CVE-2014-1876-unpack.patch;apply=no \
+ file://icedtea-jdk-unzip.patch;apply=no \
"
OPENJDK_HEADLESS_PATCHES = " \
@@ -108,5 +110,6 @@ export DISTRIBUTION_PATCHES = " \
patches/icedtea-hotspot-fix-undefined-behaviour.patch \
patches/icedtea-x11_extension_cleanup.patch \
patches/icedtea-CVE-2014-1876-unpack.patch \
+ patches/icedtea-jdk-unzip.patch \
${CLEAN_X11_DISTRIBUTION_PATCH} \
"
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc
index a928103..718fc1a 100644
--- a/recipes-core/openjdk/openjdk-7-common.inc
+++ b/recipes-core/openjdk/openjdk-7-common.inc
@@ -109,6 +109,7 @@ EXTRA_OECONF = " \
\
--with-pkgversion=${PV} \
--with-cc-for-build=${BUILD_CC} \
+ ac_cv_path_UNZIP_BIN="${STAGING_BINDIR_NATIVE}/unzip" \
"
# PCSC default value was changed to true and SCTP was added during the 2.6.0
@@ -149,6 +150,7 @@ EXTRA_OEMAKE += ' \
CROSS_COMPILE_ARCH="${JDK_ARCH}" \
REQUIRED_ALSA_VERSION="" \
DISABLE_HOTSPOT_OS_VERSION_CHECK=ok \
+ UNZIP_BIN="${STAGING_BINDIR_NATIVE}/unzip" \
'
# Provides the target architecture to the configure script.
diff --git a/recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb b/recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb
index 854d179..1431301 100644
--- a/recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb
+++ b/recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb
@@ -47,6 +47,7 @@ SRC_URI[hotspot.sha256sum] = "39bc54bf343e1dce404b8c95285c0457a8d0a7c7aedfb55055
OEPATCHES = "\
file://build-hacks.patch \
file://fix_hotspot_crosscompile.patch \
+ file://icedtea-makefile-unzip.patch \
"
ICEDTEAPATCHES = "\
@@ -55,6 +56,7 @@ ICEDTEAPATCHES = "\
file://icedtea-jdk-rmi-crosscompile.patch;apply=no \
file://icedtea-crosscompile-fix.patch;apply=no \
file://icedtea-xawt-crosscompile-fix.patch;apply=no \
+ file://icedtea-jdk-unzip.patch;apply=no \
"
DISTRIBUTION_PATCHES = "\
@@ -63,6 +65,7 @@ DISTRIBUTION_PATCHES = "\
patches/icedtea-jdk-rmi-crosscompile.patch \
patches/icedtea-crosscompile-fix.patch \
patches/icedtea-xawt-crosscompile-fix.patch \
+ patches/icedtea-jdk-unzip.patch \
"
export DISTRIBUTION_PATCHES
diff --git a/recipes-core/openjdk/patches-openjdk-7/icedtea-jdk-unzip.patch b/recipes-core/openjdk/patches-openjdk-7/icedtea-jdk-unzip.patch
new file mode 100644
index 0000000..8c29730
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-7/icedtea-jdk-unzip.patch
@@ -0,0 +1,130 @@
+Use UNZIP_BIN instead of UNZIP.
+
+Fails with an error message /usr/bin/unzip not found.
+Additionally, icedtea7 enables you to specify an unzip to use by setting
+the variable UNZIP, this results in an error because unzip uses UNZIP
+to specify options, hence you'll end up with unzip trying to unzip unzip.
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Amy Fong <amy.fong@windriver.com>
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ openjdk/corba/make/common/shared/Defs-utils.gmk | 6 +++---
+ openjdk/jdk/make/common/Demo.gmk | 2 +-
+ openjdk/jdk/make/common/Release.gmk | 2 +-
+ openjdk/jdk/make/common/internal/ImportComponents.gmk | 4 ++--
+ openjdk/jdk/make/common/shared/Defs-utils.gmk | 6 +++---
+ openjdk/jdk/make/common/shared/Sanity.gmk | 2 +-
+ openjdk/jdk/make/java/redist/Makefile | 4 ++--
+ 7 files changed, 13 insertions(+), 13 deletions(-)
+
+--- openjdk/corba/make/common/shared/Defs-utils.gmk
++++ openjdk/corba/make/common/shared/Defs-utils.gmk
+@@ -129,7 +129,7 @@
+ TRUE = $(UTILS_COMMAND_PATH)true
+ UNAME = $(UTILS_COMMAND_PATH)uname
+ UNIQ = $(UTILS_USR_BIN_PATH)uniq
+-UNZIP = $(UTILS_USR_BIN_PATH)unzip
++# UNZIP = $(UTILS_USR_BIN_PATH)unzip
+ UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx
+ WC = $(UTILS_USR_BIN_PATH)wc
+ WHICH = $(UTILS_USR_BIN_PATH)which
+@@ -146,10 +146,10 @@
+ # Intrinsic unix command, with backslash-escaped character interpretation
+ ECHO = $(UNIXCOMMAND_PATH)echo -e
+ ZIPEXE = $(UNIXCOMMAND_PATH)zip
+- UNZIP = $(UNIXCOMMAND_PATH)unzip
++ # UNZIP = $(UNIXCOMMAND_PATH)unzip
+ else
+ ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
+- UNZIP = $(UTILS_DEVTOOL_PATH)unzip
++ # UNZIP = $(UTILS_DEVTOOL_PATH)unzip
+ endif
+ # Re-define some utilities
+ LEX =# override GNU Make intrinsic: no lex on windows
+--- openjdk/jdk/make/common/Demo.gmk
++++ openjdk/jdk/make/common/Demo.gmk
+@@ -348,7 +348,7 @@
+ $(java-vm-cleanup) )
+ @( $(CD) $(DEMO_DESTDIR) && $(java-vm-cleanup) )
+ @$(ECHO) "Expanding source into demos area at $(DEMO_DESTDIR)"
+- ( $(CD) $(DEMO_DESTDIR) && $(UNZIP) -o src.zip && $(RM) src.zip )
++ ( $(CD) $(DEMO_DESTDIR) && $(UNZIP_BIN) -o src.zip && $(RM) src.zip )
+ endif
+
+ build: sources bundles
+--- openjdk/jdk/make/common/Release.gmk
++++ openjdk/jdk/make/common/Release.gmk
+@@ -909,7 +909,7 @@
+ initial-image-jdk-db: $(DB_ZIP_LIST)
+ $(MKDIR) -p $(JDK_IMAGE_DIR)/db
+ for d in $(DB_ZIP_LIST); do \
+- ($(CD) $(JDK_IMAGE_DIR)/db && $(UNZIP) -o $$d); \
++ ($(CD) $(JDK_IMAGE_DIR)/db && $(UNZIP_BIN) -o $$d); \
+ done
+ $(CP) $(ABS_DB_PATH)/README-JDK.html $(JDK_IMAGE_DIR)/db
+ $(RM) -rf $(DEMODIR)/db
+--- openjdk/jdk/make/common/internal/ImportComponents.gmk
++++ openjdk/jdk/make/common/internal/ImportComponents.gmk
+@@ -97,8 +97,8 @@
+ define Unzipper
+ ( \
+ $(MKDIR) -p $1; \
+- $(ECHO) "( $(CD) $1 && $(UNZIP) -o $2 )"; \
+- ( $(CD) $1 && $(UNZIP) -o $2 ) \
++ $(ECHO) "( $(CD) $1 && $(UNZIP_BIN) -o $2 )"; \
++ ( $(CD) $1 && $(UNZIP_BIN) -o $2 ) \
+ )
+ endef
+
+--- openjdk/jdk/make/common/shared/Defs-utils.gmk
++++ openjdk/jdk/make/common/shared/Defs-utils.gmk
+@@ -145,7 +145,7 @@
+ TRUE = $(UTILS_COMMAND_PATH)true
+ UNAME = $(UTILS_COMMAND_PATH)uname
+ UNIQ = $(UTILS_USR_BIN_PATH)uniq
+-UNZIP = $(UTILS_USR_BIN_PATH)unzip
++# UNZIP = $(UTILS_USR_BIN_PATH)unzip
+ UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx
+ XARGS = $(UTILS_USR_BIN_PATH)xargs
+ WC = $(UTILS_USR_BIN_PATH)wc
+@@ -163,12 +163,12 @@
+ # Intrinsic unix command, with backslash-escaped character interpretation
+ ECHO = $(UNIXCOMMAND_PATH)echo -e
+ ZIPEXE = $(UNIXCOMMAND_PATH)zip
+- UNZIP = $(UNIXCOMMAND_PATH)unzip
++ # UNZIP = $(UNIXCOMMAND_PATH)unzip
+ # Some CYGWIN nawk versions require BINMODE=w for proper '\r' interpretation
+ NAWK = $(UNIXCOMMAND_PATH)awk -v BINMODE=w
+ else
+ ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
+- UNZIP = $(UTILS_DEVTOOL_PATH)unzip
++ # UNZIP = $(UTILS_DEVTOOL_PATH)unzip
+ NAWK = $(UNIXCOMMAND_PATH)awk
+ endif
+ # Re-define some utilities
+--- openjdk/jdk/make/common/shared/Sanity.gmk
++++ openjdk/jdk/make/common/shared/Sanity.gmk
+@@ -151,7 +151,7 @@
+ # Get the version numbers of what we are using
+ _MAKE_VER :=$(shell $(MAKE) --version 2>&1 | $(HEAD) -n 1)
+ _ZIP_VER :=$(shell $(ZIPEXE) -help 2>&1 | $(HEAD) -n 4 | $(EGREP) '^Zip')
+-_UNZIP_VER :=$(shell $(UNZIP) -help 2>&1 | $(HEAD) -n 4 | $(EGREP) '^UnZip')
++_UNZIP_VER :=$(shell $(UNZIP_BIN) -help 2>&1 | $(HEAD) -n 4 | $(EGREP) '^UnZip')
+ _BOOT_VER :=$(shell $(BOOTDIR)/bin/java -version 2>&1 | $(HEAD) -n 1)
+ MAKE_VER :=$(call GetVersion,"$(_MAKE_VER)")
+ ZIP_VER :=$(call GetVersion,"$(_ZIP_VER)")
+--- openjdk/jdk/make/java/redist/Makefile
++++ openjdk/jdk/make/java/redist/Makefile
+@@ -482,8 +482,8 @@
+ define SecUnzipper
+ if [ -f $2 ] ; then \
+ $(MKDIR) -p $1; \
+- $(ECHO) "( $(CD) $1 && $(UNZIP) -o $2 )"; \
+- ( $(CD) $1 && $(UNZIP) -o $2 ); \
++ $(ECHO) "( $(CD) $1 && $(UNZIP_BIN) -o $2 )"; \
++ ( $(CD) $1 && $(UNZIP_BIN) -o $2 ); \
+ fi
+ endef
+
diff --git a/recipes-core/openjdk/patches-openjdk-7/icedtea-makefile-unzip.patch b/recipes-core/openjdk/patches-openjdk-7/icedtea-makefile-unzip.patch
new file mode 100644
index 0000000..be29bc0
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-7/icedtea-makefile-unzip.patch
@@ -0,0 +1,176 @@
+Use UNZIP_BIN instead of UNZIP.
+
+Fails with an error message /usr/bin/unzip not found.
+Additionally, icedtea7 enables you to specify an unzip to use by setting
+the variable UNZIP, this results in an error because unzip uses UNZIP
+to specify options, hence you'll end up with unzip trying to unzip unzip.
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Amy Fong <amy.fong@windriver.com>
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ Makefile.am | 14 +++++++-------
+ Makefile.in | 16 ++++++++--------
+ configure.ac | 2 +-
+ 3 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index ebb79cd..c109c7a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1369,7 +1369,7 @@ else
+ if ! test -d openjdk ; then \
+ if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \
+ case "$(OPENJDK_SRC_ZIP)" in \
+- *.zip) $(UNZIP) -q $(OPENJDK_SRC_ZIP) ;; \
++ *.zip) $(UNZIP_BIN) -q $(OPENJDK_SRC_ZIP) ;; \
+ *.tar.*) $(TAR) xf $(OPENJDK_SRC_ZIP) ;; \
+ esac; \
+ mv `echo $(ICEDTEA_PREFIX)|$(SED) 's#\.#-#'`-$(OPENJDK_CHANGESET) openjdk ; \
+@@ -1403,7 +1403,7 @@ else
+ if ! test -d openjdk/corba ; \
+ then \
+ case "$(CORBA_SRC_ZIP)" in \
+- *.zip) $(UNZIP) -q $(CORBA_SRC_ZIP) ;; \
++ *.zip) $(UNZIP_BIN) -q $(CORBA_SRC_ZIP) ;; \
+ *.tar.*) $(TAR) xf $(CORBA_SRC_ZIP) ;; \
+ esac; \
+ mv corba-$(CORBA_CHANGESET) openjdk/corba ; \
+@@ -1431,7 +1431,7 @@ else
+ if ! test -d openjdk/jaxp ; \
+ then \
+ case "$(JAXP_SRC_ZIP)" in \
+- *.zip) $(UNZIP) -q $(JAXP_SRC_ZIP) ;; \
++ *.zip) $(UNZIP_BIN) -q $(JAXP_SRC_ZIP) ;; \
+ *.tar.*) $(TAR) xf $(JAXP_SRC_ZIP) ;; \
+ esac; \
+ mv jaxp-$(JAXP_CHANGESET) openjdk/jaxp ; \
+@@ -1459,7 +1459,7 @@ else
+ if ! test -d openjdk/jaxws ; \
+ then \
+ case "$(JAXWS_SRC_ZIP)" in \
+- *.zip) $(UNZIP) -q $(JAXWS_SRC_ZIP) ;; \
++ *.zip) $(UNZIP_BIN) -q $(JAXWS_SRC_ZIP) ;; \
+ *.tar.*) $(TAR) xf $(JAXWS_SRC_ZIP) ;; \
+ esac; \
+ mv jaxws-$(JAXWS_CHANGESET) openjdk/jaxws ; \
+@@ -1487,7 +1487,7 @@ else
+ if ! test -d openjdk/jdk ; \
+ then \
+ case "$(JDK_SRC_ZIP)" in \
+- *.zip) $(UNZIP) -q $(JDK_SRC_ZIP) ;; \
++ *.zip) $(UNZIP_BIN) -q $(JDK_SRC_ZIP) ;; \
+ *.tar.*) $(TAR) xf $(JDK_SRC_ZIP) ;; \
+ esac; \
+ mv jdk-$(JDK_CHANGESET) openjdk/jdk ; \
+@@ -1515,7 +1515,7 @@ else
+ if ! test -d openjdk/langtools ; \
+ then \
+ case "$(LANGTOOLS_SRC_ZIP)" in \
+- *.zip) $(UNZIP) -q $(LANGTOOLS_SRC_ZIP) ;; \
++ *.zip) $(UNZIP_BIN) -q $(LANGTOOLS_SRC_ZIP) ;; \
+ *.tar.*) $(TAR) xf $(LANGTOOLS_SRC_ZIP) ;; \
+ esac; \
+ mv langtools-$(LANGTOOLS_CHANGESET) openjdk/langtools ; \
+@@ -1541,7 +1541,7 @@ else
+ if test -e ${HOTSPOT_SRC_ZIP} ; \
+ then \
+ case "$(HOTSPOT_SRC_ZIP)" in \
+- *.zip) $(UNZIP) -q $(HOTSPOT_SRC_ZIP) ;; \
++ *.zip) $(UNZIP_BIN) -q $(HOTSPOT_SRC_ZIP) ;; \
+ *.tar.*) $(TAR) xf $(HOTSPOT_SRC_ZIP) ;; \
+ esac; \
+ if test "x${HSBUILD}" != "xdefault"; then \
+diff --git a/Makefile.in b/Makefile.in
+index f890991..fd09bda 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -495,7 +495,7 @@ SYSTEM_JDK_DIR = @SYSTEM_JDK_DIR@
+ TAR = @TAR@
+ TOOLS_JAR = @TOOLS_JAR@
+ TZDATA_DIR = @TZDATA_DIR@
+-UNZIP = @UNZIP@
++UNZIP_BIN = @UNZIP@
+ USING_CACAO = @USING_CACAO@
+ USING_ECJ = @USING_ECJ@
+ VERSION = @VERSION@
+@@ -1845,7 +1845,7 @@ stamps/extract-openjdk.stamp: stamps/download-openjdk.stamp
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ if ! test -d openjdk ; then \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ case "$(OPENJDK_SRC_ZIP)" in \
+-@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP) -q $(OPENJDK_SRC_ZIP) ;; \
++@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP_BIN) -q $(OPENJDK_SRC_ZIP) ;; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.tar.*) $(TAR) xf $(OPENJDK_SRC_ZIP) ;; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ esac; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ mv `echo $(ICEDTEA_PREFIX)|$(SED) 's#\.#-#'`-$(OPENJDK_CHANGESET) openjdk ; \
+@@ -1873,7 +1873,7 @@ stamps/extract-corba.stamp: stamps/extract-openjdk.stamp stamps/download-corba.s
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ if ! test -d openjdk/corba ; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ then \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ case "$(CORBA_SRC_ZIP)" in \
+-@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP) -q $(CORBA_SRC_ZIP) ;; \
++@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP_BIN) -q $(CORBA_SRC_ZIP) ;; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.tar.*) $(TAR) xf $(CORBA_SRC_ZIP) ;; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ esac; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ mv corba-$(CORBA_CHANGESET) openjdk/corba ; \
+@@ -1895,7 +1895,7 @@ stamps/extract-jaxp.stamp: stamps/extract-openjdk.stamp stamps/download-jaxp.sta
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ if ! test -d openjdk/jaxp ; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ then \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ case "$(JAXP_SRC_ZIP)" in \
+-@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP) -q $(JAXP_SRC_ZIP) ;; \
++@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP_BIN) -q $(JAXP_SRC_ZIP) ;; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.tar.*) $(TAR) xf $(JAXP_SRC_ZIP) ;; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ esac; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ mv jaxp-$(JAXP_CHANGESET) openjdk/jaxp ; \
+@@ -1917,7 +1917,7 @@ stamps/extract-jaxws.stamp: stamps/extract-openjdk.stamp stamps/download-jaxws.s
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ if ! test -d openjdk/jaxws ; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ then \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ case "$(JAXWS_SRC_ZIP)" in \
+-@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP) -q $(JAXWS_SRC_ZIP) ;; \
++@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP_BIN) -q $(JAXWS_SRC_ZIP) ;; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.tar.*) $(TAR) xf $(JAXWS_SRC_ZIP) ;; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ esac; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ mv jaxws-$(JAXWS_CHANGESET) openjdk/jaxws ; \
+@@ -1939,7 +1939,7 @@ stamps/extract-jdk.stamp: stamps/extract-openjdk.stamp stamps/download-jdk.stamp
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ if ! test -d openjdk/jdk ; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ then \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ case "$(JDK_SRC_ZIP)" in \
+-@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP) -q $(JDK_SRC_ZIP) ;; \
++@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP_BIN) -q $(JDK_SRC_ZIP) ;; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.tar.*) $(TAR) xf $(JDK_SRC_ZIP) ;; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ esac; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ mv jdk-$(JDK_CHANGESET) openjdk/jdk ; \
+@@ -1961,7 +1961,7 @@ stamps/extract-langtools.stamp: stamps/extract-openjdk.stamp stamps/download-lan
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ if ! test -d openjdk/langtools ; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ then \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ case "$(LANGTOOLS_SRC_ZIP)" in \
+-@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP) -q $(LANGTOOLS_SRC_ZIP) ;; \
++@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP_BIN) -q $(LANGTOOLS_SRC_ZIP) ;; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.tar.*) $(TAR) xf $(LANGTOOLS_SRC_ZIP) ;; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ esac; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ mv langtools-$(LANGTOOLS_CHANGESET) openjdk/langtools ; \
+@@ -1981,7 +1981,7 @@ stamps/extract-hotspot.stamp: stamps/extract-openjdk.stamp stamps/download-hotsp
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ if test -e ${HOTSPOT_SRC_ZIP} ; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ then \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ case "$(HOTSPOT_SRC_ZIP)" in \
+-@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP) -q $(HOTSPOT_SRC_ZIP) ;; \
++@OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.zip) $(UNZIP_BIN) -q $(HOTSPOT_SRC_ZIP) ;; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ *.tar.*) $(TAR) xf $(HOTSPOT_SRC_ZIP) ;; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ esac; \
+ @OPENJDK_SRC_DIR_FOUND_FALSE@@USE_HG_FALSE@ if test "x${HSBUILD}" != "xdefault"; then \
+diff --git a/configure.ac b/configure.ac
+index 5291130..8fbccad 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,7 +34,7 @@ IT_FIND_TOOL([CHMOD], [chmod])
+ IT_FIND_TOOLS([SHA256SUM], [gsha256sum sha256sum])
+ IT_FIND_TOOL([WGET], [wget])
+ IT_FIND_TOOL([ZIP], [zip])
+-IT_FIND_TOOL([UNZIP], [unzip])
++IT_FIND_TOOL([UNZIP_BIN], [unzip])
+ IT_FIND_TOOL([CPIO], [cpio])
+ IT_FIND_TOOL([FILE], [file])
+ IT_FIND_TOOL([READLINK], [readlink])
+--
+2.3.5
+
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [meta-java][PATCH 15/15] openjdk hotspot build system std.h fix
2015-12-25 7:56 [meta-java][PATCH 00/15] meta-java: fixes for some issues jackie.huang
` (13 preceding siblings ...)
2015-12-25 7:56 ` [meta-java][PATCH 14/15] icedtea7-native/openjdk-7: fails on hosts with no unzip jackie.huang
@ 2015-12-25 7:56 ` jackie.huang
2015-12-28 14:10 ` [meta-java][PATCH 00/15] meta-java: fixes for some issues Koen Kooi
15 siblings, 0 replies; 18+ messages in thread
From: jackie.huang @ 2015-12-25 7:56 UTC (permalink / raw)
To: openembedded-devel
From: Amy Fong <amy.fong@windriver.com>
Backport from upstream from jdk9
Hotspot build system looking for sdt.h in the wrong place
Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb | 2 ++
.../patches-openjdk-7/icedtea-dtrace-std_h.patch | 40 ++++++++++++++++++++++
2 files changed, 42 insertions(+)
create mode 100644 recipes-core/openjdk/patches-openjdk-7/icedtea-dtrace-std_h.patch
diff --git a/recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb b/recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb
index 1431301..047aac4 100644
--- a/recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb
+++ b/recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb
@@ -57,6 +57,7 @@ ICEDTEAPATCHES = "\
file://icedtea-crosscompile-fix.patch;apply=no \
file://icedtea-xawt-crosscompile-fix.patch;apply=no \
file://icedtea-jdk-unzip.patch;apply=no \
+ file://icedtea-dtrace-std_h.patch;apply=no \
"
DISTRIBUTION_PATCHES = "\
@@ -66,6 +67,7 @@ DISTRIBUTION_PATCHES = "\
patches/icedtea-crosscompile-fix.patch \
patches/icedtea-xawt-crosscompile-fix.patch \
patches/icedtea-jdk-unzip.patch \
+ patches/icedtea-dtrace-std_h.patch \
"
export DISTRIBUTION_PATCHES
diff --git a/recipes-core/openjdk/patches-openjdk-7/icedtea-dtrace-std_h.patch b/recipes-core/openjdk/patches-openjdk-7/icedtea-dtrace-std_h.patch
new file mode 100644
index 0000000..9ec59b7
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-7/icedtea-dtrace-std_h.patch
@@ -0,0 +1,40 @@
+openjdk hotspot build system std.h fix
+
+Backport from upstream from jdk9
+
+ OpenJDK / jdk9 / hs-rt / hotspot
+
+ changeset 6671:465eb6bc50d1
+
+ 8046818: Hotspot build system looking for sdt.h in the wrong place
+ Reviewed-by: sla, dholmes
+ author mikael
+ date Thu, 03 Jul 2014 09:16:56 -0700 (14 months ago)
+ parents 35de71d2af77
+ children da4514678bcf
+ files make/linux/makefiles/dtrace.make
+ diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
+
+Upstream-Status: Backport
+---
+ openjdk/hotspot/make/linux/makefiles/dtrace.make | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+--- openjdk/hotspot/make/linux/makefiles/dtrace.make
++++ openjdk/hotspot/make/linux/makefiles/dtrace.make
+@@ -40,7 +40,14 @@
+ ifneq ($(ALT_SDT_H),)
+ SDT_H_FILE = $(ALT_SDT_H)
+ else
+- SDT_H_FILE = /usr/include/sys/sdt.h
++ ifeq ($(USE_CLANG), true)
++ # Clang doesn't support the -print-sysroot option and there is no known equivalent
++ # option, so fall back to using / as sysroot
++ SDT_SYSROOT=
++ else
++ SDT_SYSROOT=$(shell $(CXX) -print-sysroot)
++ endif
++ SDT_H_FILE = $(SDT_SYSROOT)/usr/include/sys/sdt.h
+ endif
+ DTRACE_ENABLED = $(shell test -f $(SDT_H_FILE) && echo $(SDT_H_FILE))
+ REASON = "$(SDT_H_FILE) not found"
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [meta-java][PATCH 00/15] meta-java: fixes for some issues
2015-12-25 7:56 [meta-java][PATCH 00/15] meta-java: fixes for some issues jackie.huang
` (14 preceding siblings ...)
2015-12-25 7:56 ` [meta-java][PATCH 15/15] openjdk hotspot build system std.h fix jackie.huang
@ 2015-12-28 14:10 ` Koen Kooi
2015-12-29 8:52 ` Koen Kooi
15 siblings, 1 reply; 18+ messages in thread
From: Koen Kooi @ 2015-12-28 14:10 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 25-12-15 om 08:56 schreef jackie.huang@windriver.com:
> From: Jackie Huang <jackie.huang@windriver.com>
>
> These patches had been in our local branch for some times, I think they
> are needed here as well, I rebased and did basic build/runtime tests on
> x86-64 and ppc, please review and see if they are fine to be merged.
After merging this I'm finally able to build openjdk-7 for core2-64 again.
>
> -- The following changes since commit
> c88d019434b5ba0eb7ee1a3b0e27a74587ad9d49:
>
> openjdk-8-native: fix improper do_install and PROVIDES (2015-12-22
> 23:48:09 -0800)
>
> are available in the git repository at:
>
> git://git.pokylinux.org/poky-contrib.git jhuang0/d_java-fixes_151225_0
> http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/d_java-fixes_151225_0
>
> Amy Fong (15): java.bbclass: java missing classes during compile inetlib:
> fix inetlib dependency during compilation openjdk: autools not to
> override B var jamvm.inc: jamvm recipe cleanup base-files: Define
> JAVA_HOME by default Missing inheritance and dependencies in some java
> packages openjdk-7: added java tools to the jdk package openjdk: add
> keytool link openjdk: postinst cleanup icedtea7-native compile failure
> undefined reference to `main' openjdk: fix CVE-2014-1876 jamvm-git uprev
> to 2.0.0 openjdk-7: add depends on attr icedtea7-native/openjdk-7: fails
> on hosts with no unzip openjdk hotspot build system std.h fix
>
> classes/java.bbclass | 9 +-
> recipes-core/base-files/base-files_3.0.14.bbappend | 13 ++
> recipes-core/classpath/classpath-native_0.99.bb | 2 +-
> ...etlib-missing-dependency-for-util_classes.patch | 31 ++++
> recipes-core/classpathx/inetlib_1.1.1.bb | 1 +
> recipes-core/icedtea/icedtea7-native.inc | 4 +-
> .../icedtea-CVE-2014-1876-unpack.patch | 44 ++++++
> .../openjdk-7-03b147/icedtea-jdk-unzip.patch | 130 +++++++++++++++
> .../openjdk-7-03b147/icedtea-makefile-unzip.patch | 167
> +++++++++++++++++++ .../icedtea-x11_extension_cleanup.patch |
> 42 +++++ recipes-core/icedtea/openjdk-7-release-03b147.inc | 7 +
> recipes-core/jamvm/jamvm.inc | 7 +-
> recipes-core/jamvm/jamvm_git.bb | 4 +-
> recipes-core/openjdk/openjdk-7-common.inc | 4 +
> recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb | 5 +
> recipes-core/openjdk/openjdk-common.inc | 3 +-
> recipes-core/openjdk/openjdk-postinst.inc | 24 ++-
> .../patches-openjdk-7/icedtea-dtrace-std_h.patch | 40 +++++
> .../patches-openjdk-7/icedtea-jdk-unzip.patch | 130 +++++++++++++++
> .../patches-openjdk-7/icedtea-makefile-unzip.patch | 176
> +++++++++++++++++++++ 20 files changed, 825 insertions(+), 18
> deletions(-) create mode 100644
> recipes-core/base-files/base-files_3.0.14.bbappend create mode 100644
> recipes-core/classpathx/inetlib-1.1.1/inetlib-missing-dependency-for-util_cl
asses.patch
>
>
create mode 100644
recipes-core/icedtea/openjdk-7-03b147/icedtea-CVE-2014-1876-unpack.patch
> create mode 100644
> recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-unzip.patch create mode
> 100644
> recipes-core/icedtea/openjdk-7-03b147/icedtea-makefile-unzip.patch create
> mode 100644
> recipes-core/icedtea/openjdk-7-03b147/icedtea-x11_extension_cleanup.patch
>
>
create mode 100644
recipes-core/openjdk/patches-openjdk-7/icedtea-dtrace-std_h.patch
> create mode 100644
> recipes-core/openjdk/patches-openjdk-7/icedtea-jdk-unzip.patch create
> mode 100644
> recipes-core/openjdk/patches-openjdk-7/icedtea-makefile-unzip.patch
>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFWgULaMkyGM64RGpERAs9PAJ980xVJJy/j0+HGvGX2kXMD4AoD8wCgme5T
PeA+vxBktIysaOCHio6O/4M=
=wMKz
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [meta-java][PATCH 00/15] meta-java: fixes for some issues
2015-12-28 14:10 ` [meta-java][PATCH 00/15] meta-java: fixes for some issues Koen Kooi
@ 2015-12-29 8:52 ` Koen Kooi
0 siblings, 0 replies; 18+ messages in thread
From: Koen Kooi @ 2015-12-29 8:52 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 28-12-15 om 15:10 schreef Koen Kooi:
> Op 25-12-15 om 08:56 schreef jackie.huang@windriver.com:
>> From: Jackie Huang <jackie.huang@windriver.com>
>
>> These patches had been in our local branch for some times, I think
>> they are needed here as well, I rebased and did basic build/runtime
>> tests on x86-64 and ppc, please review and see if they are fine to be
>> merged.
>
> After merging this I'm finally able to build openjdk-7 for core2-64
> again.
As well as armv6, armv6 and armv7
>
>
>
>> -- The following changes since commit
>> c88d019434b5ba0eb7ee1a3b0e27a74587ad9d49:
>
>> openjdk-8-native: fix improper do_install and PROVIDES (2015-12-22
>> 23:48:09 -0800)
>
>> are available in the git repository at:
>
>> git://git.pokylinux.org/poky-contrib.git jhuang0/d_java-fixes_151225_0
>>
>> http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/d_java-fixes_151225_0
>
>> Amy Fong (15): java.bbclass: java missing classes during compile
>> inetlib: fix inetlib dependency during compilation openjdk: autools not
>> to override B var jamvm.inc: jamvm recipe cleanup base-files: Define
>> JAVA_HOME by default Missing inheritance and dependencies in some java
>> packages openjdk-7: added java tools to the jdk package openjdk: add
>> keytool link openjdk: postinst cleanup icedtea7-native compile failure
>> undefined reference to `main' openjdk: fix CVE-2014-1876 jamvm-git
>> uprev to 2.0.0 openjdk-7: add depends on attr
>> icedtea7-native/openjdk-7: fails on hosts with no unzip openjdk hotspot
>> build system std.h fix
>
>> classes/java.bbclass | 9 +-
>> recipes-core/base-files/base-files_3.0.14.bbappend | 13 ++
>> recipes-core/classpath/classpath-native_0.99.bb | 2 +-
>> ...etlib-missing-dependency-for-util_classes.patch | 31 ++++
>> recipes-core/classpathx/inetlib_1.1.1.bb | 1 +
>> recipes-core/icedtea/icedtea7-native.inc | 4 +-
>> .../icedtea-CVE-2014-1876-unpack.patch | 44 ++++++
>> .../openjdk-7-03b147/icedtea-jdk-unzip.patch | 130
>> +++++++++++++++ .../openjdk-7-03b147/icedtea-makefile-unzip.patch |
>> 167 +++++++++++++++++++ .../icedtea-x11_extension_cleanup.patch
>> | 42 +++++ recipes-core/icedtea/openjdk-7-release-03b147.inc | 7 +
>> recipes-core/jamvm/jamvm.inc | 7 +-
>> recipes-core/jamvm/jamvm_git.bb | 4 +-
>> recipes-core/openjdk/openjdk-7-common.inc | 4 +
>> recipes-core/openjdk/openjdk-7_91b01-2.6.2.bb | 5 +
>> recipes-core/openjdk/openjdk-common.inc | 3 +-
>> recipes-core/openjdk/openjdk-postinst.inc | 24 ++-
>> .../patches-openjdk-7/icedtea-dtrace-std_h.patch | 40 +++++
>> .../patches-openjdk-7/icedtea-jdk-unzip.patch | 130
>> +++++++++++++++ .../patches-openjdk-7/icedtea-makefile-unzip.patch |
>> 176 +++++++++++++++++++++ 20 files changed, 825 insertions(+), 18
>> deletions(-) create mode 100644
>> recipes-core/base-files/base-files_3.0.14.bbappend create mode 100644
>> recipes-core/classpathx/inetlib-1.1.1/inetlib-missing-dependency-for-util_c
l
>
>>
asses.patch
>
>
> create mode 100644
> recipes-core/icedtea/openjdk-7-03b147/icedtea-CVE-2014-1876-unpack.patch
>> create mode 100644
>> recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-unzip.patch create
>> mode 100644
>> recipes-core/icedtea/openjdk-7-03b147/icedtea-makefile-unzip.patch
>> create mode 100644
>> recipes-core/icedtea/openjdk-7-03b147/icedtea-x11_extension_cleanup.patch
>
>>
>
> create mode 100644
> recipes-core/openjdk/patches-openjdk-7/icedtea-dtrace-std_h.patch
>> create mode 100644
>> recipes-core/openjdk/patches-openjdk-7/icedtea-jdk-unzip.patch create
>> mode 100644
>> recipes-core/openjdk/patches-openjdk-7/icedtea-makefile-unzip.patch
>
>
>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFWgkniMkyGM64RGpERAtQIAKCVj4XvRea3TCUIW+pRrCMh6OZo7wCfVTww
a/7l1f/5g383Zb+aWPI6CvU=
=PuaP
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2015-12-29 8:53 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-25 7:56 [meta-java][PATCH 00/15] meta-java: fixes for some issues jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 01/15] java.bbclass: java missing classes during compile jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 02/15] inetlib: fix inetlib dependency during compilation jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 03/15] openjdk: autools not to override B var jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 04/15] jamvm.inc: jamvm recipe cleanup jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 05/15] base-files: Define JAVA_HOME by default jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 06/15] Missing inheritance and dependencies in some java packages jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 07/15] openjdk-7: added java tools to the jdk package jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 08/15] openjdk: add keytool link jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 09/15] openjdk: postinst cleanup jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 10/15] icedtea7-native compile failure undefined reference to `main' jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 11/15] openjdk: fix CVE-2014-1876 jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 12/15] jamvm-git uprev to 2.0.0 jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 13/15] openjdk-7: add depends on attr jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 14/15] icedtea7-native/openjdk-7: fails on hosts with no unzip jackie.huang
2015-12-25 7:56 ` [meta-java][PATCH 15/15] openjdk hotspot build system std.h fix jackie.huang
2015-12-28 14:10 ` [meta-java][PATCH 00/15] meta-java: fixes for some issues Koen Kooi
2015-12-29 8:52 ` Koen Kooi
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.