Compare commits
No commits in common. "c8" and "c9s" have entirely different histories.
155
.gitignore
vendored
155
.gitignore
vendored
@ -1,2 +1,153 @@
|
||||
SOURCES/openjdk-jdk11u-jdk-11.0.25+9.tar.xz
|
||||
SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
|
||||
*.rpm
|
||||
/systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
|
||||
/shenandoah-jdk11-b516c8c7a0a4.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11+22.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11+28.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.1+13.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.1+13-20190101.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.2+7.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.3+6.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.3+7.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.4+2.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.4+3.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.4+4.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.4+5.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.4+6.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.4+7.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.4+8.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.4+9.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.4+10.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.4+11.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.5+1.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.5+2.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.5+2-4curve.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.5+9-4curve.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.5+9.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.5+10.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.5+10-4curve.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.6+1-4curve.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.6+2-4curve.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.6+9-4curve.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.6+10-4curve.tar.xz
|
||||
/tapsets-icedtea-3.11.0.tar.xz
|
||||
/tapsets-icedtea-3.15.0.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.7+1-4curve.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.7+2-4curve.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.7+3-4curve.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.7+3.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.7+4-4curve.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.7+4.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.7+5-4curve.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.7+5.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.7+6-4curve.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.7+6.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.7+7-4curve.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.7+7.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.7+8-4curve.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.7+8.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.7+9-4curve.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.7+9.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.7+10-4curve.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.7+10.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.8+1-4curve.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.8+2-4curve.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.8+3-4curve.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.8+4-4curve.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.8+5-4curve.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.8+6-4curve.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.8+7-4curve.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.8+8-4curve.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.8+9-4curve.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.8+10-4curve.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11.0.9+1-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.9+2-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.9+3-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.9+4-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.9+5-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.9+6-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.9+7-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.9+8-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.9+9-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.9+10-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.9+11-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.10+1-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.10+2-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.10+3-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.10+4-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.10+5-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.10+8-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.10+9-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.11+1-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.11+2-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.11+3-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.11+4-4curve.tar.xz
|
||||
/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.11+5-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.11+6-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.11+7-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.11+9-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.12+1-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.12+2-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.12+3-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.12+4-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.12+6-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.12+7-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.12+7-4curve-clean.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.13+1-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.13+7-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.13+8-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.14+1-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.14+8-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.14+9-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.14.1+1-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.15+1-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.15+8-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.15+9-4curve.tar.xz
|
||||
/jdk-updates-jdk11u-jdk-11.0.15+10-4curve.tar.xz
|
||||
/openjdk-jdk11u-jdk-11.0.16+7-4curve.tar.xz
|
||||
/openjdk-jdk11u-jdk-11.0.16+8-4curve.tar.xz
|
||||
/openjdk-jdk11u-jdk-11.0.16.1+1-4curve.tar.xz
|
||||
/openjdk-jdk11u-jdk-11.0.17+1-4curve.tar.xz
|
||||
/openjdk-jdk11u-jdk-11.0.17+7-4curve.tar.xz
|
||||
/openjdk-jdk11u-jdk-11.0.17+8-4curve.tar.xz
|
||||
/openjdk-jdk11u-jdk-11.0.18+1-4curve.tar.xz
|
||||
/openjdk-jdk11u-jdk-11.0.18+9-4curve.tar.xz
|
||||
/openjdk-jdk11u-jdk-11.0.18+10-4curve.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.docs.el.aarch64.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.docs.el.ppc64le.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.docs.el.s390x.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.docs.el.x86_64.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.fastdebug.jdk.el.aarch64.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.fastdebug.jdk.el.ppc64le.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.fastdebug.jdk.el.x86_64.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.fastdebug.static-libs.el.aarch64.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.fastdebug.static-libs.el.ppc64le.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.fastdebug.static-libs.el.x86_64.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.misc.el.aarch64.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.misc.el.ppc64le.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.misc.el.s390x.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.misc.el.x86_64.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.slowdebug.jdk.el.aarch64.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.slowdebug.jdk.el.ppc64le.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.slowdebug.jdk.el.s390x.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.slowdebug.jdk.el.x86_64.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.slowdebug.static-libs.el.aarch64.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.slowdebug.static-libs.el.ppc64le.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.slowdebug.static-libs.el.s390x.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.slowdebug.static-libs.el.x86_64.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.static-libs.el.aarch64.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.static-libs.el.ppc64le.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.static-libs.el.s390x.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.static-libs.el.x86_64.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.unstripped.jdk.el.aarch64.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.unstripped.jdk.el.ppc64le.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.unstripped.jdk.el.s390x.tar.xz
|
||||
/java-11-openjdk-11.0.18.0.10-6.portable.unstripped.jdk.el.x86_64.tar.xz
|
||||
/openjdk-jdk11u-jdk-11.0.19+7-4curve.tar.xz
|
||||
/openjdk-jdk11u-jdk-11.0.20+1-4curve.tar.xz
|
||||
/openjdk-jdk11u-jdk-11.0.20+7-4curve.tar.xz
|
||||
/openjdk-jdk11u-jdk-11.0.20+8-4curve.tar.xz
|
||||
/openjdk-jdk11u-jdk-11.0.20.1+1-4curve.tar.xz
|
||||
/openjdk-jdk11u-jdk-11.0.21+1.tar.xz
|
||||
/openjdk-jdk11u-jdk-11.0.21+8.tar.xz
|
||||
/openjdk-jdk11u-jdk-11.0.21+9.tar.xz
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
5fd3e49485572a2ac8c350503d872a624c59ddb2 SOURCES/openjdk-jdk11u-jdk-11.0.25+9.tar.xz
|
||||
c8281ee37b77d535c9c1af86609a531958ff7b34 SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
|
||||
54
discover_trees.sh
Executable file
54
discover_trees.sh
Executable file
@ -0,0 +1,54 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Copyright (C) 2020 Red Hat, Inc.
|
||||
# Written by Andrew John Hughes <gnu.andrew@redhat.com>.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program 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 Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
TREE=${1}
|
||||
|
||||
if test "x${TREE}" = "x"; then
|
||||
TREE=${PWD}
|
||||
fi
|
||||
|
||||
if [ -e ${TREE}/nashorn/.hg -o -e ${TREE}/nashorn/merge.changeset ] ; then
|
||||
NASHORN="nashorn" ;
|
||||
fi
|
||||
|
||||
if [ -e ${TREE}/corba/.hg -o -e ${TREE}/corba/merge.changeset ] ; then
|
||||
CORBA="corba";
|
||||
fi
|
||||
|
||||
if [ -e ${TREE}/jaxp/.hg -o -e ${TREE}/jaxp/merge.changeset ] ; then
|
||||
JAXP="jaxp";
|
||||
fi
|
||||
|
||||
if [ -e ${TREE}/jaxws/.hg -o -e ${TREE}/jaxws/merge.changeset ] ; then
|
||||
JAXWS="jaxws";
|
||||
fi
|
||||
|
||||
if [ -e ${TREE}/langtools/.hg -o -e ${TREE}/langtools/merge.changeset ] ; then
|
||||
LANGTOOLS="langtools";
|
||||
fi
|
||||
|
||||
if [ -e ${TREE}/jdk/.hg -o -e ${TREE}/jdk/merge.changeset ] ; then
|
||||
JDK="jdk";
|
||||
fi
|
||||
|
||||
if [ -e ${TREE}/hotspot/.hg -o -e ${TREE}/hotspot/merge.changeset ] ; then
|
||||
HOTSPOT="hotspot";
|
||||
fi
|
||||
|
||||
SUBTREES="${CORBA} ${JAXP} ${JAXWS} ${LANGTOOLS} ${NASHORN} ${JDK} ${HOTSPOT}";
|
||||
echo ${SUBTREES}
|
||||
7
gating.yaml
Normal file
7
gating.yaml
Normal file
@ -0,0 +1,7 @@
|
||||
# recipients: java-qa
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
||||
188
generate_source_tarball.sh
Executable file
188
generate_source_tarball.sh
Executable file
@ -0,0 +1,188 @@
|
||||
#!/bin/bash
|
||||
# Generates the 'source tarball' for JDK projects.
|
||||
#
|
||||
# Example:
|
||||
# When used from local repo set REPO_ROOT pointing to file:// with your repo
|
||||
# If your local repo follows upstream forests conventions, it may be enough to set OPENJDK_URL
|
||||
#
|
||||
# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
|
||||
# PROJECT_NAME=openjdk
|
||||
# REPO_NAME=jdk11u
|
||||
# VERSION=HEAD
|
||||
# or to eg prepare systemtap:
|
||||
# icedtea7's jstack and other tapsets
|
||||
# VERSION=6327cf1cea9e
|
||||
# REPO_NAME=icedtea7-2.6
|
||||
# PROJECT_NAME=release
|
||||
# OPENJDK_URL=http://icedtea.classpath.org/hg/
|
||||
# TO_COMPRESS="*/tapset"
|
||||
#
|
||||
# They are used to create correct name and are used in construction of sources url (unless REPO_ROOT is set)
|
||||
|
||||
# This script creates a single source tarball out of the repository
|
||||
# based on the given tag and removes code not allowed in fedora/rhel. For
|
||||
# consistency, the source tarball will always contain 'openjdk' as the top
|
||||
# level folder, name is created, based on parameter
|
||||
#
|
||||
|
||||
set -e
|
||||
|
||||
OPENJDK_URL_DEFAULT=https://github.com
|
||||
COMPRESSION_DEFAULT=xz
|
||||
|
||||
if [ "x$1" = "xhelp" ] ; then
|
||||
echo -e "Behaviour may be specified by setting the following variables:\n"
|
||||
echo "VERSION - the version of the specified OpenJDK project"
|
||||
echo "PROJECT_NAME -- the name of the OpenJDK project being archived (optional; only needed by defaults)"
|
||||
echo "REPO_NAME - the name of the OpenJDK repository (optional; only needed by defaults)"
|
||||
echo "OPENJDK_URL - the URL to retrieve code from (optional; defaults to ${OPENJDK_URL_DEFAULT})"
|
||||
echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
|
||||
echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
|
||||
echo "REPO_ROOT - the location of the Git repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)"
|
||||
echo "TO_COMPRESS - what part of clone to pack (default is ${VERSION})"
|
||||
echo "BOOT_JDK - the bootstrap JDK to satisfy the configure run"
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
|
||||
if [ "x$VERSION" = "x" ] ; then
|
||||
echo "No VERSION specified"
|
||||
exit 2
|
||||
fi
|
||||
echo "Version: ${VERSION}"
|
||||
|
||||
NUM_VER=${VERSION##jdk-}
|
||||
RELEASE_VER=${NUM_VER%%+*}
|
||||
BUILD_VER=${NUM_VER##*+}
|
||||
MAJOR_VER=${RELEASE_VER%%.*}
|
||||
echo "Major version is ${MAJOR_VER}, release ${RELEASE_VER}, build ${BUILD_VER}"
|
||||
|
||||
if [ "x$BOOT_JDK" = "x" ] ; then
|
||||
echo "No boot JDK specified".
|
||||
BOOT_JDK=/usr/lib/jvm/java-${MAJOR_VER}-openjdk;
|
||||
echo -n "Checking for ${BOOT_JDK}...";
|
||||
if [ -d ${BOOT_JDK} -a -x ${BOOT_JDK}/bin/java ] ; then
|
||||
echo "Boot JDK found at ${BOOT_JDK}";
|
||||
else
|
||||
echo "Not found";
|
||||
PREV_VER=$((${MAJOR_VER} - 1));
|
||||
BOOT_JDK=/usr/lib/jvm/java-${PREV_VER}-openjdk;
|
||||
echo -n "Checking for ${BOOT_JDK}...";
|
||||
if [ -d ${BOOT_JDK} -a -x ${BOOT_JDK}/bin/java ] ; then
|
||||
echo "Boot JDK found at ${BOOT_JDK}";
|
||||
else
|
||||
echo "Not found";
|
||||
exit 4;
|
||||
fi
|
||||
fi
|
||||
else
|
||||
echo "Boot JDK: ${BOOT_JDK}";
|
||||
fi
|
||||
|
||||
# REPO_NAME is only needed when we default on REPO_ROOT and FILE_NAME_ROOT
|
||||
if [ "x$FILE_NAME_ROOT" = "x" -o "x$REPO_ROOT" = "x" ] ; then
|
||||
if [ "x$PROJECT_NAME" = "x" ] ; then
|
||||
echo "No PROJECT_NAME specified"
|
||||
exit 1
|
||||
fi
|
||||
echo "Project name: ${PROJECT_NAME}"
|
||||
if [ "x$REPO_NAME" = "x" ] ; then
|
||||
echo "No REPO_NAME specified"
|
||||
exit 3
|
||||
fi
|
||||
echo "Repository name: ${REPO_NAME}"
|
||||
fi
|
||||
|
||||
if [ "x$OPENJDK_URL" = "x" ] ; then
|
||||
OPENJDK_URL=${OPENJDK_URL_DEFAULT}
|
||||
echo "No OpenJDK URL specified; defaulting to ${OPENJDK_URL}"
|
||||
else
|
||||
echo "OpenJDK URL: ${OPENJDK_URL}"
|
||||
fi
|
||||
|
||||
if [ "x$COMPRESSION" = "x" ] ; then
|
||||
# rhel 5 needs tar.gz
|
||||
COMPRESSION=${COMPRESSION_DEFAULT}
|
||||
fi
|
||||
echo "Creating a tar.${COMPRESSION} archive"
|
||||
|
||||
if [ "x$FILE_NAME_ROOT" = "x" ] ; then
|
||||
FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
|
||||
echo "No file name root specified; default to ${FILE_NAME_ROOT}"
|
||||
fi
|
||||
if [ "x$REPO_ROOT" = "x" ] ; then
|
||||
REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}.git"
|
||||
echo "No repository root specified; default to ${REPO_ROOT}"
|
||||
fi;
|
||||
|
||||
if [ "x$TO_COMPRESS" = "x" ] ; then
|
||||
TO_COMPRESS="${VERSION}"
|
||||
echo "No targets to be compressed specified ; default to ${TO_COMPRESS}"
|
||||
fi;
|
||||
|
||||
echo -e "Settings:"
|
||||
echo -e "\tVERSION: ${VERSION}"
|
||||
echo -e "\tPROJECT_NAME: ${PROJECT_NAME}"
|
||||
echo -e "\tREPO_NAME: ${REPO_NAME}"
|
||||
echo -e "\tOPENJDK_URL: ${OPENJDK_URL}"
|
||||
echo -e "\tCOMPRESSION: ${COMPRESSION}"
|
||||
echo -e "\tFILE_NAME_ROOT: ${FILE_NAME_ROOT}"
|
||||
echo -e "\tREPO_ROOT: ${REPO_ROOT}"
|
||||
echo -e "\tTO_COMPRESS: ${TO_COMPRESS}"
|
||||
echo -e "\tBOOT_JDK: ${BOOT_JDK}"
|
||||
|
||||
if [ -d ${FILE_NAME_ROOT} ] ; then
|
||||
echo "exists exists exists exists exists exists exists "
|
||||
echo "reusing reusing reusing reusing reusing reusing "
|
||||
echo ${FILE_NAME_ROOT}
|
||||
else
|
||||
mkdir "${FILE_NAME_ROOT}"
|
||||
pushd "${FILE_NAME_ROOT}"
|
||||
echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
|
||||
git clone -b ${VERSION} ${REPO_ROOT} ${VERSION}
|
||||
popd
|
||||
fi
|
||||
pushd "${FILE_NAME_ROOT}"
|
||||
# UnderlineTaglet.java has a BSD license with a field-of-use restriction, making it non-Free
|
||||
if [ -d ${VERSION}/test ] ; then
|
||||
echo "Removing langtools test case with non-Free license"
|
||||
rm -vf ${VERSION}/test/langtools/tools/javadoc/api/basic/taglets/UnderlineTaglet.java
|
||||
fi
|
||||
|
||||
# Generate .src-rev so build has knowledge of the revision the tarball was created from
|
||||
mkdir build
|
||||
pushd build
|
||||
sh ${PWD}/../${VERSION}/configure --with-boot-jdk=${BOOT_JDK}
|
||||
make store-source-revision
|
||||
popd
|
||||
rm -rf build
|
||||
|
||||
# Remove commit checks
|
||||
echo "Removing $(find ${VERSION} -name '.jcheck' -print)"
|
||||
find ${VERSION} -name '.jcheck' -print0 | xargs -0 rm -r
|
||||
|
||||
# Remove history and GHA
|
||||
echo "find ${VERSION} -name '.hgtags'"
|
||||
find ${VERSION} -name '.hgtags' -exec rm -v '{}' '+'
|
||||
echo "find ${VERSION} -name '.hgignore'"
|
||||
find ${VERSION} -name '.hgignore' -exec rm -v '{}' '+'
|
||||
echo "find ${VERSION} -name '.gitattributes'"
|
||||
find ${VERSION} -name '.gitattributes' -exec rm -v '{}' '+'
|
||||
echo "find ${VERSION} -name '.gitignore'"
|
||||
find ${VERSION} -name '.gitignore' -exec rm -v '{}' '+'
|
||||
echo "find ${VERSION} -name '.git'"
|
||||
find ${VERSION} -name '.git' -exec rm -rv '{}' '+'
|
||||
echo "find ${VERSION} -name '.github'"
|
||||
find ${VERSION} -name '.github' -exec rm -rv '{}' '+'
|
||||
|
||||
echo "Compressing remaining forest"
|
||||
if [ "X$COMPRESSION" = "Xxz" ] ; then
|
||||
SWITCH=cJf
|
||||
else
|
||||
SWITCH=czf
|
||||
fi
|
||||
TARBALL_NAME=${FILE_NAME_ROOT}.tar.${COMPRESSION}
|
||||
tar --exclude-vcs -$SWITCH ${TARBALL_NAME} $TO_COMPRESS
|
||||
mv ${TARBALL_NAME} ..
|
||||
popd
|
||||
echo "Done. You may want to remove the uncompressed version - $FILE_NAME_ROOT."
|
||||
59
get_sources.sh
Executable file
59
get_sources.sh
Executable file
@ -0,0 +1,59 @@
|
||||
#!/bin/sh
|
||||
|
||||
ID=${1}
|
||||
FEATUREVER=11
|
||||
|
||||
if [ "x${ID}" = "x" ] ; then
|
||||
echo "$0 <ID>";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
if [ "x${TMPDIR}" = "x" ] ; then
|
||||
TMPDIR=/tmp
|
||||
fi
|
||||
|
||||
downloaddir=${TMPDIR}/download.$$
|
||||
mkdir ${downloaddir}
|
||||
pushd ${downloaddir}
|
||||
echo "Downloading build ${ID} in ${downloaddir}";
|
||||
brew download-build ${ID}
|
||||
|
||||
versionregexp="[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*-[0-9]*"
|
||||
basename=$(ls|grep java-${FEATUREVER}-openjdk-portable-${versionregexp}.el7openjdkportable.x86_64.rpm)
|
||||
version=$(echo ${basename}|sed -r "s|^.*-(${versionregexp})\.el7.*$|\1|")
|
||||
|
||||
echo "Downloaded version ${version}"
|
||||
|
||||
# Remove stripped release builds for portable and JREs
|
||||
rm -vf java-${FEATUREVER}-openjdk-portable-${FEATUREVER}*
|
||||
rm -vf java-${FEATUREVER}-openjdk-portable-devel-${FEATUREVER}*
|
||||
rm -vf java-${FEATUREVER}-openjdk-portable-slowdebug-${FEATUREVER}*
|
||||
rm -vf java-${FEATUREVER}-openjdk-portable-fastdebug-${FEATUREVER}*
|
||||
|
||||
for file in *.rpm; do
|
||||
rpm2archive ${file};
|
||||
done
|
||||
|
||||
mkdir unpacked
|
||||
for file in *.tgz; do
|
||||
tar -C unpacked -xzf ${file};
|
||||
done
|
||||
|
||||
mkdir ${HOME}/${version}
|
||||
mv unpacked/usr/lib/jvm/* ${HOME}/${version}
|
||||
|
||||
pushd ${HOME}/${version}
|
||||
for file in *.sha256sum; do
|
||||
if ! sha256sum --check ${file} ; then
|
||||
echo "${file} failed checksum.";
|
||||
exit 2;
|
||||
fi
|
||||
done
|
||||
popd
|
||||
|
||||
rm -rf unpacked
|
||||
rm -vf *.tgz
|
||||
rm -vf *.rpm
|
||||
|
||||
popd
|
||||
|
||||
192
icedtea_sync.sh
Executable file
192
icedtea_sync.sh
Executable file
@ -0,0 +1,192 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Copyright (C) 2019 Red Hat, Inc.
|
||||
# Written by Andrew John Hughes <gnu.andrew@redhat.com>.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program 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 Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
ICEDTEA_USE_VCS=true
|
||||
|
||||
ICEDTEA_VERSION=3.15.0
|
||||
ICEDTEA_URL=https://icedtea.classpath.org/download/source
|
||||
ICEDTEA_SIGNING_KEY=CFDA0F9B35964222
|
||||
|
||||
ICEDTEA_HG_URL=https://icedtea.classpath.org/hg/icedtea11
|
||||
|
||||
set -e
|
||||
|
||||
RPM_DIR=${PWD}
|
||||
if [ ! -f ${RPM_DIR}/jconsole.desktop.in ] ; then
|
||||
echo "Not in RPM source tree.";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
if test "x${TMPDIR}" = "x"; then
|
||||
TMPDIR=/tmp;
|
||||
fi
|
||||
WORKDIR=${TMPDIR}/it.sync
|
||||
|
||||
echo "Using working directory ${WORKDIR}"
|
||||
mkdir ${WORKDIR}
|
||||
pushd ${WORKDIR}
|
||||
|
||||
if test "x${WGET}" = "x"; then
|
||||
WGET=$(which wget);
|
||||
if test "x${WGET}" = "x"; then
|
||||
echo "wget not found";
|
||||
exit 1;
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x${TAR}" = "x"; then
|
||||
TAR=$(which tar)
|
||||
if test "x${TAR}" = "x"; then
|
||||
echo "tar not found";
|
||||
exit 2;
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "Dependencies:";
|
||||
echo -e "\tWGET: ${WGET}";
|
||||
echo -e "\tTAR: ${TAR}\n";
|
||||
|
||||
if test "x${ICEDTEA_USE_VCS}" = "xtrue"; then
|
||||
echo "Mode: Using VCS";
|
||||
|
||||
if test "x${GREP}" = "x"; then
|
||||
GREP=$(which grep);
|
||||
if test "x${GREP}" = "x"; then
|
||||
echo "grep not found";
|
||||
exit 3;
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x${CUT}" = "x"; then
|
||||
CUT=$(which cut);
|
||||
if test "x${CUT}" = "x"; then
|
||||
echo "cut not found";
|
||||
exit 4;
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x${TR}" = "x"; then
|
||||
TR=$(which tr);
|
||||
if test "x${TR}" = "x"; then
|
||||
echo "tr not found";
|
||||
exit 5;
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x${HG}" = "x"; then
|
||||
HG=$(which hg);
|
||||
if test "x${HG}" = "x"; then
|
||||
echo "hg not found";
|
||||
exit 6;
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "Dependencies:";
|
||||
echo -e "\tGREP: ${GREP}";
|
||||
echo -e "\tCUT: ${CUT}";
|
||||
echo -e "\tTR: ${TR}";
|
||||
echo -e "\tHG: ${HG}";
|
||||
|
||||
echo "Checking out repository from VCS...";
|
||||
${HG} clone ${ICEDTEA_HG_URL} icedtea
|
||||
|
||||
echo "Obtaining version from configure.ac...";
|
||||
ROOT_VER=$(${GREP} '^AC_INIT' icedtea/configure.ac|${CUT} -d ',' -f 2|${TR} -d '[][:space:]')
|
||||
echo "Root version from configure: ${ROOT_VER}";
|
||||
|
||||
VCS_REV=$(${HG} log -R icedtea --template '{node|short}' -r tip)
|
||||
echo "VCS revision: ${VCS_REV}";
|
||||
|
||||
ICEDTEA_VERSION="${ROOT_VER}-${VCS_REV}"
|
||||
echo "Creating icedtea-${ICEDTEA_VERSION}";
|
||||
mkdir icedtea-${ICEDTEA_VERSION}
|
||||
echo "Copying required files from checkout to icedtea-${ICEDTEA_VERSION}";
|
||||
# Commented out for now as IcedTea 6's jconsole.desktop.in is outdated
|
||||
#cp -a icedtea/jconsole.desktop.in ../icedtea-${ICEDTEA_VERSION}
|
||||
cp -a ${RPM_DIR}/jconsole.desktop.in icedtea-${ICEDTEA_VERSION}
|
||||
cp -a icedtea/tapset icedtea-${ICEDTEA_VERSION}
|
||||
|
||||
rm -rf icedtea
|
||||
else
|
||||
echo "Mode: Using tarball";
|
||||
|
||||
if test "x${ICEDTEA_VERSION}" = "x"; then
|
||||
echo "No IcedTea version specified for tarball download.";
|
||||
exit 3;
|
||||
fi
|
||||
|
||||
if test "x${CHECKSUM}" = "x"; then
|
||||
CHECKSUM=$(which sha256sum)
|
||||
if test "x${CHECKSUM}" = "x"; then
|
||||
echo "sha256sum not found";
|
||||
exit 4;
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x${PGP}" = "x"; then
|
||||
PGP=$(which gpg)
|
||||
if test "x${PGP}" = "x"; then
|
||||
echo "gpg not found";
|
||||
exit 5;
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "Dependencies:";
|
||||
echo -e "\tCHECKSUM: ${CHECKSUM}";
|
||||
echo -e "\tPGP: ${PGP}\n";
|
||||
|
||||
echo "Checking for IcedTea signing key ${ICEDTEA_SIGNING_KEY}...";
|
||||
if ! gpg --list-keys ${ICEDTEA_SIGNING_KEY}; then
|
||||
echo "IcedTea signing key ${ICEDTEA_SIGNING_KEY} not installed.";
|
||||
exit 6;
|
||||
fi
|
||||
|
||||
echo "Downloading IcedTea release tarball...";
|
||||
${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz
|
||||
echo "Downloading IcedTea tarball signature...";
|
||||
${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz.sig
|
||||
echo "Downloading IcedTea tarball checksums...";
|
||||
${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.sha256
|
||||
|
||||
echo "Verifying checksums...";
|
||||
${CHECKSUM} --check --ignore-missing icedtea-${ICEDTEA_VERSION}.sha256
|
||||
|
||||
echo "Checking signature...";
|
||||
${PGP} --verify icedtea-${ICEDTEA_VERSION}.tar.xz.sig
|
||||
|
||||
echo "Extracting files...";
|
||||
${TAR} xJf icedtea-${ICEDTEA_VERSION}.tar.xz \
|
||||
icedtea-${ICEDTEA_VERSION}/tapset \
|
||||
icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in
|
||||
|
||||
rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz
|
||||
rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz.sig
|
||||
rm -vf icedtea-${ICEDTEA_VERSION}.sha256
|
||||
fi
|
||||
|
||||
echo "Replacing desktop files...";
|
||||
mv -v icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in ${RPM_DIR}
|
||||
|
||||
echo "Creating new tapset tarball...";
|
||||
mv -v icedtea-${ICEDTEA_VERSION} openjdk
|
||||
${TAR} cJf ${RPM_DIR}/tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz openjdk
|
||||
|
||||
rm -rvf openjdk
|
||||
|
||||
popd
|
||||
rm -rf ${WORKDIR}
|
||||
@ -1,4 +1,4 @@
|
||||
## debug_package %%{nil} is portable-jdks specific
|
||||
# debug_package %%{nil} is portable-jdks specific
|
||||
%define debug_package %{nil}
|
||||
|
||||
# RPM conditionals so as to be able to dynamically produce
|
||||
@ -25,7 +25,7 @@
|
||||
# Enable static library builds by default.
|
||||
%bcond_without staticlibs
|
||||
# Remove build artifacts by default
|
||||
%bcond_without artifacts
|
||||
%bcond_with artifacts
|
||||
# Build a fresh libjvm.so for use in a copy of the bootstrap JDK
|
||||
%bcond_without fresh_libjvm
|
||||
# Build with system libraries
|
||||
@ -147,8 +147,6 @@
|
||||
%global zgc_arches x86_64
|
||||
# Set of architectures for which alt-java has SSB mitigation
|
||||
%global ssbd_arches x86_64
|
||||
# Architecture on which we run Java only tests
|
||||
%global jdk_test_arch x86_64
|
||||
# Set of architectures where we verify backtraces with gdb
|
||||
# s390x fails on RHEL 7 so we exclude it there
|
||||
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
|
||||
@ -341,7 +339,7 @@
|
||||
# New Version-String scheme-style defines
|
||||
%global featurever 11
|
||||
%global interimver 0
|
||||
%global updatever 25
|
||||
%global updatever 21
|
||||
%global patchver 0
|
||||
# buildjdkver is usually same as %%{featurever},
|
||||
# but in time of bootstrap of next jdk, it is featurever-1,
|
||||
@ -573,7 +571,7 @@ Source0: openjdk-jdk%{featurever}u-%{vcstag}.tar.xz
|
||||
# Use 'icedtea_sync.sh' to update the following
|
||||
# They are based on code contained in the IcedTea project (6.x).
|
||||
# Systemtap tapsets. Zipped up to keep it small.
|
||||
Source8: tapsets-icedtea-%{icedteaver}.tar.xz
|
||||
Source8: tapsets-icedtea-%%{icedteaver}.tar.xz
|
||||
|
||||
# Desktop files. Adapted from IcedTea
|
||||
# Disabled in portables
|
||||
@ -675,13 +673,25 @@ Patch2002: jdk8242332-rh2108712-sha3-sunpkcs11.patch
|
||||
|
||||
#############################################
|
||||
#
|
||||
# Patches appearing in 11.0.23
|
||||
# Patches appearing in 11.0.21
|
||||
#
|
||||
# This section includes patches which are present
|
||||
# in the listed OpenJDK 11u release and should be
|
||||
# able to be removed once that release is out
|
||||
# and used by this RPM.
|
||||
#############################################
|
||||
|
||||
#############################################
|
||||
#
|
||||
# Patches appearing in 11.0.22
|
||||
#
|
||||
# This section includes patches which are present
|
||||
# in the listed OpenJDK 8u release and should be
|
||||
# able to be removed once that release is out
|
||||
# and used by this RPM.
|
||||
#############################################
|
||||
# JDK-8312489, OJ2095: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar
|
||||
Patch2000: jdk8312489-max_sig_default_increase.patch
|
||||
|
||||
#############################################
|
||||
#
|
||||
@ -728,6 +738,8 @@ BuildRequires: java-%{buildjdkver}-openjdk-devel
|
||||
%ifarch %{zero_arches}
|
||||
BuildRequires: libffi-devel
|
||||
%endif
|
||||
# 2023c required as of JDK-8305113
|
||||
BuildRequires: tzdata-java >= 2023c
|
||||
# cacerts build requirement in portable mode
|
||||
BuildRequires: ca-certificates
|
||||
# Earlier versions have a bug in tree vectorization on PPC
|
||||
@ -745,22 +757,19 @@ BuildRequires: harfbuzz-devel
|
||||
BuildRequires: lcms2-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: zlib-devel
|
||||
%else
|
||||
# Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h
|
||||
Provides: bundled(freetype) = 2.13.2
|
||||
Provides: bundled(freetype) = 2.13.0
|
||||
# Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
|
||||
Provides: bundled(giflib) = 5.2.2
|
||||
Provides: bundled(giflib) = 5.2.1
|
||||
# Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
|
||||
Provides: bundled(harfbuzz) = 8.2.2
|
||||
Provides: bundled(harfbuzz) = 7.2.0
|
||||
# Version in src/java.desktop/share/native/liblcms/lcms2.h
|
||||
Provides: bundled(lcms2) = 2.16.0
|
||||
Provides: bundled(lcms2) = 2.15.0
|
||||
# Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
|
||||
Provides: bundled(libjpeg) = 6b
|
||||
# Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h
|
||||
Provides: bundled(libpng) = 1.6.43
|
||||
# Version in src/java.base/share/native/libzip/zlib/zlib.h
|
||||
Provides: bundled(zlib) = 1.3.1
|
||||
Provides: bundled(libpng) = 1.6.39
|
||||
# We link statically against libstdc++ to increase portability
|
||||
BuildRequires: libstdc++-static
|
||||
%endif
|
||||
@ -950,18 +959,20 @@ sh %{SOURCE12} %{top_level_dir_name}
|
||||
|
||||
# Patch the JDK
|
||||
pushd %{top_level_dir_name}
|
||||
%patch -P1 -p1
|
||||
%patch -P3 -p1
|
||||
%patch1 -p1
|
||||
%patch3 -p1
|
||||
# Add crypto policy and FIPS support
|
||||
%patch -P1001 -p1
|
||||
%patch1001 -p1
|
||||
# nss.cfg PKCS11 support; must come last as it also alters java.security
|
||||
%patch -P1000 -p1
|
||||
%patch1000 -p1
|
||||
# JDK-8312489 backport, coming in 11.0.22
|
||||
%patch2000 -p1
|
||||
# PKCS11 SHA3 backport
|
||||
%patch -P2002 -p1
|
||||
%patch2002 -p1
|
||||
# alt-java
|
||||
%patch -P600 -p1
|
||||
%patch600 -p1
|
||||
# RSA default
|
||||
%patch -P1003 -p1
|
||||
%patch1003 -p1
|
||||
popd # openjdk
|
||||
|
||||
|
||||
@ -1065,6 +1076,9 @@ function buildjdk() {
|
||||
bash ${top_dir_abs_src_path}/configure \
|
||||
%ifarch %{zero_arches}
|
||||
--with-jvm-variants=zero \
|
||||
%endif
|
||||
%ifarch %{ppc64le}
|
||||
--with-jobs=1 \
|
||||
%endif
|
||||
--with-cacerts-file=`readlink -f %{_sysconfdir}/pki/java/cacerts` \
|
||||
--with-version-build=%{buildver} \
|
||||
@ -1111,14 +1125,13 @@ function stripjdk() {
|
||||
local jreimagepath=${outputdir}/images/%{jreimage}
|
||||
local jmodimagepath=${outputdir}/images/jmods
|
||||
local supportdir=${outputdir}/support
|
||||
local modulefile=lib/modules
|
||||
|
||||
if [ "x$suffix" = "x" ] ; then
|
||||
# Keep the unstripped version for consumption by RHEL RPMs
|
||||
cp -a ${jdkimagepath}{,.unstripped}
|
||||
|
||||
# Strip libraries and executables
|
||||
for file in $(find ${jdkimagepath} ${jreimagepath} ${supportdir} -type f | grep -v '\.o$' | grep -v '\.debuginfo$' | grep -v '\.class$' ) ; do
|
||||
# Strip the files
|
||||
for file in $(find ${jdkimagepath} ${jreimagepath} ${supportdir} -type f) ; do
|
||||
if file ${file} | grep -q 'ELF'; then
|
||||
noextfile=${file/.so/};
|
||||
objcopy --only-keep-debug ${file} ${noextfile}.debuginfo;
|
||||
@ -1132,8 +1145,7 @@ function stripjdk() {
|
||||
echo "Support directory missing.";
|
||||
exit 15
|
||||
fi
|
||||
echo "Rebuilding jmod files against the stripped binaries"
|
||||
for cmd in $(find ${supportdir}/jmods -name '*.jmod.cmdline') ; do
|
||||
for cmd in $(find ${supportdir} -name '*.jmod.cmdline') ; do
|
||||
jmod=$(cat ${cmd} | sed -r 's|.*support/(.*$)|\1|');
|
||||
echo "Rebuilding ${jmod} against stripped binaries...";
|
||||
echo "Removing old jmod ${jmod}...";
|
||||
@ -1141,36 +1153,9 @@ function stripjdk() {
|
||||
rm -vf ${jdkimagepath}/jmods/$(basename ${jmod});
|
||||
echo "Executing $(cat ${cmd})...";
|
||||
cat ${cmd} | sh -s ;
|
||||
echo "Moving jmod to image and image/jmods...";
|
||||
cp -v ${supportdir}/${jmod} ${jmodimagepath};
|
||||
echo "Moving jmod to image...";
|
||||
mv -v ${supportdir}/${jmod} ${jdkimagepath}/jmods;
|
||||
done
|
||||
echo "Rebuilding images with stripped modules..."
|
||||
for image in %{jdkimage} %{jreimage} ; do
|
||||
outdir=${outputdir}/images/${image};
|
||||
jlink=${supportdir}/images/${image}.cmdline;
|
||||
echo "Running ${jlink}..."
|
||||
if [ ! -f ${jlink} ]; then
|
||||
echo "Cannot find JLINK command: ${jlink}"
|
||||
echo "Supportdir images contains:"
|
||||
ls -ali ${supportdir}/images
|
||||
exit 16
|
||||
fi
|
||||
# Backup the existing image as it contains files not generated by jlink
|
||||
mv ${outdir}{,.bak}
|
||||
# Regenerate the image using the command generated using the initial build
|
||||
cat ${jlink} | sh -s;
|
||||
# Move the new jmods and module file from the new image to the old one
|
||||
if [ -e ${outdir}.bak/jmods ]; then
|
||||
rm -rf ${outdir}.bak/jmods;
|
||||
mv -vf ${outdir}/jmods ${outdir}.bak;
|
||||
fi
|
||||
# ... and move the modulefile too...
|
||||
mv -vf ${outdir}/${modulefile} ${outdir}.bak/$(dirname ${modulefile});
|
||||
# Restore the original image
|
||||
rm -rf ${outdir};
|
||||
mv -vf ${outdir}{.bak,};
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
@ -1263,10 +1248,17 @@ function packagejdk() {
|
||||
jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
|
||||
staticname=%{staticlibsportablename -- "$nameSuffix"}
|
||||
staticarchive=${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
|
||||
debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
|
||||
unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
|
||||
# We only use docs for the release build
|
||||
docname=%{docportablename}
|
||||
docarchive=${packagesdir}/%{docportablearchive}
|
||||
built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
|
||||
# These are from the source tree so no debug variants
|
||||
miscname=%{miscportablename}
|
||||
miscarchive=${packagesdir}/%{miscportablearchive}
|
||||
|
||||
if [ "x$suffix" = "x" ] ; then
|
||||
unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
|
||||
|
||||
# Keep the unstripped version for consumption by RHEL RPMs
|
||||
mv %{jdkimage}.unstripped ${jdkname}
|
||||
tar -cJf ${unstrippedarchive} ${jdkname}
|
||||
@ -1280,15 +1272,6 @@ function packagejdk() {
|
||||
|
||||
# Release images have external debug symbols
|
||||
if [ "x$suffix" = "x" ] ; then
|
||||
debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
|
||||
# We only use docs for the release build
|
||||
docname=%{docportablename}
|
||||
docarchive=${packagesdir}/%{docportablearchive}
|
||||
built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
|
||||
# These are from the source tree so no debug variants
|
||||
miscname=%{miscportablename}
|
||||
miscarchive=${packagesdir}/%{miscportablearchive}
|
||||
|
||||
tar -cJf ${debugarchive} $(find ${jdkname} -name \*.debuginfo)
|
||||
genchecksum ${debugarchive}
|
||||
|
||||
@ -1421,58 +1404,48 @@ export JAVA_HOME=${top_dir_abs_main_build_path}/images/%{jdkimage}
|
||||
$JAVA_HOME//bin/java -XX:+UseShenandoahGC -version
|
||||
%endif
|
||||
|
||||
# Only test on one architecture (the fastest) for Java only tests
|
||||
%ifarch %{jdk_test_arch}
|
||||
# Check unlimited policy has been used
|
||||
$JAVA_HOME/bin/javac -d . %{SOURCE13}
|
||||
$JAVA_HOME/bin/java --add-opens java.base/javax.crypto=ALL-UNNAMED TestCryptoLevel
|
||||
|
||||
# Check unlimited policy has been used
|
||||
$JAVA_HOME/bin/javac -d . %{SOURCE13}
|
||||
$JAVA_HOME/bin/java --add-opens java.base/javax.crypto=ALL-UNNAMED TestCryptoLevel
|
||||
# Check ECC is working
|
||||
$JAVA_HOME/bin/javac -d . %{SOURCE14}
|
||||
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||")
|
||||
|
||||
# Check ECC is working
|
||||
$JAVA_HOME/bin/javac -d . %{SOURCE14}
|
||||
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||")
|
||||
# Check system crypto (policy) is active and can be disabled
|
||||
# Test takes a single argument - true or false - to state whether system
|
||||
# security properties are enabled or not.
|
||||
$JAVA_HOME/bin/javac -d . %{SOURCE15}
|
||||
export PROG=$(echo $(basename %{SOURCE15})|sed "s|\.java||")
|
||||
export SEC_DEBUG="-Djava.security.debug=properties"
|
||||
#Portable specific: set false whereas its true for upstream
|
||||
$JAVA_HOME/bin/java ${SEC_DEBUG} ${PROG} false
|
||||
$JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=true ${PROG} false
|
||||
|
||||
# Check system crypto (policy) is active and can be disabled
|
||||
# Test takes a single argument - true or false - to state whether system
|
||||
# security properties are enabled or not.
|
||||
$JAVA_HOME/bin/javac -d . %{SOURCE15}
|
||||
export PROG=$(echo $(basename %{SOURCE15})|sed "s|\.java||")
|
||||
export SEC_DEBUG="-Djava.security.debug=properties"
|
||||
#Portable specific: set false whereas its true for upstream
|
||||
$JAVA_HOME/bin/java ${SEC_DEBUG} ${PROG} false
|
||||
$JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=true ${PROG} false
|
||||
# Check correct vendor values have been set
|
||||
$JAVA_HOME/bin/javac -d . %{SOURCE16}
|
||||
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
|
||||
|
||||
# Check correct vendor values have been set
|
||||
$JAVA_HOME/bin/javac -d . %{SOURCE16}
|
||||
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
|
||||
|
||||
# Check java launcher has no SSB mitigation
|
||||
if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
|
||||
|
||||
# Check alt-java launcher has SSB mitigation on supported architectures
|
||||
%ifarch %{ssbd_arches}
|
||||
nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation
|
||||
%else
|
||||
if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi
|
||||
%endif
|
||||
|
||||
# Check translations are available for new timezones
|
||||
$JAVA_HOME/bin/javac -d . %{SOURCE18}
|
||||
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE
|
||||
$JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR
|
||||
|
||||
%if %{include_staticlibs}
|
||||
# Check debug symbols in static libraries (smoke test)
|
||||
export STATIC_LIBS_HOME=${top_dir_abs_staticlibs_build_path}/images/%{static_libs_image}
|
||||
readelf --debug-dump $STATIC_LIBS_HOME/lib/libfdlibm.a | grep w_remainder.c
|
||||
readelf --debug-dump $STATIC_LIBS_HOME/lib/libfdlibm.a | grep e_remainder.c
|
||||
%endif
|
||||
# Check java launcher has no SSB mitigation
|
||||
if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
|
||||
|
||||
# Check alt-java launcher has SSB mitigation on supported architectures
|
||||
%ifarch %{ssbd_arches}
|
||||
nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation
|
||||
%else
|
||||
if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi
|
||||
%endif
|
||||
|
||||
# Just run a basic java -version test on other architectures
|
||||
$JAVA_HOME/bin/java -version
|
||||
# Check translations are available for new timezones
|
||||
$JAVA_HOME/bin/javac -d . %{SOURCE18}
|
||||
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE
|
||||
$JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR
|
||||
|
||||
%if %{include_staticlibs}
|
||||
# Check debug symbols in static libraries (smoke test)
|
||||
export STATIC_LIBS_HOME=${top_dir_abs_staticlibs_build_path}/images/%{static_libs_image}
|
||||
readelf --debug-dump $STATIC_LIBS_HOME/lib/libfdlibm.a | grep w_remainder.c
|
||||
readelf --debug-dump $STATIC_LIBS_HOME/lib/libfdlibm.a | grep e_remainder.c
|
||||
%endif
|
||||
|
||||
# Release builds strip the debug symbols into external .debuginfo files
|
||||
@ -1574,10 +1547,12 @@ for suffix in %{build_loop} ; do
|
||||
nameSuffix=`echo "$suffix"| sed s/-/./`
|
||||
fi
|
||||
|
||||
# These definitions should match those in packagejdk
|
||||
# These definitions should match those in installjdk
|
||||
jdkarchive=${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
|
||||
jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
|
||||
staticarchive=${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
|
||||
debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
|
||||
unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
|
||||
|
||||
@ -1592,23 +1567,23 @@ for suffix in %{build_loop} ; do
|
||||
%endif
|
||||
|
||||
if [ "x$suffix" = "x" ] ; then
|
||||
# These definitions should match those in packagejdk
|
||||
debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
|
||||
unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
|
||||
docarchive=${packagesdir}/%{docportablearchive}
|
||||
miscarchive=${packagesdir}/%{miscportablearchive}
|
||||
|
||||
mv ${debugarchive} $RPM_BUILD_ROOT%{_jvmdir}/
|
||||
mv ${debugarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
|
||||
mv ${unstrippedarchive} $RPM_BUILD_ROOT%{_jvmdir}/
|
||||
mv ${unstrippedarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
|
||||
mv ${docarchive} $RPM_BUILD_ROOT%{_jvmdir}/
|
||||
mv ${docarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
|
||||
mv ${miscarchive} $RPM_BUILD_ROOT%{_jvmdir}/
|
||||
mv ${miscarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
|
||||
fi
|
||||
done
|
||||
|
||||
# These definitions should match those in installjdk
|
||||
# Install outside the loop as there are no debug variants
|
||||
docarchive=${packagesdir}/%{docportablearchive}
|
||||
miscarchive=${packagesdir}/%{miscportablearchive}
|
||||
|
||||
mv ${docarchive} $RPM_BUILD_ROOT%{_jvmdir}/
|
||||
mv ${docarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
|
||||
mv ${miscarchive} $RPM_BUILD_ROOT%{_jvmdir}/
|
||||
mv ${miscarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
|
||||
|
||||
# To show sha in the build log
|
||||
for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do
|
||||
ls -l $file ;
|
||||
@ -1626,8 +1601,6 @@ done
|
||||
# placeholder
|
||||
%endif
|
||||
|
||||
%if %{include_normal_build}
|
||||
|
||||
%files devel
|
||||
%{_jvmdir}/%{jdkportablearchive -- %%{nil}}
|
||||
%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
|
||||
@ -1644,16 +1617,6 @@ done
|
||||
%{_jvmdir}/%{jdkportablearchive -- .unstripped}
|
||||
%{_jvmdir}/%{jdkportablearchive -- .unstripped}.sha256sum
|
||||
|
||||
%files docs
|
||||
%{_jvmdir}/%{docportablearchive}
|
||||
%{_jvmdir}/%{docportablearchive}.sha256sum
|
||||
|
||||
%files misc
|
||||
%{_jvmdir}/%{miscportablearchive}
|
||||
%{_jvmdir}/%{miscportablearchive}.sha256sum
|
||||
|
||||
%endif
|
||||
|
||||
%if %{include_debug_build}
|
||||
|
||||
%files slowdebug
|
||||
@ -1690,116 +1653,16 @@ done
|
||||
|
||||
%endif
|
||||
|
||||
%files docs
|
||||
%{_jvmdir}/%{docportablearchive}
|
||||
%{_jvmdir}/%{docportablearchive}.sha256sum
|
||||
|
||||
%files misc
|
||||
%{_jvmdir}/%{miscportablearchive}
|
||||
%{_jvmdir}/%{miscportablearchive}.sha256sum
|
||||
|
||||
%changelog
|
||||
* Thu Oct 10 2024 Antonio Vieiro <avieirov@redhat.com> - 1:11.0.25.0.9-1
|
||||
- Update to jdk-11.0.25+9 (GA)
|
||||
- Update release notes to 11.0.25+9
|
||||
- Switch to GA mode for release
|
||||
- Resolves: OPENJDK-3090
|
||||
- ** This tarball is embargoed until 2024-10-15 @ 1pm PT. **
|
||||
|
||||
* Mon Oct 07 2024 Antonio Vieiro <avieirov@redhat.com> - 1:11.0.25.0.8-0.2.ea
|
||||
- Updated NEWS
|
||||
- Using %bcond_without artifacts
|
||||
|
||||
* Wed Oct 02 2024 Antonio Vieiro <avieirov@redhat.com> - 1:11.0.25.0.8-0.1.ea
|
||||
- Update to jdk-11.0.25+8 (EA)
|
||||
- Update release notes to 11.0.25+8
|
||||
|
||||
* Thu Sep 26 2024 Antonio Vieiro <avieirov@redhat.com> - 1:11.0.25.0.7-0.1.ea
|
||||
- Update to jdk-11.0.25+7 (EA)
|
||||
- Update release notes to 11.0.25+7
|
||||
|
||||
* Thu Sep 12 2024 Antonio Vieiro <avieirov@redhat.com> - 1:11.0.25.0.6-0.1.ea
|
||||
- Update to jdk-11.0.25+6 (EA)
|
||||
- Update release notes to 11.0.25+6
|
||||
|
||||
* Thu Sep 05 2024 Antonio Vieiro <avieirov@redhat.com> - 1:11.0.25.0.5-0.1.ea
|
||||
- Update to jdk-11.0.25+5 (EA)
|
||||
- Update release notes to 11.0.25+5
|
||||
- Switch to EA mode
|
||||
- Bump giflib version to 5.2.2 following JDK-8328999
|
||||
- Bump libpng version to 1.6.43 following JDK-8329004
|
||||
|
||||
* Mon Aug 26 2024 Antonio Vieiro <avieirov@redhat.com> - 1:11.0.24.0.8-6
|
||||
- Add missing modulefile in stripjdk
|
||||
- Skip `.o` and others in stripping loop
|
||||
- Resolves: OPENJDK-3056
|
||||
|
||||
* Tue Aug 20 2024 Antonio Vieiro <avieirov@redhat.com> - 1:11.0.24.0.8-5
|
||||
- Limit Java only tests to one 'jdk_test_arch'
|
||||
- Resolves: OPENJDK-3184
|
||||
|
||||
* Mon Aug 19 2024 Antonio Vieiro <avieirov@redhat.com> - 1:11.0.24.0.8-4
|
||||
- Rebuild the lib/modules jimage against the updated jmods
|
||||
- Resolves: OPENJDK-3056
|
||||
|
||||
* Fri Jul 26 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.24.0.8-2
|
||||
- Drop unneeded tzdata-java build dependency following 3e3cf8fa2df7bac2f6a60a0ddd596ec39228a3e1
|
||||
- Resolves: OPENJDK-3192
|
||||
|
||||
* Fri Jul 26 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.24.0.8-2
|
||||
- Move unstripped, misc and doc tarball handling into normal build / no suffix blocks
|
||||
- Resolves: OPENJDK-3217
|
||||
|
||||
* Wed Jul 10 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.24.0.8-2
|
||||
- Adjusted DTLS & RPATH NEWS entries to match OpenJDK 17 & 21 release notes
|
||||
|
||||
* Wed Jul 10 2024 Anton Bobrov <abobrov@redhat.com> - 1:11.0.24.0.8-1
|
||||
- Update to jdk-11.0.24+8 (GA)
|
||||
- Update release notes to 11.0.24+8
|
||||
- Switch to GA mode for release
|
||||
- ** This tarball is embargoed until 2024-07-16 @ 1pm PT. **
|
||||
|
||||
* Mon Jun 24 2024 Anton Bobrov <abobrov@redhat.com> - 1:11.0.24.0.6-0.2.ea
|
||||
- Add zlib build required or bundled version (1.3.1), depending on system_libs setting
|
||||
- Related: OPENJDK-3066
|
||||
|
||||
* Thu Jun 06 2024 Anton Bobrov <abobrov@redhat.com> - 1:11.0.24.0.6-0.1.ea
|
||||
- Update to jdk-11.0.24+6 (EA)
|
||||
- Update release notes to 11.0.24+6
|
||||
- Switch to EA mode
|
||||
- Update LCMS to 2.16 (JDK-8321489)
|
||||
- Improve VCS exclusion in generate_source_tarball.sh script
|
||||
- Bring outdated patch macros in the spec file up to date
|
||||
|
||||
* Thu Apr 18 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.23.0.9-3
|
||||
- Sync release notes with upstream version: https://bit.ly/openjdk11023
|
||||
|
||||
* Thu Apr 11 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.23.0.9-2
|
||||
- Fix 11.0.22 release date in NEWS
|
||||
|
||||
* Wed Apr 10 2024 Anton Bobrov <abobrov@redhat.com> - 1:11.0.23.0.9-1
|
||||
- Update to jdk-11.0.23+9 (GA)
|
||||
- Update release notes to 11.0.23+9
|
||||
- Switch to GA mode for release
|
||||
- Require tzdata 2024a due to upstream inclusion of JDK-8322725
|
||||
- Only require tzdata 2023d for now as 2024a is unavailable in buildroot
|
||||
- Speed up PPC build by removing ppc64le --with-jobs=1 workaround
|
||||
- ** This tarball is embargoed until 2024-04-16 @ 1pm PT. **
|
||||
|
||||
* Thu Mar 21 2024 Anton Bobrov <abobrov@redhat.com> - 1:11.0.23.0.1-0.1.ea
|
||||
- Update to jdk-11.0.23+1 (EA)
|
||||
- Update release notes to 11.0.23+1
|
||||
- Switch to EA mode
|
||||
|
||||
* Wed Jan 10 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.22.0.7-1
|
||||
- Update to jdk-11.0.22+7 (GA)
|
||||
- Update release notes to 11.0.22+7
|
||||
- Switch to GA mode for release
|
||||
- ** This tarball is embargoed until 2024-01-16 @ 1pm PT. **
|
||||
|
||||
* Mon Jan 08 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.22.0.6-0.1.ea
|
||||
- Update to jdk-11.0.22+6 (EA)
|
||||
- Update release notes to 11.0.22+6
|
||||
|
||||
* Thu Jan 04 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.22.0.1-0.1.ea
|
||||
- Update to jdk-11.0.22+1 (EA)
|
||||
- Update release notes to 11.0.22+1
|
||||
- Switch to EA mode
|
||||
- Drop local copy of JDK-8312489 which is now included upstream
|
||||
|
||||
* Wed Oct 11 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.21.0.9-1
|
||||
* Wed Feb 12 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.21.0.9-1
|
||||
- Update to jdk-11.0.21+9 (GA)
|
||||
- Update release notes to 11.0.21+9
|
||||
- Switch to GA mode for release
|
||||
@ -1807,7 +1670,7 @@ done
|
||||
- Bump freetype version to 2.13.0 following JDK-8306881
|
||||
- ** This tarball is embargoed until 2023-10-17 @ 1pm PT. **
|
||||
|
||||
* Thu Oct 05 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.21.0.1-0.1.ea
|
||||
* Wed Feb 12 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.21.0.1-0.1.ea
|
||||
- Update to jdk-11.0.21+1 (EA)
|
||||
- Update release notes to 11.0.21+1
|
||||
- Switch to EA mode
|
||||
@ -1820,6 +1683,9 @@ done
|
||||
- Change top_level_dir_name to use the VCS tag, matching new upstream release style tarball
|
||||
- Apply all patches using -p1
|
||||
|
||||
* Thu May 02 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.20.1.1-2
|
||||
- Bump rpmrelease to rebuild for CentOS 9
|
||||
|
||||
* Tue Sep 05 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.20.1.1-1
|
||||
- Update to jdk-11.0.20.1+1 (GA)
|
||||
- Update release notes to 11.0.20.1+1
|
||||
File diff suppressed because it is too large
Load Diff
50
jdk8312489-max_sig_default_increase.patch
Normal file
50
jdk8312489-max_sig_default_increase.patch
Normal file
@ -0,0 +1,50 @@
|
||||
commit 50074a04e62f91faa080b831d9ce343396ead252
|
||||
Author: Andrew John Hughes <andrew@openjdk.org>
|
||||
Date: Tue Sep 5 20:48:42 2023 +0000
|
||||
|
||||
8312489: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar
|
||||
|
||||
Backport-of: e47a84f23dd2608c6f5748093eefe301fb5bf750
|
||||
|
||||
diff --git a/src/java.base/share/classes/java/util/jar/JarFile.java b/src/java.base/share/classes/java/util/jar/JarFile.java
|
||||
index cb7e308e0d..cce897c0d3 100644
|
||||
--- a/src/java.base/share/classes/java/util/jar/JarFile.java
|
||||
+++ b/src/java.base/share/classes/java/util/jar/JarFile.java
|
||||
@@ -809,7 +809,9 @@ class JarFile extends ZipFile {
|
||||
throw new IOException("Unsupported size: " + uncompressedSize +
|
||||
" for JarEntry " + ze.getName() +
|
||||
". Allowed max size: " +
|
||||
- SignatureFileVerifier.MAX_SIG_FILE_SIZE + " bytes");
|
||||
+ SignatureFileVerifier.MAX_SIG_FILE_SIZE + " bytes. " +
|
||||
+ "You can use the jdk.jar.maxSignatureFileSize " +
|
||||
+ "system property to increase the default value.");
|
||||
}
|
||||
int len = (int)uncompressedSize;
|
||||
int bytesRead;
|
||||
diff --git a/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
|
||||
index cb477fc134..a766b8249f 100644
|
||||
--- a/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
|
||||
+++ b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java
|
||||
@@ -852,16 +852,16 @@ public class SignatureFileVerifier {
|
||||
* the maximum allowed number of bytes for the signature-related files
|
||||
* in a JAR file.
|
||||
*/
|
||||
- Integer tmp = GetIntegerAction.privilegedGetProperty(
|
||||
- "jdk.jar.maxSignatureFileSize", 8000000);
|
||||
+ int tmp = GetIntegerAction.privilegedGetProperty(
|
||||
+ "jdk.jar.maxSignatureFileSize", 16000000);
|
||||
if (tmp < 0 || tmp > MAX_ARRAY_SIZE) {
|
||||
if (debug != null) {
|
||||
- debug.println("Default signature file size 8000000 bytes " +
|
||||
- "is used as the specified size for the " +
|
||||
- "jdk.jar.maxSignatureFileSize system property " +
|
||||
+ debug.println("The default signature file size of 16000000 bytes " +
|
||||
+ "will be used for the jdk.jar.maxSignatureFileSize " +
|
||||
+ "system property since the specified value " +
|
||||
"is out of range: " + tmp);
|
||||
}
|
||||
- tmp = 8000000;
|
||||
+ tmp = 16000000;
|
||||
}
|
||||
return tmp;
|
||||
}
|
||||
76
openjdk_news.sh
Executable file
76
openjdk_news.sh
Executable file
@ -0,0 +1,76 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Copyright (C) 2022 Red Hat, Inc.
|
||||
# Written by Andrew John Hughes <gnu.andrew@redhat.com>, 2012-2022
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program 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 Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
OLD_RELEASE=$1
|
||||
NEW_RELEASE=$2
|
||||
REPO=$3
|
||||
SUBDIR=$4
|
||||
SCRIPT_DIR=$(dirname ${0})
|
||||
|
||||
if test "x${SUBDIR}" = "x"; then
|
||||
echo "No subdirectory specified; using .";
|
||||
SUBDIR=".";
|
||||
fi
|
||||
|
||||
if test "x$REPO" = "x"; then
|
||||
echo "No repository specified; using ${PWD}"
|
||||
REPO=${PWD}
|
||||
fi
|
||||
|
||||
if test x${TMPDIR} = x; then
|
||||
TMPDIR=/tmp;
|
||||
fi
|
||||
|
||||
echo "Repository: ${REPO}"
|
||||
|
||||
if [ -e ${REPO}/.git ] ; then
|
||||
TYPE=git;
|
||||
elif [ -e ${REPO}/.hg ] ; then
|
||||
TYPE=hg;
|
||||
else
|
||||
echo "No Mercurial or Git repository detected.";
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
if test "x$OLD_RELEASE" = "x" || test "x$NEW_RELEASE" = "x"; then
|
||||
echo "ERROR: Need to specify old and new release";
|
||||
exit 2;
|
||||
fi
|
||||
|
||||
echo "Listing fixes between $OLD_RELEASE and $NEW_RELEASE in $REPO"
|
||||
rm -f ${TMPDIR}/fixes2 ${TMPDIR}/fixes3 ${TMPDIR}/fixes
|
||||
for repos in . $(${SCRIPT_DIR}/discover_trees.sh ${REPO});
|
||||
do
|
||||
if test "x$TYPE" = "xhg"; then
|
||||
hg log -r "tag('$NEW_RELEASE'):tag('$OLD_RELEASE') - tag('$OLD_RELEASE')" -R $REPO/$repos -G -M ${REPO}/${SUBDIR} | \
|
||||
egrep '^[o:| ]*summary'|grep -v 'Added tag'|sed -r 's#^[o:| ]*summary:\W*([0-9])# - JDK-\1#'| \
|
||||
sed 's#^[o:| ]*summary:\W*# - #' >> ${TMPDIR}/fixes2;
|
||||
hg log -v -r "tag('$NEW_RELEASE'):tag('$OLD_RELEASE') - tag('$OLD_RELEASE')" -R $REPO/$repos -G -M ${REPO}/${SUBDIR} | \
|
||||
egrep '^[o:| ]*[0-9]{7}'|sed -r 's#^[o:| ]*([0-9]{7})# - JDK-\1#' >> ${TMPDIR}/fixes3;
|
||||
else
|
||||
git -C ${REPO} log --no-merges --pretty=format:%B ${NEW_RELEASE}...${OLD_RELEASE} -- ${SUBDIR} |egrep '^[0-9]{7}' | \
|
||||
sed -r 's#^([0-9])# - JDK-\1#' >> ${TMPDIR}/fixes2;
|
||||
touch ${TMPDIR}/fixes3 ; # unused
|
||||
fi
|
||||
done
|
||||
|
||||
sort ${TMPDIR}/fixes2 ${TMPDIR}/fixes3 | uniq > ${TMPDIR}/fixes
|
||||
rm -f ${TMPDIR}/fixes2 ${TMPDIR}/fixes3
|
||||
|
||||
echo "In ${TMPDIR}/fixes:"
|
||||
cat ${TMPDIR}/fixes
|
||||
2
sources
Normal file
2
sources
Normal file
@ -0,0 +1,2 @@
|
||||
SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30
|
||||
SHA512 (openjdk-jdk11u-jdk-11.0.21+9.tar.xz) = 64b283c3eedf31bdf8498141e2e6cde98f82193208939ab65fa43f41a2e5afa4cb006dbd3ba96db9c43f6738a79a2765c66aa92a652e392342de5322f75eff30
|
||||
21
tests/tests.yml
Normal file
21
tests/tests.yml
Normal file
@ -0,0 +1,21 @@
|
||||
---
|
||||
- hosts: localhost
|
||||
roles:
|
||||
- role: standard-test-source
|
||||
tags:
|
||||
- always
|
||||
- role: standard-test-basic
|
||||
tags:
|
||||
- classic
|
||||
- atomic
|
||||
required_packages:
|
||||
- java-11-openjdk-devel
|
||||
tests:
|
||||
- javaVersion1:
|
||||
dir: ~
|
||||
run: set -ex; useradd franta1; su franta1 -c 'java -version';
|
||||
run: set -ex; useradd franta4; su franta4 -c 'javac -version';
|
||||
run: ls -l /usr/lib/jvm;
|
||||
- javaVersion2:
|
||||
dir: ~
|
||||
run: set -ex; useradd franta2; su franta2 -c 'java --version'
|
||||
42
update_package.sh
Normal file
42
update_package.sh
Normal file
@ -0,0 +1,42 @@
|
||||
#!/bin/bash -x
|
||||
# this file contains defaults for currently generated source tarballs
|
||||
|
||||
set -e
|
||||
|
||||
# OpenJDK from Shenandoah project
|
||||
export PROJECT_NAME="shenandoah"
|
||||
export REPO_NAME="jdk11"
|
||||
# warning, clonning without shenadnaoh prefix, you will clone pure jdk - thus without shenandaoh GC
|
||||
export VERSION="shenandoah-jdk-11.0.3+7"
|
||||
export COMPRESSION=xz
|
||||
# unset tapsets overrides
|
||||
export OPENJDK_URL=""
|
||||
export TO_COMPRESS=""
|
||||
# warning, filename and filenameroot creation is duplicated here from generate_source_tarball.sh
|
||||
export FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
|
||||
FILENAME=${FILE_NAME_ROOT}.tar.${COMPRESSION}
|
||||
|
||||
if [ ! -f ${FILENAME} ] ; then
|
||||
echo "Generating ${FILENAME}"
|
||||
sh ./generate_source_tarball.sh
|
||||
else
|
||||
echo "exists exists exists exists exists exists exists "
|
||||
echo "reusing reusing reusing reusing reusing reusing "
|
||||
echo ${FILENAME}
|
||||
fi
|
||||
|
||||
set +e
|
||||
|
||||
major=`echo $REPO_NAME | sed 's/[a-zA-Z]*//g'`
|
||||
build=`echo $VERSION | sed 's/.*+//g'`
|
||||
name_helper=`echo $FILENAME | sed s/$major/'%{majorver}'/g `
|
||||
name_helper=`echo $name_helper | sed s/$build/'%{buildver}'/g `
|
||||
echo "align specfile acordingly:"
|
||||
echo " sed 's/^Source0:.*/Source0: $name_helper/' -i *.spec"
|
||||
echo " sed 's/^Source8:.*/Source8: $TAPSET/' -i *.spec"
|
||||
echo " sed 's/^%global buildver.*/%global buildver $build/' -i *.spec"
|
||||
echo " sed 's/Release:.*/Release: 1%{?dist}/' -i *.spec"
|
||||
echo "and maybe others...."
|
||||
echo "you should fedpkg/rhpkg new-sources $TAPSET $FILENAME"
|
||||
echo "you should fedpkg/rhpkg prep --arch XXXX on all architectures: x86_64 i386 i586 i686 ppc ppc64 ppc64le s390 s390x aarch64 armv7hl"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user