diff options
| author | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2014-05-23 12:27:09 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2014-05-23 12:27:09 +0300 |
| commit | 682a7f9134b384d9f66231e07ec1c0af70b3388e (patch) | |
| tree | 692669eba919b48128b8d4d8cafe55a0594da6de | |
| parent | 77fde2622b0040eb6137353955f4029d0474da0b (diff) | |
Reinstate installing java6-sun, but set java7 as default.
Change-Id: Iee31a977ccf65238dba95b112a229d4a346cd96d
| -rwxr-xr-x | node/setup-build-android | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/node/setup-build-android b/node/setup-build-android index b65061b..918b115 100755 --- a/node/setup-build-android +++ b/node/setup-build-android @@ -49,7 +49,17 @@ apt-get-retry --non-fatal update # add feature to allow add-apt-repository apt-get-retry install -y python-software-properties unixodbc java-common +# enable partner repo for sun-java6 +##add-apt-repository "deb http://archive.canonical.com/ubuntu maverick partner" +##apt-get update + +wget -nv --no-check-certificate http://android-build.linaro.org/seed/sun-java6-bin_6.26-2natty1_amd64.deb \ + http://android-build.linaro.org/seed/sun-java6-jdk_6.26-2natty1_amd64.deb \ + http://android-build.linaro.org/seed/sun-java6-jre_6.26-2natty1_all.deb + export DEBIAN_FRONTEND=noninteractive +##apt-get install -y sun-java6-jdk || (debconf 'echo SET shared/accepted-sun-dlj-v1-1 true' || true; apt-get install -f -y; apt-get install -y sun-java6-jdk) +dpkg -i sun-java6-* || (debconf 'echo SET shared/accepted-sun-dlj-v1-1 true' || true; apt-get install -f -y; dpkg -i sun-java6-*) # Install basic development packages # Do not install toolchains and other variable stuff here @@ -112,6 +122,11 @@ apt-get-retry install -y \ # libx11-dev \ # x11proto-core-dev \ +## set java-6-sun as default +#update-java-alternatives -s java-6-sun || true +# set java-7-openjdk as default +update-java-alternatives -s java-7-openjdk-amd64 || true + adduser --system jenkins-build # Install linaro-image-tools so builds can create complete FS images. |