From 2c54641dd2a325217a154b80bf590db0187bdd8e Mon Sep 17 00:00:00 2001
From: Jesse Gilles <jgilles@multitech.com>
Date: Wed, 25 Apr 2012 10:46:19 -0500
Subject: openjdk-6-6b24: use jamvm by default

---
 .../recipes/meta-java-fixes/openjdk-6-6b24/jvm.cfg | 43 ++++++++++++++++++++++
 .../meta-java-fixes/openjdk-6_6b24-1.11.1.bbappend |  7 ++++
 2 files changed, 50 insertions(+)
 create mode 100644 multitech/recipes/meta-java-fixes/openjdk-6-6b24/jvm.cfg

diff --git a/multitech/recipes/meta-java-fixes/openjdk-6-6b24/jvm.cfg b/multitech/recipes/meta-java-fixes/openjdk-6-6b24/jvm.cfg
new file mode 100644
index 0000000..5a21e4e
--- /dev/null
+++ b/multitech/recipes/meta-java-fixes/openjdk-6-6b24/jvm.cfg
@@ -0,0 +1,43 @@
+# Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+# 
+# List of JVMs that can be used as an option to java, javac, etc.
+# Order is important -- first in this list is the default JVM.
+# NOTE that this both this file and its format are UNSUPPORTED and
+# WILL GO AWAY in a future release.
+#
+# You may also select a JVM in an arbitrary location with the
+# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
+# and may not be available in a future release.
+#
+-jamvm ERROR
+-server ERROR
+-client IGNORE
+-hotspot ERROR
+-classic WARN
+-native ERROR
+-green ERROR
+-zero ALIASED_TO -server
+-shark ERROR
+-cacao ERROR
diff --git a/multitech/recipes/meta-java-fixes/openjdk-6_6b24-1.11.1.bbappend b/multitech/recipes/meta-java-fixes/openjdk-6_6b24-1.11.1.bbappend
index 741bb57..71bd52e 100644
--- a/multitech/recipes/meta-java-fixes/openjdk-6_6b24-1.11.1.bbappend
+++ b/multitech/recipes/meta-java-fixes/openjdk-6_6b24-1.11.1.bbappend
@@ -1,3 +1,10 @@
+# add our own files path to override meta-java
+# (use custom jvm.cfg that defaults to jamvm since it seems the most stable and fast)
+FILESEXTRA := "${THISDIR}"
+FILESPATH =. "${FILESEXTRA}/openjdk-6-6b24:"
+
+PR .= ".corecdp1"
+
 # skip building shark
 WITH_ADDITIONAL_VMS = "cacao,jamvm"
 
-- 
cgit v1.2.3