Merge all legal to one and pack just once for all tarballs
This commit is contained in:
parent
d904c40a00
commit
c22c08ba1b
|
@ -1368,16 +1368,16 @@ for suffix in %{build_loop} ; do
|
|||
|
||||
################################################################################
|
||||
pushd ${top_dir_abs_main_build_path}/images
|
||||
mv %{jdkimage} %{jdkportablename -- "$nameSuffix"}
|
||||
mv %{jreimage} %{jreportablename -- "$nameSuffix"}
|
||||
tar -cJf ../../../../%{jdkportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jdkportablename -- "$nameSuffix"}
|
||||
sha256sum ../../../../%{jdkportablearchive -- "$nameSuffix"} > ../../../../%{jdkportablearchive -- "$nameSuffix"}.sha256sum
|
||||
tar -cJf ../../../../%{jreportablearchive -- "$nameSuffix"} --exclude='**.debuginfo' %{jreportablename -- "$nameSuffix"}
|
||||
sha256sum ../../../../%{jreportablearchive -- "$nameSuffix"} > ../../../../%{jreportablearchive -- "$nameSuffix"}.sha256sum
|
||||
mv %{jdkimage} %{jdkportablename -- "$suffix"}
|
||||
mv %{jreimage} %{jreportablename -- "$suffix"}
|
||||
tar -cJf ../../../../%{jdkportablearchive -- "$suffix"} --exclude='**.debuginfo' %{jdkportablename -- "$suffix"}
|
||||
sha256sum ../../../../%{jdkportablearchive -- "$suffix"} > ../../../../%{jdkportablearchive -- "$suffix"}.sha256sum
|
||||
tar -cJf ../../../../%{jreportablearchive -- "$suffix"} --exclude='**.debuginfo' %{jreportablename -- "$suffix"}
|
||||
sha256sum ../../../../%{jreportablearchive -- "$suffix"} > ../../../../%{jreportablearchive -- "$suffix"}.sha256sum
|
||||
# copy licenses so they are avialable out of tarball
|
||||
cp -r %{jdkportablename -- "$nameSuffix"}/legal ../../../../%{jdkportablearchive -- "$nameSuffix"}-legal
|
||||
mv %{jdkportablename -- "$nameSuffix"} %{jdkimage}
|
||||
mv %{jreportablename -- "$nameSuffix"} %{jreimage}
|
||||
cp -rf %{jdkportablename -- "$suffix"}/legal ../../../../%{jdkportablearchive -- "%{normal_suffix}"}-legal
|
||||
mv %{jdkportablename -- "$suffix"} %{jdkimage}
|
||||
mv %{jreportablename -- "$suffix"} %{jreimage}
|
||||
popd #images
|
||||
%if %{include_staticlibs}
|
||||
top_dir_abs_staticlibs_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{staticlibs_suffix}}
|
||||
|
@ -1385,9 +1385,9 @@ for suffix in %{build_loop} ; do
|
|||
# Static libraries (needed for building graal vm with native image)
|
||||
# Tar as overlay. Transform to the JDK name, since we just want to "add"
|
||||
# static libraries to that folder
|
||||
portableJDKname=%{staticlibsportablename -- "$nameSuffix"}
|
||||
tar -cJf ../../../../%{staticlibsportablearchive -- "$nameSuffix"} --transform "s|^%{static_libs_image}/lib/*|$portableJDKname/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib"
|
||||
sha256sum ../../../../%{staticlibsportablearchive -- "$nameSuffix"} > ../../../../%{staticlibsportablearchive -- "$nameSuffix"}.sha256sum
|
||||
portableJDKname=%{staticlibsportablename -- "$suffix"}
|
||||
tar -cJf ../../../../%{staticlibsportablearchive -- "$suffix"} --transform "s|^%{static_libs_image}/lib/*|$portableJDKname/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib"
|
||||
sha256sum ../../../../%{staticlibsportablearchive -- "$suffix"} > ../../../../%{staticlibsportablearchive -- "$suffix"}.sha256sum
|
||||
popd #staticlibs-images
|
||||
%endif
|
||||
################################################################################
|
||||
|
@ -1632,18 +1632,18 @@ done
|
|||
%files slowdebug
|
||||
%{_jvmdir}/%{jreportablearchive -- .slowdebug}
|
||||
%{_jvmdir}/%{jreportablearchive -- .slowdebug}.sha256sum
|
||||
%license %{unpacked_licenses}/%{jdkportablearchive -- .slowdebug}
|
||||
%license %{unpacked_licenses}/%{jdkportablearchive -- %%{nil}}
|
||||
|
||||
%files devel-slowdebug
|
||||
%{_jvmdir}/%{jdkportablearchive -- .slowdebug}
|
||||
%{_jvmdir}/%{jdkportablearchive -- .slowdebug}.sha256sum
|
||||
%license %{unpacked_licenses}/%{jdkportablearchive -- .slowdebug}
|
||||
%license %{unpacked_licenses}/%{jdkportablearchive -- %%{nil}}
|
||||
|
||||
%if %{include_staticlibs}
|
||||
%files static-libs-slowdebug
|
||||
%{_jvmdir}/%{staticlibsportablearchive -- .slowdebug}
|
||||
%{_jvmdir}/%{staticlibsportablearchive -- .slowdebug}.sha256sum
|
||||
%license %{unpacked_licenses}/%{jdkportablearchive -- .slowdebug}
|
||||
%license %{unpacked_licenses}/%{jdkportablearchive -- %%{nil}}
|
||||
%endif
|
||||
%endif
|
||||
|
||||
|
@ -1651,18 +1651,18 @@ done
|
|||
%files fastdebug
|
||||
%{_jvmdir}/%{jreportablearchive -- .fastdebug}
|
||||
%{_jvmdir}/%{jreportablearchive -- .fastdebug}.sha256sum
|
||||
%license %{unpacked_licenses}/%{jdkportablearchive -- .fastdebug}
|
||||
%license %{unpacked_licenses}/%{jdkportablearchive -- %%{nil}}
|
||||
|
||||
%files devel-fastdebug
|
||||
%{_jvmdir}/%{jdkportablearchive -- .fastdebug}
|
||||
%{_jvmdir}/%{jdkportablearchive -- .fastdebug}.sha256sum
|
||||
%license %{unpacked_licenses}/%{jdkportablearchive -- .fastdebug}
|
||||
%license %{unpacked_licenses}/%{jdkportablearchive -- %%{nil}}
|
||||
|
||||
%if %{include_staticlibs}
|
||||
%files static-libs-fastdebug
|
||||
%{_jvmdir}/%{staticlibsportablearchive -- .fastdebug}
|
||||
%{_jvmdir}/%{staticlibsportablearchive -- .fastdebug}.sha256sum
|
||||
%license %{unpacked_licenses}/%{jdkportablearchive -- .fastdebug}
|
||||
%license %{unpacked_licenses}/%{jdkportablearchive -- %%{nil}}
|
||||
%endif
|
||||
%endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue