Date: Monday, April 24, 2023 @ 22:07:32
Author: freswa
Revision: 475167
fix cds being older than modules archive
Until JDK 20 there was no output if the global cds (class data sharing) file
classes.jsa didn't match the shipped modules file. Since we shipped
the JRE binary with the JDK modules, the warning occured with the recent
release.
This commit changes the packaging behavior to replace the JRE files with the JDK
one.
related to FS#78279
Modified:
java-openjdk/trunk/PKGBUILD
----------+
PKGBUILD | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-04-24 16:04:19 UTC (rev 475166)
+++ PKGBUILD 2023-04-24 22:07:32 UTC (rev 475167)
@@ -12,13 +12,13 @@
_updatever=9
pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
#pkgver=${_majorver}.u${_updatever}
-pkgrel=2
+pkgrel=3
_git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
#_git_tag=jdk-${_majorver}+${_updatever}
arch=('x86_64')
url='https://openjdk.java.net/'
license=('custom')
-makedepends=('java-environment>=11' 'cpio' 'unzip' 'zip' 'libelf' 'libcups'
'libx11'
+makedepends=('java-environment>=17' 'cpio' 'unzip' 'zip' 'libelf' 'libcups'
'libx11'
'libxrender' 'libxtst' 'libxt' 'libxext' 'libxrandr' 'alsa-lib'
'pandoc'
'graphviz' 'freetype2' 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2'
'libnet' 'bash' 'harfbuzz' 'gcc-libs' 'glibc')
@@ -46,6 +46,12 @@
lib/libjsound.so
lib/libsplashscreen.so)
+_nonjre=(lib/ct.sym
+ lib/libattach.so
+ lib/libsaproc.so
+ lib/src.zip)
+
+
build() {
cd ${_jdkdir}
@@ -144,11 +150,18 @@
cd ${_imgdir}/jre
- install -dm 755 "${pkgdir}${_jvmdir}"
+ install -dm 755 "${pkgdir}${_jvmdir}"/bin
- cp -a bin lib \
- "${pkgdir}${_jvmdir}"
+ for i in $(ls bin/); do
+ cp ../jdk/bin/$i "${pkgdir}${_jvmdir}/bin/"
+ done
+ cp -a ../jdk/lib "${pkgdir}${_jvmdir}"
+
+ for f in "${_nonjre[@]}"; do
+ rm "${pkgdir}${_jvmdir}/${f}"
+ done
+
for f in "${_nonheadless[@]}"; do
rm "${pkgdir}${_jvmdir}/${f}"
done
