diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2016-08-30 15:43:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2016-08-30 15:43:26 +0000 |
| commit | 8ce1f7d331733e7809679773b515984c2d12ba74 (patch) | |
| tree | 9ee1ac84db600579a95d880513c34e2355d10f41 /packer/provision | |
| parent | df2e4bec82ffc69103a1c8d4cddd3a858f67671f (diff) | |
| parent | 28174f23be0a4423fc25c0f074371bd616291766 (diff) | |
Merge "Fix java installation to use default-jdk/jre-headless"
Diffstat (limited to 'packer/provision')
| -rw-r--r-- | packer/provision/baseline.sh | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh index 36783554..769924af 100644 --- a/packer/provision/baseline.sh +++ b/packer/provision/baseline.sh @@ -109,17 +109,8 @@ EOF # install Java 7 echo "---> Configuring OpenJDK" - apt-get install -qq openjdk-7-jdk > /dev/null + apt-get install -qq default-jre-headless default-jdk-headless > /dev/null - # make jdk8 available - add-apt-repository -y ppa:openjdk-r/ppa > /dev/null - apt-get update -qq > /dev/null - # We need to force openjdk-8-jdk to install - apt-get install -qq openjdk-8-jdk > /dev/null - - # make sure that we still default to openjdk 7 - update-alternatives --set java /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java - update-alternatives --set javac /usr/lib/jvm/java-7-openjdk-amd64/bin/javac } all_systems() { |