diff options
author | Andrew Clemons <andrew.clemons@gmail.com> | 2022-03-01 21:56:01 +1300 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-03-03 15:56:51 +0700 |
commit | b2519f95fdcc4c34874b99ada283907bfc6147ec (patch) | |
tree | e75d63b868e6a19636de30283257389cb05b256a /system | |
parent | 062c44615d50deb42afe6e8dfa766bbb726a386d (diff) |
various: Use zulu jdk builds for REQUIRES.
As noted in the FAQ, you can still use Oracle's JDK for
building or running, but we'll default to the Zulu builds
in the REQUIRES since they are easily downloadable.
Zulu is a good default for us at SBo since it is available
for both 32 and 64 bit, freely downloadable and compatible
and they provide builds for all the LTS branches.
We don't currently have builds for Adoptium (previously
AdoptOpenJDK, not part of the Eclipse Foundation), but if
someone wants to submit builds for them, we can include them
too. Note though that they do not provide 32 bit builds.
Software should run with either Zulu or Oracle's JDK, or
indeed any other builds of OpenJDK, so if I have broken your
build with this change, apologies. This should be rare and
we can change the REQUIRES back to jdkX in that case and note
it in the README, but I do not expect this should be the case.
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system')
-rw-r--r-- | system/apache-activemq/apache-activemq.info | 2 | ||||
-rw-r--r-- | system/apache-cassandra/apache-cassandra.info | 2 | ||||
-rw-r--r-- | system/apache-tomcat/apache-tomcat.info | 2 | ||||
-rw-r--r-- | system/apache-tomcat/rc.tomcat | 12 | ||||
-rw-r--r-- | system/bootchart/bootchart.info | 2 | ||||
-rw-r--r-- | system/commons-daemon/commons-daemon.info | 2 | ||||
-rw-r--r-- | system/crashplan/crashplan.info | 2 | ||||
-rw-r--r-- | system/elasticsearch/elasticsearch.info | 2 | ||||
-rw-r--r-- | system/jdiskreport/jdiskreport.info | 2 | ||||
-rw-r--r-- | system/jenkins/jenkins.info | 2 | ||||
-rw-r--r-- | system/mucommander/mucommander.info | 2 | ||||
-rw-r--r-- | system/openstego/openstego.info | 2 | ||||
-rw-r--r-- | system/virtualbox/README | 2 | ||||
-rw-r--r-- | system/webmin/webmin.info | 2 | ||||
-rw-r--r-- | system/zookeeper/zookeeper.info | 2 |
15 files changed, 22 insertions, 18 deletions
diff --git a/system/apache-activemq/apache-activemq.info b/system/apache-activemq/apache-activemq.info index c2ae9a1e99467..fd70b5d65666f 100644 --- a/system/apache-activemq/apache-activemq.info +++ b/system/apache-activemq/apache-activemq.info @@ -5,6 +5,6 @@ DOWNLOAD="http://archive.apache.org/dist/activemq/5.14.5/apache-activemq-5.14.5- MD5SUM="3d28a422e05544a4c6764ad0d91718ee" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jdk" +REQUIRES="zulu-openjdk8" MAINTAINER="Miguel De Anda" EMAIL="miguel@thedeanda.com" diff --git a/system/apache-cassandra/apache-cassandra.info b/system/apache-cassandra/apache-cassandra.info index 41786242e6139..4f3c974be5055 100644 --- a/system/apache-cassandra/apache-cassandra.info +++ b/system/apache-cassandra/apache-cassandra.info @@ -5,6 +5,6 @@ DOWNLOAD="http://archive.apache.org/dist/cassandra/4.0.1/apache-cassandra-4.0.1- MD5SUM="aae4ab4f0f7dc68677a1140eccb87c7d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jdk" +REQUIRES="zulu-openjdk8" MAINTAINER="Mario Antunes" EMAIL="mariolpantunes@gmail.com" diff --git a/system/apache-tomcat/apache-tomcat.info b/system/apache-tomcat/apache-tomcat.info index 66f3a4bc0d975..fd8bc56c655ce 100644 --- a/system/apache-tomcat/apache-tomcat.info +++ b/system/apache-tomcat/apache-tomcat.info @@ -5,6 +5,6 @@ DOWNLOAD="https://dlcdn.apache.org/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-1 MD5SUM="61e57ae161ab3cea28ca157b57fe8b77" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jdk commons-daemon" +REQUIRES="zulu-openjdk8 commons-daemon" MAINTAINER="Heinz Wiesinger" EMAIL="pprkut@slackbuilds.org" diff --git a/system/apache-tomcat/rc.tomcat b/system/apache-tomcat/rc.tomcat index 3e2c307bf7851..e3630784a1a55 100644 --- a/system/apache-tomcat/rc.tomcat +++ b/system/apache-tomcat/rc.tomcat @@ -9,10 +9,14 @@ # Load environment variables . /etc/profile.d/apache-tomcat.sh -if [ -e "/etc/profile.d/openjdk.sh" ]; then - . /etc/profile.d/openjdk.sh -else - . /etc/profile.d/jdk.sh + +if [ -z "$JAVA_HOME" ]; then + for i in /etc/profile.d/*jdk*.sh; do + if [ -x $i ]; then + source $i + break + fi + done fi PIDFILE="/var/spool/tomcat/tomcat.pid" diff --git a/system/bootchart/bootchart.info b/system/bootchart/bootchart.info index 3d5e78ffc73e4..dd07d54e409ec 100644 --- a/system/bootchart/bootchart.info +++ b/system/bootchart/bootchart.info @@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/bootchart/bootchart-0.9.tar.bz2" MD5SUM="4be91177d19069e21beeb106f2f77dff" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="apache-ant jdk" +REQUIRES="apache-ant zulu-openjdk8" MAINTAINER="Ozan Türkyılmaz" EMAIL="ozan.turkyilmaz@gmail.com" diff --git a/system/commons-daemon/commons-daemon.info b/system/commons-daemon/commons-daemon.info index 0f2493112aa5d..24e0fd4c61134 100644 --- a/system/commons-daemon/commons-daemon.info +++ b/system/commons-daemon/commons-daemon.info @@ -7,6 +7,6 @@ MD5SUM="01a2e531c9ecbc545492308c911aa570 \ 928f6243a50f01f6b9dafcac585889ee" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jdk" +REQUIRES="zulu-openjdk8" MAINTAINER="Heinz Wiesinger" EMAIL="pprkut@slackbuilds.org" diff --git a/system/crashplan/crashplan.info b/system/crashplan/crashplan.info index 915e635544c27..38511555793f6 100644 --- a/system/crashplan/crashplan.info +++ b/system/crashplan/crashplan.info @@ -5,6 +5,6 @@ DOWNLOAD="http://distcache.freebsd.org/ports-distfiles/CrashPlan_4.3.0_Linux.tgz MD5SUM="3b06038c29692b4daf05df739fd19ff7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jdk" +REQUIRES="zulu-openjdk8" MAINTAINER="Lionel Young" EMAIL="lionelyoung@gmail.com" diff --git a/system/elasticsearch/elasticsearch.info b/system/elasticsearch/elasticsearch.info index de673df40cbf9..dc7cb4bdc3f17 100644 --- a/system/elasticsearch/elasticsearch.info +++ b/system/elasticsearch/elasticsearch.info @@ -5,6 +5,6 @@ DOWNLOAD="https://download.elasticsearch.org/elasticsearch/elasticsearch/elastic MD5SUM="8766b54a2d9c5349acca19deb958c192" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jdk" +REQUIRES="zulu-openjdk8" MAINTAINER="Daniel Romero" EMAIL="infoslack@gmail.com" diff --git a/system/jdiskreport/jdiskreport.info b/system/jdiskreport/jdiskreport.info index 202c8dea63906..074b8badbf43b 100644 --- a/system/jdiskreport/jdiskreport.info +++ b/system/jdiskreport/jdiskreport.info @@ -5,6 +5,6 @@ DOWNLOAD="http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_1.zip" MD5SUM="9380a6ba68bd21e0f09b58297eb5a44a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jdk" +REQUIRES="zulu-openjdk8" MAINTAINER="Alan Alberghini" EMAIL="414N@slacky.it" diff --git a/system/jenkins/jenkins.info b/system/jenkins/jenkins.info index 4fa6e68f9397e..2a8e89fe30f21 100644 --- a/system/jenkins/jenkins.info +++ b/system/jenkins/jenkins.info @@ -5,6 +5,6 @@ DOWNLOAD="https://get.jenkins.io/war-stable/2.319.3/jenkins.war" MD5SUM="65ded31139347a2bb5a84388578560aa" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jdk11" +REQUIRES="zulu-openjdk11" MAINTAINER="Andrew Clemons" EMAIL="andrew.clemons@gmail.com" diff --git a/system/mucommander/mucommander.info b/system/mucommander/mucommander.info index 0aa471d71b23b..099ec811dbd68 100644 --- a/system/mucommander/mucommander.info +++ b/system/mucommander/mucommander.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/mucommander/mucommander/releases/download/0.9.0/muc MD5SUM="934f48cefb74da275cfa1f49a4ffb2d5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jdk" +REQUIRES="zulu-openjdk8" MAINTAINER="Dario Nicodemi" EMAIL="dario.sbo@gmail.com" diff --git a/system/openstego/openstego.info b/system/openstego/openstego.info index 61928e0238952..fb5b53df52f04 100644 --- a/system/openstego/openstego.info +++ b/system/openstego/openstego.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/syvaidya/openstego/releases/download/openstego-0.8. MD5SUM="e172fae2f0f3aca30ae5998866e7c7f2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jdk" +REQUIRES="zulu-openjdk8" MAINTAINER="B. Watson" EMAIL="yalhcru@gmail.com" diff --git a/system/virtualbox/README b/system/virtualbox/README index 3a2addeca9c88..0ac2727d22346 100644 --- a/system/virtualbox/README +++ b/system/virtualbox/README @@ -8,7 +8,7 @@ To enable the webservice pass WEBSERVICE=yes to the script. This will require gsoap as optional dependency. If you want to build the java bindings, pass JAVA=yes to the script. -This will require jdk as optional dependency. +This will require zulu-openjdk8 as optional dependency. On x86_64, this by default builds without software virtualization. This means you need hardware virtualization in order to run 32bit guests on diff --git a/system/webmin/webmin.info b/system/webmin/webmin.info index 89e00d6b432ea..f32be94261ae5 100644 --- a/system/webmin/webmin.info +++ b/system/webmin/webmin.info @@ -5,6 +5,6 @@ DOWNLOAD="https://downloads.sf.net/project/webadmin/webmin/1.984/webmin-1.984.ta MD5SUM="d7f4ff5b39ab1e6e48a8c357c9eb169e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jdk" +REQUIRES="zulu-openjdk8" MAINTAINER="David Somero" EMAIL="dsomero@hotmail.com" diff --git a/system/zookeeper/zookeeper.info b/system/zookeeper/zookeeper.info index 82d3e14bb3ffd..d7b965900968c 100644 --- a/system/zookeeper/zookeeper.info +++ b/system/zookeeper/zookeeper.info @@ -5,6 +5,6 @@ DOWNLOAD="https://archive.apache.org/dist/zookeeper/zookeeper-3.4.10/zookeeper-3 MD5SUM="e4cf1b1593ca870bf1c7a75188f09678" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jdk" +REQUIRES="zulu-openjdk8" MAINTAINER="Andre Barboza" EMAIL="bmg.andre@gmail.com" |