diff options
| author | Stuart Monteith <stuart.monteith@linaro.org> | 2019-02-06 14:02:08 +0000 |
|---|---|---|
| committer | Stuart Monteith <stuart.monteith@linaro.org> | 2019-02-06 14:18:12 +0000 |
| commit | 571d52b3e028d148e6ba9dd6642afed27fadea15 (patch) | |
| tree | 6857ca35272600646388881baa417bf55aef2d76 /jdkX-build-image.yaml | |
| parent | b75e15646a1ac47ebd5a994d8e88fd1e3f55fe0a (diff) | |
jdk: Fixup release builds.
There was an error where an out directory was created unnecessarily.
Change-Id: Ia119f6f2a87e99ef17b805514b9de9d44e9e2f3a
Diffstat (limited to 'jdkX-build-image.yaml')
| -rw-r--r-- | jdkX-build-image.yaml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/jdkX-build-image.yaml b/jdkX-build-image.yaml index e7918c24ba..9cbb423e96 100644 --- a/jdkX-build-image.yaml +++ b/jdkX-build-image.yaml @@ -54,7 +54,7 @@ ccache_build_opts=--disable-ccache - rm -rf jdk* primordial-jdk* build* + rm -rf jdk* primordial-jdk* build* out cd $HOME/srv/jdk-cache/jdk11 export JAVA_HOME=${PWD} @@ -68,8 +68,8 @@ shopt -s nullglob - # Configure and build - mkdir -p build-stage1 build-stage2 + # Configure and build. + mkdir -p build-stage1 build-stage2 out two_stage_build=0 @@ -94,8 +94,6 @@ fi # Archive the result - rm -rf out - mkdir out artifact_name=jdkX-${BUILD_TYPE} tar -C build-stage2/images/jdk --exclude=\*.diz --transform="s!^./!$artifact_name/!" -acf out/${artifact_name}.tar.gz . |