From 14bf87bc4cf2c389c624ffdb1a6d09c24e3ab9d0 Mon Sep 17 00:00:00 2001 From: Jeff Hatch Date: Mon, 13 Feb 2017 14:34:48 -0600 Subject: Initial commit of Yocto 2.1 changes --- recipes-java/openjdk/openjdk-7/jvm.cfg | 43 ---------------------- .../openjdk/openjdk-7_25b30-2.3.12.bbappend | 6 --- recipes-java/openjdk/openjdk-8/jvm.cfg | 43 ++++++++++++++++++++++ recipes-java/openjdk/openjdk-8_102b14.bbappend | 6 +++ 4 files changed, 49 insertions(+), 49 deletions(-) delete mode 100644 recipes-java/openjdk/openjdk-7/jvm.cfg delete mode 100644 recipes-java/openjdk/openjdk-7_25b30-2.3.12.bbappend create mode 100644 recipes-java/openjdk/openjdk-8/jvm.cfg create mode 100644 recipes-java/openjdk/openjdk-8_102b14.bbappend (limited to 'recipes-java/openjdk') diff --git a/recipes-java/openjdk/openjdk-7/jvm.cfg b/recipes-java/openjdk/openjdk-7/jvm.cfg deleted file mode 100644 index 5a21e4e..0000000 --- a/recipes-java/openjdk/openjdk-7/jvm.cfg +++ /dev/null @@ -1,43 +0,0 @@ -# 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=" 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/recipes-java/openjdk/openjdk-7_25b30-2.3.12.bbappend b/recipes-java/openjdk/openjdk-7_25b30-2.3.12.bbappend deleted file mode 100644 index c7a6e78..0000000 --- a/recipes-java/openjdk/openjdk-7_25b30-2.3.12.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -# provides custom jvm.cfg to set the default JVM - -# openjdk-7 recipe is prepending to FILESPATH, so use -# FILESPATH instead of FILESEXTRAPATH or our file doesn't -# get picked up -FILESPATH_prepend := "${THISDIR}/openjdk-7:" diff --git a/recipes-java/openjdk/openjdk-8/jvm.cfg b/recipes-java/openjdk/openjdk-8/jvm.cfg new file mode 100644 index 0000000..5a21e4e --- /dev/null +++ b/recipes-java/openjdk/openjdk-8/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=" 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/recipes-java/openjdk/openjdk-8_102b14.bbappend b/recipes-java/openjdk/openjdk-8_102b14.bbappend new file mode 100644 index 0000000..4a258d2 --- /dev/null +++ b/recipes-java/openjdk/openjdk-8_102b14.bbappend @@ -0,0 +1,6 @@ +# provides custom jvm.cfg to set the default JVM + +# openjdk-7 recipe is prepending to FILESPATH, so use +# FILESPATH instead of FILESEXTRAPATH or our file doesn't +# get picked up +FILESPATH_prepend := "${THISDIR}/openjdk-8:" -- cgit v1.2.3