12 files changed, 222 insertions, 13 deletions

diff --git a/README b/README
index 4ed3b6e..9c1dcf3 100644
--- a/README
+++ b/README
@@ -14,7 +14,9 @@ PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
 PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
 
 For openjdk6:
-PREFERRED_VERSION_openjdk-6-jre = "6b24-1.11.8"
+PREFERRED_VERSION_openjdk-6-jre = "6b24-1.11.9"
+or
+PREFERRED_VERSION_openjdk-6-jre = "6b27-1.12.4"
 PREFERRED_VERSION_icedtea6-native = "1.8.11"
 
 For openjdk7:
diff --git a/recipes-core/images/java-test-image.bb b/recipes-core/images/java-test-image.bb
new file mode 100644
index 0000000..34d90f9
--- /dev/null
+++ b/recipes-core/images/java-test-image.bb
@@ -0,0 +1,13 @@
+LICENSE = "MIT"
+
+inherit core-image
+
+IMAGE_LINGUAS = " "
+
+
+IMAGE_INSTALL = "tinylogin busybox modutils-initscripts initscripts opkg udev sysvinit netbase base-files base-passwd busybox-hwclock \
+                 ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL} \
+                 openjdk-7-jre openjdk-7-vm-jamvm openjdk-7-vm-cacao \
+                 openjdk-6-jre openjdk-6-vm-zero openjdk-6-vm-jamvm openjdk-6-vm-cacao \
+                 strace dropbear binutils \
+"
diff --git a/recipes-core/openjdk/openjdk-6-6b27/build-hacks.patch b/recipes-core/openjdk/openjdk-6-6b27/build-hacks.patch
new file mode 100644
index 0000000..b1e679d
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-6-6b27/build-hacks.patch
@@ -0,0 +1,86 @@
+Index: icedtea6-1.12.4/Makefile.am
+===================================================================
+--- icedtea6-1.12.4.orig/Makefile.am    2013-03-04 22:31:44.256894152 +0100
++++ icedtea6-1.12.4/Makefile.am 2013-03-10 14:30:16.089527572 +0100
+@@ -656,6 +656,11 @@
+        JAVAC="" \
+        JAVA_HOME="" \
+        JDK_HOME="" \
++       OE_CFLAGS="$(OE_CFLAGS)" \
++       OE_CPPFLAGS="$(OE_CPPFLAGS)" \
++       OE_CXXFLAGS="$(OE_CXXFLAGS)" \
++       OE_LDFLAGS="$(OE_LDFLAGS)" \
++       OE_LAUNCHER_LDFLAGS="$(OE_LAUNCHER_LDFLAGS)" \
+        ANT_RESPECT_JAVA_HOME="TRUE" \
+        DISTRIBUTION_ID="$(DIST_ID)" \
+        DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \
+@@ -2249,10 +2254,14 @@
+ if BUILD_JAMVM
+        cd jamvm/jamvm && \
+        LDFLAGS="-Xlinker -z -Xlinker noexecstack" \
+-       ./autogen.sh --with-java-runtime-library=openjdk6 \
+-         --prefix=$(abs_top_builddir)/jamvm/install ; \
+-       $(MAKE) ; \
+-       $(MAKE) install
++       $(ARCH_PREFIX) ./autogen.sh --with-java-runtime-library=openjdk6 \
++               --prefix=$(abs_top_builddir)/jamvm/install \
++               --host=$(host_alias) \
++               --build=$(build_alias) \
++               --target=$(target_alias)  \
++               --with-libtool-sysroot ; \
++       $(ARCH_PREFIX) $(MAKE) ; \
++       $(ARCH_PREFIX) $(MAKE) install
+        mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
+        cp $(abs_top_builddir)/jamvm/install/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
+        ln -sf server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client
+@@ -2316,6 +2325,7 @@
+          --host=$(host_alias) \
+          --build=$(build_alias) \
+          --target=$(target_alias) \
++         --with-libtool-sysroot \
+          --prefix=$(abs_top_builddir)/cacao/install \
+          --with-java-runtime-library=openjdk \
+          --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
+@@ -2384,7 +2394,7 @@
+ # configure script arguments, quoted in single quotes
+ CONFIGURE_ARGS = @CONFIGURE_ARGS@
+ ADD_ZERO_CONFIGURE_ARGS = \
+-       --with-jdk-home=$(BUILD_OUTPUT_DIR)/j2sdk-image \
++       --with-jdk-home=$(abs_top_builddir)/bootstrap/jdk1.6.0 \
+        --enable-zero
+ if ADD_SHARK_BUILD
+ ADD_ZERO_CONFIGURE_ARGS += \
+Index: icedtea6-1.12.4/javac.in
+===================================================================
+--- icedtea6-1.12.4.orig/javac.in       2013-03-04 22:29:36.932613635 +0100
++++ icedtea6-1.12.4/javac.in    2013-03-10 14:20:35.244778409 +0100
+@@ -18,7 +18,7 @@
+ {
+     my @new_args = @{$_[0]};
+ 
+-    for my $opt (NO_DUP_ARGS) 
++    for my $opt (NO_DUP_ARGS)
+     {
+        my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
+        if (@indices > 1) {
+@@ -27,7 +27,7 @@
+        }
+     }
+ 
+-    for my $opt (STRIP_ARGS) 
++    for my $opt (STRIP_ARGS)
+     {
+        my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
+        splice @new_args, $_, 1 for @indices;
+@@ -69,7 +69,10 @@
+     my @CLASSPATH = ('@ECJ_JAR@');
+     push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
+     $ENV{"CLASSPATH"} = join ':', @CLASSPATH;
+-    exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args;
++
++    # Compiling hotspot-tools consumes tons of memory and exceeds any default
++    # limits for jamvm and cacao.
++    exec '@JAVA@', '-Xmx1024m', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args;
+ }
+ else
+ {
diff --git a/recipes-core/openjdk/openjdk-6-6b27/fix_hotspot_crosscompile.patch b/recipes-core/openjdk/openjdk-6-6b27/fix_hotspot_crosscompile.patch
new file mode 100644
index 0000000..9741ed0
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-6-6b27/fix_hotspot_crosscompile.patch
@@ -0,0 +1,51 @@
+Index: icedtea6-1.12.4/acinclude.m4
+===================================================================
+--- icedtea6-1.12.4.orig/acinclude.m4   2013-03-04 22:29:36.000000000 +0100
++++ icedtea6-1.12.4/acinclude.m4        2013-03-10 13:45:56.032412186 +0100
+@@ -938,6 +938,21 @@
+   AC_SUBST(ALT_CACAO_SRC_DIR)
+ ])
+ 
++AC_DEFUN([AC_CHECK_WITH_CC_FOR_BUILD],
++[
++  AC_MSG_CHECKING(for compiler used for subsidiary programs)
++  AC_ARG_WITH([cc-for-build],
++              [AS_HELP_STRING(--with-cc-for-build,specify the compiler for subsidiary (helper) programs)],
++  [
++    CC_FOR_BUILD="${withval}"
++  ],
++  [
++    CC_FOR_BUILD="\$(CC)"
++  ])
++  AC_MSG_RESULT(${CC_FOR_BUILD})
++  AC_SUBST(CC_FOR_BUILD)
++])
++
+ AC_DEFUN([IT_WITH_GCJ],
+ [
+   AC_MSG_CHECKING([whether to compile ecj natively])
+Index: icedtea6-1.12.4/Makefile.am
+===================================================================
+--- icedtea6-1.12.4.orig/Makefile.am    2013-03-10 13:44:55.000000000 +0100
++++ icedtea6-1.12.4/Makefile.am 2013-03-10 13:46:27.540523062 +0100
+@@ -656,6 +656,7 @@
+        JAVAC="" \
+        JAVA_HOME="" \
+        JDK_HOME="" \
++       CC_FOR_BUILD="$(CC_FOR_BUILD)" \
+        OE_CFLAGS="$(OE_CFLAGS)" \
+        OE_CPPFLAGS="$(OE_CPPFLAGS)" \
+        OE_CXXFLAGS="$(OE_CXXFLAGS)" \
+Index: icedtea6-1.12.4/configure.ac
+===================================================================
+--- icedtea6-1.12.4.orig/configure.ac   2013-03-04 22:38:51.000000000 +0100
++++ icedtea6-1.12.4/configure.ac        2013-03-10 13:45:56.032412186 +0100
+@@ -18,6 +18,8 @@
+ AC_PROG_CC
+ AC_PROG_CXX
+ 
++AC_CHECK_WITH_CC_FOR_BUILD
++
+ IT_FIND_TOOL([MAKE], [make])
+ IT_FIND_TOOL([GZIP], [gzip])
+ IT_FIND_TOOL([ANT], [ant])
diff --git a/recipes-core/openjdk/openjdk-6-6b27/remove_libxp.patch b/recipes-core/openjdk/openjdk-6-6b27/remove_libxp.patch
new file mode 100644
index 0000000..7161b75
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-6-6b27/remove_libxp.patch
@@ -0,0 +1,21 @@
+Index: icedtea6-1.12.4/configure.ac
+===================================================================
+--- icedtea6-1.12.4.orig/configure.ac   2013-03-10 14:04:34.072354787 +0100
++++ icedtea6-1.12.4/configure.ac        2013-03-10 14:07:48.201849004 +0100
+@@ -283,16 +283,6 @@
+ AC_SUBST(XT_CFLAGS)
+ AC_SUBST(XT_LIBS)
+ 
+-dnl Check for libXp headers and libraries.
+-PKG_CHECK_MODULES(XP, xp,[XP_FOUND=yes],[XP_FOUND=no])
+-if test "x${XP_FOUND}" = xno
+-then
+-  AC_MSG_ERROR([Could not find Xp - \
+-  Try installing libXp-devel.])
+-fi
+-AC_SUBST(XP_CFLAGS)
+-AC_SUBST(XP_LIBS)
+-
+ dnl Check for libX11 headers and libraries.
+ PKG_CHECK_MODULES(X11, x11,[X11_FOUND=yes],[X11_FOUND=no])
+ if test "x${X11_FOUND}" = xno
diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc
index 99f0aa9..5a6c0af 100644
--- a/recipes-core/openjdk/openjdk-6-common.inc
+++ b/recipes-core/openjdk/openjdk-6-common.inc
@@ -369,6 +369,8 @@ FILES_${JDKPN}-dbg = "\
         ${JDK_HOME}/jre/lib/${JDK_ARCH}/native_threads/.debug \
         ${JDK_HOME}/jre/lib/${JDK_ARCH}/server/.debug \
         ${JDK_HOME}/jre/lib/${JDK_ARCH}/shark/.debug \
+        ${JDK_HOME}/jre/lib/${JDK_ARCH}/cacao/.debug \
+        ${JDK_HOME}/jre/lib/${JDK_ARCH}/jamvm/.debug \
         ${JDK_HOME}/jre/lib/${JDK_ARCH}/headless/.debug \
         ${JDK_HOME}/jre/lib/${JDK_ARCH}/xawt/.debug \
        "
diff --git a/recipes-core/openjdk/openjdk-6-release-6b24.inc b/recipes-core/openjdk/openjdk-6-release-6b24.inc
index b19bf3a..f27b038 100644
--- a/recipes-core/openjdk/openjdk-6-release-6b24.inc
+++ b/recipes-core/openjdk/openjdk-6-release-6b24.inc
@@ -32,31 +32,31 @@ ICEDTEA_URI = "http://icedtea.classpath.org/download/source/${ICEDTEA}.tar.gz;na
 
 OPENJDK_VERSION = "b24"
 OPENJDK_DATE = "14_nov_2011"
-OPENJDK_URI = "http://download.java.net/openjdk/jdk6/promoted/${OPENJDK_VERSION}/openjdk-6-src-${OPENJDK_VERSION}-${OPENJDK_DATE}.tar.gz;subdir=openjdk-src-dir;name=openjdk"
+OPENJDK_URI = "http://download.java.net/openjdk/jdk6/promoted/${OPENJDK_VERSION}/openjdk-6-src-${OPENJDK_VERSION}-${OPENJDK_DATE}.tar.gz;subdir=openjdk-src-dir;name=openjdk;unpack=false"
 SRC_URI[openjdk.md5sum] = "0eabdd360169144336e50081b8d01001"
 SRC_URI[openjdk.sha256sum] = "f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227"
 
 JAXWS_FILE = "jdk6-jaxws2_1_6-2011_06_13.zip"
-JAXWS_URI = "http://icedtea.classpath.org/download/drops/${JAXWS_FILE};name=jaxws"
+JAXWS_URI = "http://icedtea.classpath.org/download/drops/${JAXWS_FILE};name=jaxws;unpack=false"
 SRC_URI[jaxws.md5sum] = "8fd91b09b643a19a912b8a75e7a7a9d5"
 SRC_URI[jaxws.sha256sum] = "229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3"
 
 JAF_FILE = "jdk6-jaf-b20.zip"
-JAF_URI = "http://icedtea.classpath.org/download/drops/${JAF_FILE};name=jaf"
+JAF_URI = "http://icedtea.classpath.org/download/drops/${JAF_FILE};name=jaf;unpack=false"
 SRC_URI[jaf.md5sum] = "bc95c133620bd68c161cac9891592901"
 SRC_URI[jaf.sha256sum] = "78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012"
 
 JAXP_FILE = "jaxp144_03.zip"
-JAXP_URI = "http://icedtea.classpath.org/download/drops/${JAXP_FILE};name=jaxp"
+JAXP_URI = "http://icedtea.classpath.org/download/drops/${JAXP_FILE};name=jaxp;unpack=false"
 SRC_URI[jaxp.md5sum] = "9eea471ad474040265c688858fcf09aa"
 SRC_URI[jaxp.sha256sum] = "c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012"
 
-CACAO_URI = "http://icedtea.classpath.org/download/drops/cacao/${CACAO_VERSION}.tar.gz;name=cacao"
+CACAO_URI = "http://icedtea.classpath.org/download/drops/cacao/${CACAO_VERSION}.tar.gz;name=cacao;unpack=false"
 CACAO_VERSION = "cff92704c4e0"
 SRC_URI[cacao.md5sum] = "40b811b8b7f01b51cd21e62255691bc7"
 SRC_URI[cacao.sha256sum] = "dc768c9d097fb056ad34fc6d5a57e8fd4f3b24bf515be92acc5ee4208160eb3f"
 
-JAMVM_URI = "http://icedtea.classpath.org/download/drops/jamvm/jamvm-${JAMVM_VERSION}.tar.gz;name=jamvm"
+JAMVM_URI = "http://icedtea.classpath.org/download/drops/jamvm/jamvm-${JAMVM_VERSION}.tar.gz;name=jamvm;unpack=false"
 JAMVM_VERSION = "4617da717ecb05654ea5bb9572338061106a414d"
 SRC_URI[jamvm.md5sum] = "740c2587502831cac6797d1233a7e27b"
 SRC_URI[jamvm.sha256sum] = "47fce7bd556c1b1d29a93b8c45497e0d872b48b7f535066b303336f29d0f0d8d"
diff --git a/recipes-core/openjdk/openjdk-6-release-6b27.inc b/recipes-core/openjdk/openjdk-6-release-6b27.inc
new file mode 100644
index 0000000..32212df
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-6-release-6b27.inc
@@ -0,0 +1,24 @@
+require openjdk-6-release-6b24.inc
+
+FILESPATH =. "${FILE_DIRNAME}/openjdk-6-6b27:"
+
+OEPATCHES += "file://remove_libxp.patch"
+
+OPENJDK_VERSION = "b27"
+OPENJDK_DATE = "26_oct_2012"
+SRC_URI[openjdk.md5sum] = "3a0963158e07c8829c8bd31a698bd23d"
+SRC_URI[openjdk.sha256sum] = "044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0"
+
+CACAO_VERSION = "68fe50ac34ec"
+SRC_URI[cacao.md5sum] = "d7607c455d36ba69651dfea38546922c"
+SRC_URI[cacao.sha256sum] = "b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a"
+
+JAMVM_VERSION = "0972452d441544f7dd29c55d64f1ce3a5db90d82"
+SRC_URI[jamvm.md5sum] = "f4616713ec609e35aa8070811bd952aa"
+SRC_URI[jamvm.sha256sum] = "bfa706402ac934d24f7119eb78f6be65e91439a4b2e49dbcc21e288137808f03"
+
+JAXP_FILE = "jaxp144_04.zip"
+SRC_URI[jaxp.md5sum] = "0ace787aa12177d201947e8ba0ba9bdd"
+SRC_URI[jaxp.sha256sum] = "490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c"
+
+
diff --git a/recipes-core/openjdk/openjdk-6_6b24-1.11.8.bb b/recipes-core/openjdk/openjdk-6_6b24-1.11.9.bb
index dfd77b4..2c2d6cc 100644
--- a/recipes-core/openjdk/openjdk-6_6b24-1.11.8.bb
+++ b/recipes-core/openjdk/openjdk-6_6b24-1.11.9.bb
@@ -2,8 +2,8 @@ require openjdk-6-release-6b24.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI[iced.md5sum] = "3dd02bc93e7f1cd7d59c0aef20f6c9f7"
-SRC_URI[iced.sha256sum] = "62620b5544d5e1df7508d7c777fb78532c75eec43b99c8c7d1a3c84f352c1ea3"
+SRC_URI[iced.md5sum] = "1826c4bfb4faae1e820dd8997428a831"
+SRC_URI[iced.sha256sum] = "0c134bea8d48c77ad5d41d4a0f98f471c381faaa0ef0c215d48687e709e93f3f"
 
 ICEDTEAPATCHES += "file://icedtea-jdk-rmi-crosscompile.patch;apply=no"
 
diff --git a/recipes-core/openjdk/openjdk-6_6b27-1.12.4.bb b/recipes-core/openjdk/openjdk-6_6b27-1.12.4.bb
new file mode 100644
index 0000000..da36da5
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-6_6b27-1.12.4.bb
@@ -0,0 +1,10 @@
+require openjdk-6-release-6b27.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI[iced.md5sum] = "85bfc656c20fb762b72b71d3492a326c"
+SRC_URI[iced.sha256sum] = "eb326c6ae0147ca4abe4bd79e52c1edc2ef08e5e008230e24bee3abb39e14dda"
+
+ICEDTEAPATCHES += "file://icedtea-jdk-rmi-crosscompile.patch;apply=no"
+
+DISTRIBUTION_PATCHES += "patches/icedtea-jdk-rmi-crosscompile.patch"
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc
index 3246814..7947157 100644
--- a/recipes-core/openjdk/openjdk-7-common.inc
+++ b/recipes-core/openjdk/openjdk-7-common.inc
@@ -4,8 +4,8 @@ LICENSE  = "GPL-2.0-with-classpath-exception"
 PRIORITY = "optional"
 SECTION  = "libs"
 
-# Name of the icedtea tarball and top-level directory.
-ICEDTEA = "NEEDS TO BE SET"
+ICEDTEA_VERSION = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[1].split("-")[1] or '1.0'}"
+ICEDTEA = "icedtea-${ICEDTEA_VERSION}"
 
 S = "${WORKDIR}/${ICEDTEA}"
 B = "${S}/build"
@@ -307,6 +307,8 @@ FILES_${JDKPN}-dbg = "\
         ${JDK_HOME}/jre/lib/${JDK_ARCH}/native_threads/.debug \
         ${JDK_HOME}/jre/lib/${JDK_ARCH}/server/.debug \
         ${JDK_HOME}/jre/lib/${JDK_ARCH}/shark/.debug \
+        ${JDK_HOME}/jre/lib/${JDK_ARCH}/cacao/.debug \
+        ${JDK_HOME}/jre/lib/${JDK_ARCH}/jamvm/.debug \
         ${JDK_HOME}/jre/lib/${JDK_ARCH}/headless/.debug \
         ${JDK_HOME}/jre/lib/${JDK_ARCH}/xawt/.debug \
        "
diff --git a/recipes-core/openjdk/openjdk-7_03b21-2.1.6.bb b/recipes-core/openjdk/openjdk-7_03b21-2.1.6.bb
index 5331ce0..c93b390 100644
--- a/recipes-core/openjdk/openjdk-7_03b21-2.1.6.bb
+++ b/recipes-core/openjdk/openjdk-7_03b21-2.1.6.bb
@@ -2,8 +2,6 @@ require openjdk-7-release-03b21.inc
 
 PR = "${INC_PR}.0"
 
-ICEDTEA = "icedtea-2.1.6"
-
 SRC_URI[iced.md5sum] = "f1118898beda7f94ce1731b78e9d2890"
 SRC_URI[iced.sha256sum] = "e6a65923acb29b87b9f8492adc6f00152b489441e788b64e2869301cc7fa29ba"