Skip to content

GitLab

I
icedtea
Commit f73c4e73 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Updated icedtea7 to 2.6.22 and icedtea8 to 3.16.0

parent 2846f05c
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 46 deletions
Makefile
View file @ f73c4e73
...@@ -58,18 +58,18 @@ build-7: ...@@ -58,18 +58,18 @@ build-7:
ln -svf /etc/ssl/java/cacerts /opt/jdk/jre/lib/security/cacerts ln -svf /etc/ssl/java/cacerts /opt/jdk/jre/lib/security/cacerts
rm -rf /opt/icedtea6-1.13.13 rm -rf /opt/icedtea6-1.13.13
rm -rf icedtea-2.6.10 rm -rf icedtea-2.6.10
tar xf icedtea-2.6.20.tar.xz tar xf icedtea-2.6.22.tar.xz
patch -Np1 -d icedtea-2.6.20 < icedtea-2.6.20-fixed.patch patch -Np1 -d icedtea-2.6.22 < icedtea-2.6.22-fixed.patch
cp icedtea7/2.6.20/* icedtea-2.6.20 cp icedtea7/2.6.22/* icedtea-2.6.22
cd icedtea-2.6.20 && PATH=/build/usr/bin:/build/ant/bin:/opt/jdk/bin:$$PATH JAVA_HOME=/opt/jdk CLASSPATH=.:/usr/share/java ./configure --prefix=/usr --with-jdk-home=/opt/jdk --without-rhino --disable-system-kerberos --disable-system-gtk --disable-system-pcsc --disable-system-sctp cd icedtea-2.6.22 && PATH=/build/usr/bin:/build/ant/bin:/opt/jdk/bin:$$PATH JAVA_HOME=/opt/jdk CLASSPATH=.:/usr/share/java ./configure --prefix=/usr --with-jdk-home=/opt/jdk --without-rhino --disable-system-kerberos --disable-system-gtk --disable-system-pcsc --disable-system-sctp
$(MAKE) -C icedtea-2.6.20 PATH=/build/usr/bin:/build/ant/bin:/opt/jdk/bin:$$PATH DISABLE_HOTSPOT_OS_VERSION_CHECK=ok $(MAKE) -C icedtea-2.6.22 PATH=/build/usr/bin:/build/ant/bin:/opt/jdk/bin:$$PATH DISABLE_HOTSPOT_OS_VERSION_CHECK=ok
cd icedtea-2.6.20 && cp -R openjdk.build/j2sdk-image /opt/icedtea-2.6.20 cd icedtea-2.6.22 && cp -R openjdk.build/j2sdk-image /opt/icedtea-2.6.22
chown -R root:root /opt/icedtea-2.6.20 chown -R root:root /opt/icedtea-2.6.22
ln -sfv -n icedtea-2.6.20 /opt/jdk ln -sfv -n icedtea-2.6.22 /opt/jdk
rm -f /opt/jdk/jre/lib/security/cacerts rm -f /opt/jdk/jre/lib/security/cacerts
ln -svf /etc/ssl/java/cacerts /opt/jdk/jre/lib/security/cacerts ln -svf /etc/ssl/java/cacerts /opt/jdk/jre/lib/security/cacerts
rm -rf /opt/icedtea-2.6.10 rm -rf /opt/icedtea-2.6.10
rm -rf icedtea-2.6.20 rm -rf icedtea-2.6.22
rm /usr/bin/head rm /usr/bin/head
rm /usr/bin/find rm /usr/bin/find
rm /bin/touch rm /bin/touch
...@@ -83,19 +83,19 @@ build-8: ...@@ -83,19 +83,19 @@ build-8:
chmod 600 swap chmod 600 swap
mkswap swap mkswap swap
swapon swap swapon swap
tar xf icedtea-3.14.0.tar.xz tar xf icedtea-3.16.0.tar.xz
cp icedtea8/3.14.0/* icedtea-3.14.0 cp icedtea8/3.16.0/* icedtea-3.16.0
if [ `uname -m` = 'armv7l' ] ; then \ if [ `uname -m` = 'armv7l' ] ; then \
cp icedtea8/3.14.0/aarch32.tar.xz icedtea-3.14.0/hotspot.tar.xz ; \ cp icedtea8/3.16.0/aarch32.tar.xz icedtea-3.16.0/hotspot.tar.xz ; \
fi fi
cd icedtea-3.14.0 && PATH=/build/ant/bin:/opt/jdk/bin:$$PATH JAVA_HOME=/opt/jdk CLASSPATH=.:/usr/share/java ./configure --prefix=/usr --with-jdk-home=/opt/jdk --disable-system-kerberos --disable-system-pcsc --disable-system-sctp cd icedtea-3.16.0 && PATH=/build/ant/bin:/opt/jdk/bin:$$PATH JAVA_HOME=/opt/jdk CLASSPATH=.:/usr/share/java ./configure --prefix=/usr --with-jdk-home=/opt/jdk --disable-system-kerberos --disable-system-pcsc --disable-system-sctp
$(MAKE) -C icedtea-3.14.0 PATH=/build/ant/bin:/opt/jdk/bin:$$PATH $(MAKE) -C icedtea-3.16.0 PATH=/build/ant/bin:/opt/jdk/bin:$$PATH
cd icedtea-3.14.0 && cp -R openjdk.build/images/j2sdk-image /opt/icedtea-3.14.0 cd icedtea-3.16.0 && cp -R openjdk.build/images/j2sdk-image /opt/icedtea-3.16.0
chown -R root:root /opt/icedtea-3.14.0 chown -R root:root /opt/icedtea-3.16.0
ln -sfv -n icedtea-3.14.0 /opt/jdk ln -sfv -n icedtea-3.16.0 /opt/jdk
rm -f /opt/jdk/jre/lib/security/cacerts rm -f /opt/jdk/jre/lib/security/cacerts
ln -svf /etc/ssl/java/cacerts /opt/jdk/jre/lib/security/cacerts ln -svf /etc/ssl/java/cacerts /opt/jdk/jre/lib/security/cacerts
rm -rf /opt/icedtea-2.6.20 rm -rf /opt/icedtea-2.6.22
rm -rf icedtea-3.14.0 rm -rf icedtea-3.16.0
swapoff swap swapoff swap
rm -rf swap rm -rf swap
icedtea-2.6.20-fixed.patch → icedtea-2.6.22-fixed.patch
View file @ f73c4e73
diff -uNr icedtea-2.6.20/configure icedtea-2.6.20-fixed/configure diff -uNr icedtea-2.6.22/configure icedtea-2.6.22-fixed/configure
--- icedtea-2.6.20/configure 2019-11-18 05:50:27.364013811 +0000 --- icedtea-2.6.22/configure 2020-04-17 01:42:24.284978132 +0930
+++ icedtea-2.6.20-fixed/configure 2020-06-17 11:39:38.360001051 +0000 +++ icedtea-2.6.22-fixed/configure 2021-07-31 11:36:28.218410718 +0930
@@ -16089,7 +16089,7 @@ @@ -16101,7 +16101,7 @@
fi fi
done done
...@@ -10,7 +10,7 @@ diff -uNr icedtea-2.6.20/configure icedtea-2.6.20-fixed/configure ...@@ -10,7 +10,7 @@ diff -uNr icedtea-2.6.20/configure icedtea-2.6.20-fixed/configure
do : do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -16099,7 +16099,7 @@ @@ -16111,7 +16111,7 @@
_ACEOF _ACEOF
else else
...@@ -19,33 +19,34 @@ diff -uNr icedtea-2.6.20/configure icedtea-2.6.20-fixed/configure ...@@ -19,33 +19,34 @@ diff -uNr icedtea-2.6.20/configure icedtea-2.6.20-fixed/configure
fi fi
done done
diff -uNr icedtea-2.6.20/Makefile.am icedtea-2.6.20-fixed/Makefile.am diff -uNr icedtea-2.6.22/Makefile.am icedtea-2.6.22-fixed/Makefile.am
--- icedtea-2.6.20/Makefile.am 2019-11-15 04:45:51.645205555 +0000 --- icedtea-2.6.22/Makefile.am 2020-04-17 01:42:10.921181620 +0930
+++ icedtea-2.6.20-fixed/Makefile.am 2020-06-17 11:43:52.233196142 +0000 +++ icedtea-2.6.22-fixed/Makefile.am 2021-07-31 11:37:40.953644159 +0930
@@ -369,7 +369,7 @@ @@ -369,7 +369,7 @@
# Patch list # Patch list
-ICEDTEA_PATCHES = patches/8232643-pr3761.patch -ICEDTEA_PATCHES =
+ICEDTEA_PATCHES = patches/8232643-pr3761.patch patches/freetypecheck_fix.patch patches/jdk-fixed_xattr.patch patches/sharedRuntime_aarch64-fix.patch +ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/jdk-fixed_xattr.patch patches/sharedRuntime_aarch64-fix.patch
# Conditional patches # Conditional patches
diff -uNr icedtea-2.6.20/Makefile.in icedtea-2.6.20-fixed/Makefile.in diff -uNr icedtea-2.6.22/Makefile.in icedtea-2.6.22-fixed/Makefile.in
--- icedtea-2.6.20/Makefile.in 2019-11-18 05:50:28.180001295 +0000 --- icedtea-2.6.22/Makefile.in 2020-04-17 01:42:25.536959068 +0930
+++ icedtea-2.6.20-fixed/Makefile.in 2020-06-17 11:44:13.293620894 +0000 +++ icedtea-2.6.22-fixed/Makefile.in 2021-07-31 11:39:02.585906155 +0930
@@ -788,7 +788,7 @@ @@ -789,7 +789,8 @@
MIME_TYPE_CHECK_SRCS = $(top_srcdir)/test/standalone/RH1195203.java MIME_TYPE_CHECK_SRCS = $(top_srcdir)/test/standalone/RH1195203.java
# Patch list # Patch list
-ICEDTEA_PATCHES = patches/8232643-pr3761.patch $(am__append_8) \ -ICEDTEA_PATCHES = $(am__append_8) $(am__append_9) $(am__append_10) \
+ICEDTEA_PATCHES = patches/8232643-pr3761.patch patches/freetypecheck_fix.patch patches/jdk-fixed_xattr.patch patches/sharedRuntime_aarch64-fix.patch $(am__append_8) \ +ICEDTEA_PATCHES = patches/freetypecheck_fix.patch patches/jdk-fixed_xattr.patch patches/sharedRuntime_aarch64-fix.patch \
$(am__append_9) $(am__append_10) $(am__append_11) \ + $(am__append_8) $(am__append_9) $(am__append_10) \
$(am__append_12) $(am__append_13) $(DISTRIBUTION_PATCHES) $(am__append_11) $(am__append_12) $(am__append_13) \
$(DISTRIBUTION_PATCHES)
diff -uNr icedtea-2.6.20/patches/freetypecheck_fix.patch icedtea-2.6.20-fixed/patches/freetypecheck_fix.patch diff -uNr icedtea-2.6.22/patches/freetypecheck_fix.patch icedtea-2.6.22-fixed/patches/freetypecheck_fix.patch
--- icedtea-2.6.20/patches/freetypecheck_fix.patch 1970-01-01 00:00:00.000000000 +0000 --- icedtea-2.6.22/patches/freetypecheck_fix.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.20-fixed/patches/freetypecheck_fix.patch 2020-06-17 11:39:38.380001467 +0000 +++ icedtea-2.6.22-fixed/patches/freetypecheck_fix.patch 2021-07-31 11:36:28.219410721 +0930
@@ -0,0 +1,34 @@ @@ -0,0 +1,34 @@
+diff -uNr openjdk/jdk/make/common/shared/Sanity.gmk openjdk.fixed/jdk/make/common/shared/Sanity.gmk +diff -uNr openjdk/jdk/make/common/shared/Sanity.gmk openjdk.fixed/jdk/make/common/shared/Sanity.gmk
+--- openjdk/jdk/make/common/shared/Sanity.gmk 2016-12-30 15:00:21.000000000 +1030 +--- openjdk/jdk/make/common/shared/Sanity.gmk 2016-12-30 15:00:21.000000000 +1030
...@@ -81,9 +82,9 @@ diff -uNr icedtea-2.6.20/patches/freetypecheck_fix.patch icedtea-2.6.20-fixed/pa ...@@ -81,9 +82,9 @@ diff -uNr icedtea-2.6.20/patches/freetypecheck_fix.patch icedtea-2.6.20-fixed/pa
+ +
+ ###################################################### + ######################################################
+ # CUPS_HEADERS_PATH must be valid + # CUPS_HEADERS_PATH must be valid
diff -uNr icedtea-2.6.20/patches/jdk-fixed_xattr.patch icedtea-2.6.20-fixed/patches/jdk-fixed_xattr.patch diff -uNr icedtea-2.6.22/patches/jdk-fixed_xattr.patch icedtea-2.6.22-fixed/patches/jdk-fixed_xattr.patch
--- icedtea-2.6.20/patches/jdk-fixed_xattr.patch 1970-01-01 00:00:00.000000000 +0000 --- icedtea-2.6.22/patches/jdk-fixed_xattr.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.20-fixed/patches/jdk-fixed_xattr.patch 2020-06-17 11:39:38.380001467 +0000 +++ icedtea-2.6.22-fixed/patches/jdk-fixed_xattr.patch 2021-07-31 11:36:28.219410721 +0930
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
+diff -uNr openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c openjdk.fixed/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c +diff -uNr openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c openjdk.fixed/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c
+--- openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c 2017-05-03 12:20:28.000000000 +0930 +--- openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c 2017-05-03 12:20:28.000000000 +0930
...@@ -97,9 +98,9 @@ diff -uNr icedtea-2.6.20/patches/jdk-fixed_xattr.patch icedtea-2.6.20-fixed/patc ...@@ -97,9 +98,9 @@ diff -uNr icedtea-2.6.20/patches/jdk-fixed_xattr.patch icedtea-2.6.20-fixed/patc
+ #else + #else
+ #include <syscalls_fp.h> + #include <syscalls_fp.h>
+ #endif + #endif
diff -uNr icedtea-2.6.20/patches/sharedRuntime_aarch64-fix.patch icedtea-2.6.20-fixed/patches/sharedRuntime_aarch64-fix.patch diff -uNr icedtea-2.6.22/patches/sharedRuntime_aarch64-fix.patch icedtea-2.6.22-fixed/patches/sharedRuntime_aarch64-fix.patch
--- icedtea-2.6.20/patches/sharedRuntime_aarch64-fix.patch 1970-01-01 00:00:00.000000000 +0000 --- icedtea-2.6.22/patches/sharedRuntime_aarch64-fix.patch 1970-01-01 09:30:00.000000000 +0930
+++ icedtea-2.6.20-fixed/patches/sharedRuntime_aarch64-fix.patch 2020-06-17 11:42:44.543825294 +0000 +++ icedtea-2.6.22-fixed/patches/sharedRuntime_aarch64-fix.patch 2021-07-31 11:36:28.219410721 +0930
@@ -0,0 +1,14 @@ @@ -0,0 +1,14 @@
+diff -uNr openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp openjdk.fixed/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp +diff -uNr openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp openjdk.fixed/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
+--- openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp 2019-10-14 18:21:39.000000000 +0000 +--- openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp 2019-10-14 18:21:39.000000000 +0000
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment