From ee721da608cfa3a91bf1e66dc26e83b3caf6b6b9 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 21 Dec 2023 17:40:49 -0500 Subject: [PATCH] openjdk11-bin: remove package this package has been useless since 106a275ecd81e132cb80cc21c0ec96a336d16614 make it a transitional package on openjdk11 --- srcpkgs/openjdk11-bin | 1 + srcpkgs/openjdk11-bin/template | 70 ---------------------------------- srcpkgs/openjdk11/template | 9 ++++- 3 files changed, 9 insertions(+), 71 deletions(-) create mode 120000 srcpkgs/openjdk11-bin delete mode 100644 srcpkgs/openjdk11-bin/template diff --git a/srcpkgs/openjdk11-bin b/srcpkgs/openjdk11-bin new file mode 120000 index 00000000000..8213494c49e --- /dev/null +++ b/srcpkgs/openjdk11-bin @@ -0,0 +1 @@ +openjdk11 \ No newline at end of file diff --git a/srcpkgs/openjdk11-bin/template b/srcpkgs/openjdk11-bin/template deleted file mode 100644 index 6dfbbb49fd4..00000000000 --- a/srcpkgs/openjdk11-bin/template +++ /dev/null @@ -1,70 +0,0 @@ -# Template file for 'openjdk11-bin' -pkgname=openjdk11-bin -version=11+28 -revision=2 -archs="x86_64" -short_desc="Official Reference Implementation for Java SE 11" -maintainer="Kyle Nusbaum " -license="GPL-2.0-only WITH Classpath-exception-2.0" -homepage="https://jdk.java.net/java-se-ri/11" -distfiles="https://download.java.net/openjdk/jdk11/ri/openjdk-${version}_linux-x64_bin.tar.gz" -checksum=3784cfc4670f0d4c5482604c7c513beb1a92b005f569df9bf100e8bef6610f2e -nopie=true - -alternatives=" - java:/usr/bin/java:/usr/lib/jvm/openjdk11-bin/bin/java - java:/usr/bin/javaws:/usr/lib/jvm/openjdk11-bin/bin/javaws - java:/usr/bin/jcontrol:/usr/lib/jvm/openjdk11-bin/bin/jcontrol - java:/usr/bin/jjs:/usr/lib/jvm/openjdk11-bin/bin/jjs - java:/usr/bin/keytool:/usr/lib/jvm/openjdk11-bin/bin/keytool - java:/usr/bin/orbd:/usr/lib/jvm/openjdk11-bin/bin/orbd - java:/usr/bin/pack200:/usr/lib/jvm/openjdk11-bin/bin/pack200 - java:/usr/bin/policytool:/usr/lib/jvm/openjdk11-bin/bin/policytool - java:/usr/bin/rmid:/usr/lib/jvm/openjdk11-bin/bin/rmid - java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11-bin/bin/rmiregistry - java:/usr/bin/servertool:/usr/lib/jvm/openjdk11-bin/bin/servertool - java:/usr/bin/tnameserv:/usr/lib/jvm/openjdk11-bin/bin/tnameserv - java:/usr/bin/unpack200:/usr/lib/jvm/openjdk11-bin/bin/unpack200 - - jdk:/usr/bin/ControlPanel:/usr/lib/jvm/openjdk11-bin/bin/ControlPanel - jdk:/usr/bin/appletviewer:/usr/lib/jvm/openjdk11-bin/bin/appletviewer - jdk:/usr/bin/extcheck:/usr/lib/jvm/openjdk11-bin/bin/extcheck - jdk:/usr/bin/idlj:/usr/lib/jvm/openjdk11-bin/bin/idlj - jdk:/usr/bin/jar:/usr/lib/jvm/openjdk11-bin/bin/jar - jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk11-bin/bin/jarsigner - jdk:/usr/bin/java-rmi.cgi:/usr/lib/jvm/openjdk11-bin/bin/java-rmi.cgi - jdk:/usr/bin/javac:/usr/lib/jvm/openjdk11-bin/bin/javac - jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk11-bin/bin/javadoc - jdk:/usr/bin/javafxpackager:/usr/lib/jvm/openjdk11-bin/bin/javafxpackager - jdk:/usr/bin/javah:/usr/lib/jvm/openjdk11-bin/bin/javah - jdk:/usr/bin/javap:/usr/lib/jvm/openjdk11-bin/bin/javap - jdk:/usr/bin/javapackager:/usr/lib/jvm/openjdk11-bin/bin/javapackager - jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk11-bin/bin/jcmd - jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk11-bin/bin/jconsole - jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk11-bin/bin/jdb - jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk11-bin/bin/jdeps - jdk:/usr/bin/jhat:/usr/lib/jvm/openjdk11-bin/bin/jhat - jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk11-bin/bin/jinfo - jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk11-bin/bin/jmap - jdk:/usr/bin/jmc:/usr/lib/jvm/openjdk11-bin/bin/jmc - jdk:/usr/bin/jmc.ini:/usr/lib/jvm/openjdk11-bin/bin/jmc.ini - jdk:/usr/bin/jps:/usr/lib/jvm/openjdk11-bin/bin/jps - jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk11-bin/bin/jrunscript - jdk:/usr/bin/jsadebugd:/usr/lib/jvm/openjdk11-bin/bin/jsadebugd - jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk11-bin/bin/jstack - jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk11-bin/bin/jstat - jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk11-bin/bin/jstatd - jdk:/usr/bin/jvisualvm:/usr/lib/jvm/openjdk11-bin/bin/jvisualvm - jdk:/usr/bin/native2ascii:/usr/lib/jvm/openjdk11-bin/bin/native2ascii - jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk11-bin/bin/rmic - jdk:/usr/bin/schemagen:/usr/lib/jvm/openjdk11-bin/bin/schemagen - jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk11-bin/bin/serialver - jdk:/usr/bin/wsgen:/usr/lib/jvm/openjdk11-bin/bin/wsgen - jdk:/usr/bin/wsimport:/usr/lib/jvm/openjdk11-bin/bin/wsimport - jdk:/usr/bin/xjc:/usr/lib/jvm/openjdk11-bin/bin/xjc -" - -do_install() { - vmkdir /usr/lib/jvm/openjdk11-bin - cp -R ./* ${DESTDIR}/usr/lib/jvm/openjdk11-bin -} diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template index b5dd94241a0..783e7c28d72 100644 --- a/srcpkgs/openjdk11/template +++ b/srcpkgs/openjdk11/template @@ -156,7 +156,7 @@ do_install() { vlicense LICENSE } -subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-jmods openjdk11-static-libs" +subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-jmods openjdk11-static-libs openjdk11-bin" openjdk11-jre_package() { shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so" @@ -227,3 +227,10 @@ openjdk11-jmods_package() { vmove $_jdk_home/jmods } } + +openjdk11-bin_package() { + reverts="11+28_1 11+28_2" + short_desc+=" (transitional dummy package)" + depends="${sourcepkg}>=${version}_${revision}" + build_style=meta +}