Replaced binaries and .so files with bash-stubs on i686
in preparation of the removal on that architecture https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs
This commit is contained in:
parent
f03a305fe6
commit
25f3641c6c
@ -366,7 +366,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 10
|
%global buildver 10
|
||||||
%global rpmrelease 5
|
%global rpmrelease 6
|
||||||
#%%global tagsuffix %%{nil}
|
#%%global tagsuffix %%{nil}
|
||||||
# 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
|
||||||
@ -2124,7 +2124,9 @@ for suffix in %{build_loop} ; do
|
|||||||
done # end of release / debug cycle loop
|
done # end of release / debug cycle loop
|
||||||
|
|
||||||
%check
|
%check
|
||||||
|
%ifarch %{ix86}
|
||||||
|
exit 0
|
||||||
|
%endif
|
||||||
# We test debug first as it will give better diagnostics on a crash
|
# We test debug first as it will give better diagnostics on a crash
|
||||||
for suffix in %{build_loop} ; do
|
for suffix in %{build_loop} ; do
|
||||||
|
|
||||||
@ -2273,6 +2275,21 @@ jdk_image=${top_dir_abs_main_build_path}/images/%{jdkimage}
|
|||||||
|
|
||||||
# Install the jdk
|
# Install the jdk
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
|
mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
|
||||||
|
|
||||||
|
pushd ${jdk_image}
|
||||||
|
%ifarch %{ix86}
|
||||||
|
for file in $(find $(pwd) | grep -e "/bin/" -e "\.so$") ; do
|
||||||
|
echo "deprecating $file"
|
||||||
|
echo '#!/bin/bash' > $file
|
||||||
|
echo 'echo "We are going to remove i686 jdk. Please fix your package accordingly!"' >> $file
|
||||||
|
echo 'echo "See https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs"' >> $file
|
||||||
|
echo 'echo "See https://pagure.io/fesco/issue/2772"' >> $file
|
||||||
|
echo 'echo "See https://bugzilla.redhat.com/show_bug.cgi?id=2083750"' >> $file
|
||||||
|
echo 'exit 1' >> $file
|
||||||
|
done
|
||||||
|
%endif
|
||||||
|
popd
|
||||||
|
|
||||||
cp -a ${jdk_image} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}
|
cp -a ${jdk_image} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}
|
||||||
|
|
||||||
pushd ${jdk_image}
|
pushd ${jdk_image}
|
||||||
@ -2648,6 +2665,10 @@ end
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 14 2022 Jiri Vanek <jvanek@redhat.com> - 1:11.0.15.0.10-6
|
||||||
|
- Replaced binaries and .so files with bash-stubs on i686 in preparation of the removal on that architecture:
|
||||||
|
- https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs
|
||||||
|
|
||||||
* Thu Jul 14 2022 FeRD (Frank Dana) <ferdnyc@gmail.com> - 1:11.0.15.0.10-5
|
* Thu Jul 14 2022 FeRD (Frank Dana) <ferdnyc@gmail.com> - 1:11.0.15.0.10-5
|
||||||
- Add javaver- and origin-specific javadoc and javadoczip alternatives.
|
- Add javaver- and origin-specific javadoc and javadoczip alternatives.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user