diff options
| author | Stuart Monteith <stuart.monteith@linaro.org> | 2016-06-20 14:54:53 +0100 |
|---|---|---|
| committer | Stuart Monteith <stuart.monteith@linaro.org> | 2016-06-20 15:23:06 +0000 |
| commit | 30a16a6fee05a41f37c07d80d468d8381c871bd5 (patch) | |
| tree | 3a862fd8d2d43a92c37efaa58a3a00d9b030ff35 /jdk8-build-image.yaml | |
| parent | c7f142828840466f1cadc26496cb0c5cfec64a47 (diff) | |
jdk8-build-image: Change how patches applied
Moving from jdk8 to jdk8u, a new set of patches needs to be applied
across different trees for the client JDK to be sucessfully built.
Change-Id: Ibcb7c4cca7e39d4ed96351579ad7ae003d55a12c
Diffstat (limited to 'jdk8-build-image.yaml')
| -rw-r--r-- | jdk8-build-image.yaml | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/jdk8-build-image.yaml b/jdk8-build-image.yaml index d754de15..d3d791d3 100644 --- a/jdk8-build-image.yaml +++ b/jdk8-build-image.yaml @@ -81,10 +81,19 @@ shopt -s nullglob - for i in ${WORKSPACE}/patches/*.patch; do - echo "Applying patch: $i" - (cd jdk8; patch -p1 < $i) - done + # Apply patches + # Only apply to client builds. + if [ "$JVM_VARIANT" = "client" ]; then + OLDDIR=$PWD + cd $WORKSPACE/patches + for patch in $(find -name '*.patch'); do + patch_dir=$(dirname $patch) + patch_path=$(pwd)/$patch + (echo Applying $patch to $patch_dir ; cd $OLDDIR/jdk8/$patch_dir; \ + patch -p1 < $patch_path) + done + cd $OLDDIR + fi # Extract boot jdk rm -rf primordial-jdk7 |