diff options
| -rw-r--r-- | build-scripts/build-android-restricted | 2 | ||||
| -rw-r--r-- | build-scripts/build-android-testsuite-restricted | 2 | ||||
| -rw-r--r-- | build-scripts/build-android-toolchain-linaro-restricted | 2 | ||||
| -rwxr-xr-x | node/setup-build-android | 53 |
4 files changed, 29 insertions, 30 deletions
diff --git a/build-scripts/build-android-restricted b/build-scripts/build-android-restricted index a44336b..7ba909f 100644 --- a/build-scripts/build-android-restricted +++ b/build-scripts/build-android-restricted @@ -7,5 +7,5 @@ ############################################################################### set +x -export GIT_SSH=/var/run/lava/ssh +export GIT_SSH=/usr/local/bin/ssh-linaro exec bash -xe ${BUILD_SCRIPT_ROOT}/build-android "$@" diff --git a/build-scripts/build-android-testsuite-restricted b/build-scripts/build-android-testsuite-restricted index d28e225..76f2e9d 100644 --- a/build-scripts/build-android-testsuite-restricted +++ b/build-scripts/build-android-testsuite-restricted @@ -6,7 +6,7 @@ # http://www.eclipse.org/legal/epl-v10.html ############################################################################### -export GIT_SSH=/var/run/lava/ssh +export GIT_SSH=/usr/local/bin/ssh-linaro source "${BUILD_SCRIPT_ROOT}"/helpers diff --git a/build-scripts/build-android-toolchain-linaro-restricted b/build-scripts/build-android-toolchain-linaro-restricted index 48a90d7..e8ac147 100644 --- a/build-scripts/build-android-toolchain-linaro-restricted +++ b/build-scripts/build-android-toolchain-linaro-restricted @@ -7,5 +7,5 @@ ############################################################################### set +x -export GIT_SSH=/var/run/lava/ssh +export GIT_SSH=/usr/local/bin/ssh-linaro exec bash -xe ${BUILD_SCRIPT_ROOT}/build-android-toolchain-linaro "$@" diff --git a/node/setup-build-android b/node/setup-build-android index 100537e..1bfaf18 100755 --- a/node/setup-build-android +++ b/node/setup-build-android @@ -40,26 +40,26 @@ wget -nv --no-check-certificate 'http://android.git.linaro.org/gitweb?p=tools/re mv repo /usr/local/bin/repo chmod a+x /usr/local/bin/repo -sed -i.bk 's,^\(.*://[^.]*.ec2.archive.ubuntu.com\)/,\1.s3.amazonaws.com/,' /etc/apt/sources.list -apt-get-retry --non-fatal update +# Disabled workaround for 14.04, as it causes problems with it +#sed -i.bk 's,^\(.*://[^.]*.ec2.archive.ubuntu.com\)/,\1.s3.amazonaws.com/,' /etc/apt/sources.list -# We do update as part of early node init (to get this script actually) -#apt-get update +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 +# Install Oracle JDK 6 for older Android versions +add-apt-repository -y ppa:webupd8team/java +apt-get-retry --non-fatal update 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-*) +# Will fail due to non-accepted license +apt-get install -y oracle-java6-installer || true +debconf 'echo SET shared/accepted-sun-dlj-v1-1 true' || true +debconf 'echo SET shared/accepted-oracle-license-v1-1 true' || true +apt-get install -f -y +apt-get install -y oracle-java6-installer + # Install basic development packages # Do not install toolchains and other variable stuff here @@ -84,24 +84,14 @@ apt-get-retry install -y \ x11proto-core-dev \ gcc-multilib \ g++-multilib \ + gcc-4.8-multilib \ + g++-4.8-multilib \ libc6-dev-i386 \ lib32ncurses5-dev \ - ia32-libs \ lib32readline-gplv2-dev \ lib32z-dev \ - gcc-4.5 \ - g++-4.5 \ - cpp-4.5 \ - gcc-4.5-multilib \ - g++-4.5-multilib \ - gcc-4.4 \ - g++-4.4 \ - cpp-4.4 \ - gcc-4.4-multilib \ - g++-4.4-multilib \ gcc-arm-linux-gnueabi \ - gcc-4.5-arm-linux-gnueabi \ - uboot-mkimage \ + u-boot-tools \ uuid-dev \ lzop \ libxml2-utils \ @@ -123,9 +113,18 @@ apt-get-retry install -y \ # valgrind \ # libx11-dev \ # x11proto-core-dev \ +# gcc-4.5 \ +# g++-4.5 \ +# ia32-libs \ +# gcc-4.5-arm-linux-gnueabi \ +# gcc-4.4 \ +# g++-4.4 \ +# cpp-4.4 \ +# gcc-4.4-multilib \ +# g++-4.4-multilib \ # set java-6-sun as default -update-java-alternatives -s java-6-sun || true +update-java-alternatives -s java-6-oracle || true ## set java-7-openjdk as default ("java-7-openjdk-amd64" doesn't work here) #update-java-alternatives -s java-1.7.0-openjdk-amd64 || true |