Change mv to cp
This commit is contained in:
parent
f9531c8ae5
commit
ed702d0151
@ -444,9 +444,9 @@
|
||||
%define uniquesuffix() %{expand:%{fullversion}.%{_arch}%{?1}}
|
||||
# portable only declarations
|
||||
%global jreimage jre
|
||||
%define jreportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el8\\(_[0-9]\\)*;portable%{1}.jre.;g" | sed "s;openjdkportable;el;g")
|
||||
%define jdkportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el8\\(_[0-9]\\)*;portable%{1}.jdk.;g" | sed "s;openjdkportable;el;g")
|
||||
%define staticlibsportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el8\\(_[0-9]\\)*;portable%{1}.static-libs.;g" | sed "s;openjdkportable;el;g")
|
||||
%define jreportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el9\\(_[0-9]\\)*;portable%{1}.jre.;g" | sed "s;openjdkportable;el;g")
|
||||
%define jdkportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el9\\(_[0-9]\\)*;portable%{1}.jdk.;g" | sed "s;openjdkportable;el;g")
|
||||
%define staticlibsportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el9\\(_[0-9]\\)*;portable%{1}.static-libs.;g" | sed "s;openjdkportable;el;g")
|
||||
%define jreportablearchive() %{expand:%{jreportablenameimpl -- %%{1}}.tar.xz}
|
||||
%define jdkportablearchive() %{expand:%{jdkportablenameimpl -- %%{1}}.tar.xz}
|
||||
%define staticlibsportablearchive() %{expand:%{staticlibsportablenameimpl -- %%{1}}.tar.xz}
|
||||
@ -455,9 +455,9 @@
|
||||
# Intentionally use jdkportablenameimpl here since we want to have static-libs files overlayed on
|
||||
# top of the JDK archive
|
||||
%define staticlibsportablename() %{expand:%{jdkportablenameimpl -- %%{1}}}
|
||||
%define docportablename() %(echo %{uniquesuffix ""} | sed "s;el8\\(_[0-9]\\)*;portable.docs.;g" | sed "s;openjdkportable;el;g")
|
||||
%define docportablename() %(echo %{uniquesuffix ""} | sed "s;el9\\(_[0-9]\\)*;portable.docs.;g" | sed "s;openjdkportable;el;g")
|
||||
%define docportablearchive() %{docportablename}.tar.xz
|
||||
%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;el8\\(_[0-9]\\)*;portable.misc.;g" | sed "s;openjdkportable;el;g")
|
||||
%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;el9\\(_[0-9]\\)*;portable.misc.;g" | sed "s;openjdkportable;el;g")
|
||||
%define miscportablearchive() %{miscportablename}.tar.xz
|
||||
|
||||
#################################################################
|
||||
@ -1234,8 +1234,8 @@ function packagejdk() {
|
||||
miscarchive=${packagesdir}/%{miscportablearchive}
|
||||
|
||||
# Rename directories for packaging
|
||||
mv %{jdkimage} ${jdkname}
|
||||
mv %{jreimage} ${jrename}
|
||||
cp -r %{jdkimage} ${jdkname}
|
||||
cp -r %{jreimage} ${jrename}
|
||||
|
||||
# Release images have external debug symbols
|
||||
if [ "x$suffix" = "x" ] ; then
|
||||
@ -1288,8 +1288,8 @@ function packagejdk() {
|
||||
|
||||
# Revert directory renaming so testing will run
|
||||
# TODO: testing should run on the packaged JDK
|
||||
mv ${jdkname} %{jdkimage}
|
||||
mv ${jrename} %{jreimage}
|
||||
rm -rf ${jdkname} %{jdkimage}
|
||||
rm -rf ${jrename} %{jreimage}
|
||||
|
||||
popd #images
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user