summaryrefslogtreecommitdiff
path: root/pre-build-root-install-dependencies.sh
diff options
context:
space:
mode:
authorAndrew McDermott <andrew.mcdermott@linaro.org>2013-10-07 18:37:41 +0100
committerAndrew McDermott <andrew.mcdermott@linaro.org>2013-10-08 19:37:48 +0100
commitf267514187b73ae8ab06fe72c0cc72bfe5397151 (patch)
tree4266fbbe99fd17423026c3d227f41ebde7c75caa /pre-build-root-install-dependencies.sh
parent485f150fe4ac7f1d287f194fc332631fff2ed873 (diff)
Remove meta-java layer
The build of OpenJDK-8 no longer depends on icedtea7-native as we now use the hosts version of java/javac when bootstrapping. Change-Id: I13ee1b1b7689d88f17d7ddebf0a69e88c0ec3db6 Signed-off-by: Andrew McDermott <andrew.mcdermott@linaro.org>
Diffstat (limited to 'pre-build-root-install-dependencies.sh')
-rwxr-xr-xpre-build-root-install-dependencies.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/pre-build-root-install-dependencies.sh b/pre-build-root-install-dependencies.sh
index 701c27d..87c659c 100755
--- a/pre-build-root-install-dependencies.sh
+++ b/pre-build-root-install-dependencies.sh
@@ -16,12 +16,12 @@ if [ "$DISTRIBUTION" = "ubuntu" ]; then
#apt-get install -y --force-yes autoconf automake libtool libglib2.0-dev
# Linaro Extras
apt-get install -y --force-yes automake bzip2 bzr cvs desktop-file-utils \
- libtool patch python realpath subversion texi2html
+ libtool patch python realpath subversion texi2html openjdk-7-jdk
elif [ "$DISTRIBUTION" = "fedora" ]; then
# Essentials
yum install gawk make wget tar bzip2 gzip python unzip perl patch \
diffutils diffstat git cpp gcc gcc-c++ eglibc-devel texinfo chrpath \
- ccache
+ ccache java-1.7.0-openjdk
# Graphical Extras
#yum install SDL-devel xterm
# Documentation