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-release.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-release.yaml')
| -rw-r--r-- | jdkX-build-release.yaml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/jdkX-build-release.yaml b/jdkX-build-release.yaml index d7555b34cd..3a66897597 100644 --- a/jdkX-build-release.yaml +++ b/jdkX-build-release.yaml @@ -14,6 +14,7 @@ openjdk-members: - job-build - job-cancel + - job-workspace - build-discarder: days-to-keep: 30 num-to-keep: 10 @@ -59,7 +60,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,9 +69,6 @@ cd ${WORKSPACE} - # Setup archive directory - mkdir out - # Extract sources from upstream job tar xaf incoming/jdkX.tar.gz @@ -81,8 +79,8 @@ mv $JDK_SRCDIR $JDKDIR 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 @@ -100,7 +98,8 @@ --with-boot-jdk=${WORKSPACE}/build-stage1/images/jdk \ ${ccache_build_opts} \ --with-version-opt="Linaro-$RELEASE" \ - --with-version-pre="release" + --with-version-pre="release" \ + --disable-warnings-as-errors make images popd else @@ -108,7 +107,8 @@ sh ../$JDKDIR/configure --with-debug-level=${BUILD_TYPE} \ ${ccache_build_opts} \ --with-version-opt="Linaro-$RELEASE" \ - --with-version-pre="release" + --with-version-pre="release" \ + --disable-warnings-as-errors make images popd fi |