Merge branch 'f36' into f35
This commit is contained in:
commit
6c41bcd1ec
@ -8,8 +8,8 @@
|
|||||||
#
|
#
|
||||||
# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
|
# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
|
||||||
# PROJECT_NAME=openjdk
|
# PROJECT_NAME=openjdk
|
||||||
# REPO_NAME=jdk16
|
# REPO_NAME=jdk18
|
||||||
# VERSION=HEAD
|
# VERSION=jdk-18+37
|
||||||
# or to eg prepare systemtap:
|
# or to eg prepare systemtap:
|
||||||
# icedtea7's jstack and other tapsets
|
# icedtea7's jstack and other tapsets
|
||||||
# VERSION=6327cf1cea9e
|
# VERSION=6327cf1cea9e
|
||||||
@ -130,7 +130,7 @@ pushd "${FILE_NAME_ROOT}"
|
|||||||
# get PR3823.patch (from http://icedtea.classpath.org/hg/icedtea16) from most correct tag
|
# get PR3823.patch (from http://icedtea.classpath.org/hg/icedtea16) from most correct tag
|
||||||
# Do not push it or publish it (see https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3823)
|
# Do not push it or publish it (see https://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3823)
|
||||||
echo "PR3823 not found. Downloading..."
|
echo "PR3823 not found. Downloading..."
|
||||||
wget https://icedtea.classpath.org/hg/icedtea16/raw-file/tip/patches/pr3823.patch
|
wget https://icedtea.wildebeest.org/hg/icedtea16/raw-file/tip/patches/pr3823.patch
|
||||||
echo "Applying ${PWD}/pr3823.patch"
|
echo "Applying ${PWD}/pr3823.patch"
|
||||||
patch -Np1 < pr3823.patch
|
patch -Np1 < pr3823.patch
|
||||||
rm pr3823.patch
|
rm pr3823.patch
|
||||||
|
@ -315,12 +315,12 @@
|
|||||||
%global patchver 0
|
%global patchver 0
|
||||||
# If you bump featurever, you must also bump vendor_version_string
|
# If you bump featurever, you must also bump vendor_version_string
|
||||||
# Used via new version scheme. JDK 17 was
|
# Used via new version scheme. JDK 17 was
|
||||||
# GA'ed in September 2021 => 21.9
|
# GA'ed in March 2022 => 22.3
|
||||||
%global vendor_version_string 21.9
|
%global vendor_version_string 22.3
|
||||||
# buildjdkver is usually same as %%{featurever},
|
# buildjdkver is usually same as %%{featurever},
|
||||||
# but in time of bootstrap of next jdk, it is featurever-1,
|
# but in time of bootstrap of next jdk, it is featurever-1,
|
||||||
# and this it is better to change it here, on single place
|
# and this it is better to change it here, on single place
|
||||||
%global buildjdkver 17
|
%global buildjdkver 18
|
||||||
# We don't add any LTS designator for STS packages (Fedora and EPEL).
|
# We don't add any LTS designator for STS packages (Fedora and EPEL).
|
||||||
# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
|
# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
|
||||||
%if 0%{?rhel} && !0%{?epel}
|
%if 0%{?rhel} && !0%{?epel}
|
||||||
@ -342,7 +342,7 @@
|
|||||||
%global top_level_dir_name %{origin}
|
%global top_level_dir_name %{origin}
|
||||||
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
||||||
%global buildver 37
|
%global buildver 37
|
||||||
%global rpmrelease 1
|
%global rpmrelease 2
|
||||||
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
|
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
|
||||||
%if %is_system_jdk
|
%if %is_system_jdk
|
||||||
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
|
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
|
||||||
@ -1934,32 +1934,32 @@ function installjdk() {
|
|||||||
local imagepath=${1}
|
local imagepath=${1}
|
||||||
|
|
||||||
if [ -d ${imagepath} ] ; then
|
if [ -d ${imagepath} ] ; then
|
||||||
# the build (erroneously) removes read permissions from some jars
|
# the build (erroneously) removes read permissions from some jars
|
||||||
# this is a regression in OpenJDK 7 (our compiler):
|
# this is a regression in OpenJDK 7 (our compiler):
|
||||||
# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
|
# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
|
||||||
find ${imagepath} -iname '*.jar' -exec chmod ugo+r {} \;
|
find ${imagepath} -iname '*.jar' -exec chmod ugo+r {} \;
|
||||||
|
|
||||||
# Build screws up permissions on binaries
|
# Build screws up permissions on binaries
|
||||||
# https://bugs.openjdk.java.net/browse/JDK-8173610
|
# https://bugs.openjdk.java.net/browse/JDK-8173610
|
||||||
find ${imagepath} -iname '*.so' -exec chmod +x {} \;
|
find ${imagepath} -iname '*.so' -exec chmod +x {} \;
|
||||||
find ${imagepath}/bin/ -exec chmod +x {} \;
|
find ${imagepath}/bin/ -exec chmod +x {} \;
|
||||||
|
|
||||||
# Install nss.cfg right away as we will be using the JRE above
|
# Install nss.cfg right away as we will be using the JRE above
|
||||||
install -m 644 nss.cfg ${imagepath}/conf/security/
|
install -m 644 nss.cfg ${imagepath}/conf/security/
|
||||||
|
|
||||||
# Install nss.fips.cfg: NSS configuration for global FIPS mode (crypto-policies)
|
# Install nss.fips.cfg: NSS configuration for global FIPS mode (crypto-policies)
|
||||||
install -m 644 nss.fips.cfg ${imagepath}/conf/security/
|
install -m 644 nss.fips.cfg ${imagepath}/conf/security/
|
||||||
|
|
||||||
# Use system-wide tzdata
|
# Use system-wide tzdata
|
||||||
rm ${imagepath}/lib/tzdb.dat
|
rm ${imagepath}/lib/tzdb.dat
|
||||||
ln -s %{_datadir}/javazi-1.8/tzdb.dat ${imagepath}/lib/tzdb.dat
|
ln -s %{_datadir}/javazi-1.8/tzdb.dat ${imagepath}/lib/tzdb.dat
|
||||||
|
|
||||||
# Create fake alt-java as a placeholder for future alt-java
|
# Create fake alt-java as a placeholder for future alt-java
|
||||||
pushd ${imagepath}
|
pushd ${imagepath}
|
||||||
# add alt-java man page
|
# add alt-java man page
|
||||||
echo "Hardened java binary recommended for launching untrusted code from the Web e.g. javaws" > man/man1/%{alt_java_name}.1
|
echo "Hardened java binary recommended for launching untrusted code from the Web e.g. javaws" > man/man1/%{alt_java_name}.1
|
||||||
cat man/man1/java.1 >> man/man1/%{alt_java_name}.1
|
cat man/man1/java.1 >> man/man1/%{alt_java_name}.1
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2527,6 +2527,11 @@ cjc.mainProgram(args)
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Mar 21 2022 Jiri Vanek <jvanek@redhat.com> - 1:18.0.0.0.37-2.rolling
|
||||||
|
- replaced tabs by sets of spaces to make rpmlint happy
|
||||||
|
- set build jdk to 18
|
||||||
|
- as ga is 1, set vendor_version_string to 22.3
|
||||||
|
|
||||||
* Wed Mar 16 2022 Andrew Hughes <gnu.andrew@redhat.com> - 1:18.0.0.0.37-1.rolling
|
* Wed Mar 16 2022 Andrew Hughes <gnu.andrew@redhat.com> - 1:18.0.0.0.37-1.rolling
|
||||||
- Update to RC version of OpenJDK 18
|
- Update to RC version of OpenJDK 18
|
||||||
- Support JVM variant zero following JDK-8273494 no longer installing Zero's libjvm.so in the server directory
|
- Support JVM variant zero following JDK-8273494 no longer installing Zero's libjvm.so in the server directory
|
||||||
|
@ -1,69 +0,0 @@
|
|||||||
#!/bin/bash -x
|
|
||||||
# this file contains defaults for currently generated source tarballs
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# TAPSET
|
|
||||||
export PROJECT_NAME="hg"
|
|
||||||
export REPO_NAME="icedtea8"
|
|
||||||
export VERSION="9d464368e06d"
|
|
||||||
export COMPRESSION=xz
|
|
||||||
export OPENJDK_URL=http://icedtea.classpath.org
|
|
||||||
export FILE_NAME_ROOT=${PROJECT_NAME}-${REPO_NAME}-${VERSION}
|
|
||||||
export TO_COMPRESS="*/tapset"
|
|
||||||
# warning, filename and filenameroot creation is duplicated here from generate_source_tarball.sh
|
|
||||||
CLONED_FILENAME=${FILE_NAME_ROOT}.tar.${COMPRESSION}
|
|
||||||
TAPSET_VERSION=3.2
|
|
||||||
TAPSET=systemtap_"$TAPSET_VERSION"_tapsets_$CLONED_FILENAME
|
|
||||||
if [ ! -f ${TAPSET} ] ; then
|
|
||||||
if [ ! -f ${CLONED_FILENAME} ] ; then
|
|
||||||
echo "Generating ${CLONED_FILENAME}"
|
|
||||||
sh ./generate_source_tarball.sh
|
|
||||||
else
|
|
||||||
echo "exists exists exists exists exists exists exists "
|
|
||||||
echo "reusing reusing reusing reusing reusing reusing "
|
|
||||||
echo ${CLONED_FILENAME}
|
|
||||||
fi
|
|
||||||
mv -v $CLONED_FILENAME $TAPSET
|
|
||||||
else
|
|
||||||
echo "exists exists exists exists exists exists exists "
|
|
||||||
echo "reusing reusing reusing reusing reusing reusing "
|
|
||||||
echo ${TAPSET}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# OpenJDK from Shenandoah project
|
|
||||||
export PROJECT_NAME="jdk"
|
|
||||||
export REPO_NAME="jdk15"
|
|
||||||
export VERSION="jdk-15+36"
|
|
||||||
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