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
3a89c445ab
commit
73fbfeeb34
@ -357,7 +357,7 @@
|
||||
%global top_level_dir_name %{origin}
|
||||
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
||||
%global buildver 1
|
||||
%global rpmrelease 3
|
||||
%global rpmrelease 4
|
||||
# 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
|
||||
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
|
||||
@ -2178,6 +2178,21 @@ jdk_image=${top_dir_abs_main_build_path}/images/%{jdkimage}
|
||||
|
||||
# Install the jdk
|
||||
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}
|
||||
|
||||
pushd ${jdk_image}
|
||||
@ -2282,7 +2297,9 @@ find $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/legal -type f -exec chmod 6
|
||||
done
|
||||
|
||||
%check
|
||||
|
||||
%ifarch %{ix86}
|
||||
exit 0
|
||||
%endif
|
||||
# We test debug first as it will give better diagnostics on a crash
|
||||
for suffix in %{build_loop} ; do
|
||||
|
||||
@ -2593,6 +2610,10 @@ cjc.mainProgram(args)
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Jul 14 2022 Jiri Vanek <jvanek@redhat.com> - 1:17.0.4.0.1-0.4.ea
|
||||
- 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:17.0.4.0.1-0.3.ea
|
||||
- Add javaver- and origin-specific javadoc and javadoczip alternatives.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user