From 95a786f81d103b94197c74c6373b798bca25fbfb Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 14 Nov 2015 09:38:50 +0100 Subject: [PATCH] openjdk: add alternatives. --- srcpkgs/openjdk/template | 74 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 2 deletions(-) diff --git a/srcpkgs/openjdk/template b/srcpkgs/openjdk/template index 90ed46f5264..b4b4fb14f81 100644 --- a/srcpkgs/openjdk/template +++ b/srcpkgs/openjdk/template @@ -12,7 +12,7 @@ _openjdk_version="openjdk-1.8.0_${_jdk_update}" # Template file for 'openjdk' pkgname=openjdk version=${_java_ver}u${_jdk_update} -revision=1 +revision=2 nocross=yes wrksrc=jdk8u-jdk8u${_jdk_update}-b${_jdk_build}/ build_style=gnu-configure @@ -75,6 +75,63 @@ build_options="oracle_bootstrap" build_options_default="oracle_bootstrap" desc_option_oracle_bootstrap="Bootstrap using Oracle JDK" +alternatives=" + java:/usr/bin/java:/usr/lib/jvm/openjdk/bin/java + java:/usr/bin/jjs:/usr/lib/jvm/openjdk/bin/jjs + java:/usr/bin/keytool:/usr/lib/jvm/openjdk/bin/keytool + java:/usr/bin/mkcacerts:/usr/lib/jvm/openjdk/bin/mkcacerts + java:/usr/bin/orbd:/usr/lib/jvm/openjdk/bin/orbd + java:/usr/bin/pack200:/usr/lib/jvm/openjdk/bin/pack200 + java:/usr/bin/policytool:/usr/lib/jvm/openjdk/bin/policytool + java:/usr/bin/rmid:/usr/lib/jvm/openjdk/bin/rmid + java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk/bin/rmiregistry + java:/usr/bin/servertool:/usr/lib/jvm/openjdk/bin/servertool + java:/usr/bin/tnameserv:/usr/lib/jvm/openjdk/bin/tnameserv + java:/usr/bin/unpack200:/usr/lib/jvm/openjdk/bin/unpack200 + + jdk:/usr/bin/appletviewer:/usr/lib/jvm/openjdk/bin/appletviewer + jdk:/usr/bin/extcheck:/usr/lib/jvm/openjdk/bin/extcheck + jdk:/usr/bin/idlj:/usr/lib/jvm/openjdk/bin/idlj + jdk:/usr/bin/jar:/usr/lib/jvm/openjdk/bin/jar + jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk/bin/jarsigner + jdk:/usr/bin/java:/usr/lib/jvm/openjdk/bin/java + jdk:/usr/bin/java-rmi.cgi:/usr/lib/jvm/openjdk/bin/java-rmi.cgi + jdk:/usr/bin/javac:/usr/lib/jvm/openjdk/bin/javac + jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk/bin/javadoc + jdk:/usr/bin/javah:/usr/lib/jvm/openjdk/bin/javah + jdk:/usr/bin/javap:/usr/lib/jvm/openjdk/bin/javap + jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk/bin/jcmd + jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk/bin/jconsole + jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk/bin/jdb + jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk/bin/jdeps + jdk:/usr/bin/jhat:/usr/lib/jvm/openjdk/bin/jhat + jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk/bin/jinfo + jdk:/usr/bin/jjs:/usr/lib/jvm/openjdk/bin/jjs + jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk/bin/jmap + jdk:/usr/bin/jps:/usr/lib/jvm/openjdk/bin/jps + jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk/bin/jrunscript + jdk:/usr/bin/jsadebugd:/usr/lib/jvm/openjdk/bin/jsadebugd + jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk/bin/jstack + jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk/bin/jstat + jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk/bin/jstatd + jdk:/usr/bin/keytool:/usr/lib/jvm/openjdk/bin/keytool + jdk:/usr/bin/native2ascii:/usr/lib/jvm/openjdk/bin/native2ascii + jdk:/usr/bin/orbd:/usr/lib/jvm/openjdk/bin/orbd + jdk:/usr/bin/pack200:/usr/lib/jvm/openjdk/bin/pack200 + jdk:/usr/bin/policytool:/usr/lib/jvm/openjdk/bin/policytool + jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk/bin/rmic + jdk:/usr/bin/rmid:/usr/lib/jvm/openjdk/bin/rmid + jdk:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk/bin/rmiregistry + jdk:/usr/bin/schemagen:/usr/lib/jvm/openjdk/bin/schemagen + jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk/bin/serialver + jdk:/usr/bin/servertool:/usr/lib/jvm/openjdk/bin/servertool + jdk:/usr/bin/tnameserv:/usr/lib/jvm/openjdk/bin/tnameserv + jdk:/usr/bin/unpack200:/usr/lib/jvm/openjdk/bin/unpack200 + jdk:/usr/bin/wsgen:/usr/lib/jvm/openjdk/bin/wsgen + jdk:/usr/bin/wsimport:/usr/lib/jvm/openjdk/bin/wsimport + jdk:/usr/bin/xjc:/usr/lib/jvm/openjdk/bin/xjc +" + post_extract() { chmod +x configure for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn; do @@ -107,13 +164,26 @@ openjdk-jre_package() { short_desc="OpenJDK Java Runtime Environment" provides="java-runtime-${version}_1" replaces="java-runtime>=0" + alternatives=" + java:/usr/bin/java:/usr/lib/jvm/openjdk/jre/bin/java + java:/usr/bin/jjs:/usr/lib/jvm/openjdk/jre/bin/jjs + java:/usr/bin/keytool:/usr/lib/jvm/openjdk/jre/bin/keytool + java:/usr/bin/mkcacerts:/usr/lib/jvm/openjdk/jre/bin/mkcacerts + java:/usr/bin/orbd:/usr/lib/jvm/openjdk/jre/bin/orbd + java:/usr/bin/pack200:/usr/lib/jvm/openjdk/jre/bin/pack200 + java:/usr/bin/policytool:/usr/lib/jvm/openjdk/jre/bin/policytool + java:/usr/bin/rmid:/usr/lib/jvm/openjdk/jre/bin/rmid + java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk/jre/bin/rmiregistry + java:/usr/bin/servertool:/usr/lib/jvm/openjdk/jre/bin/servertool + java:/usr/bin/tnameserv:/usr/lib/jvm/openjdk/jre/bin/tnameserv + java:/usr/bin/unpack200:/usr/lib/jvm/openjdk/jre/bin/unpack200 + " pkg_install() { vmove "usr/lib/jvm/$_openjdk_version/jre" ln -s $_openjdk_version ${PKGDESTDIR}/usr/lib/jvm/openjdk vmkdir etc/profile.d cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk.sh <