diff options
| author |   Andrew Grimberg <agrimberg@linuxfoundation.org> | 2016-09-01 09:20:16 -0700 |
|---|---|---|
| committer | Andrew Grimberg <agrimberg@linuxfoundation.org> | 2016-09-01 09:20:16 -0700 |
| commit | dc4c868e0ee2ba700b31be267219df9eb1ca29c3 (patch) | |
| tree | b3d520b13ec424f1ff1fe441820ddc50e7fb94cf | |
| parent | 05dc72c8231971429e6e22f0e6fdaeb89018a12b (diff) | |
Updates to get clean builds
* Fix ubuntu user data to point to the proper provisioning script
* Fix the baseline to make sure Vexxhost is not listed as a mirror
* Fix agl_dependencies to not try install non-existent python-2.7
package
Change-Id: If8fe295ffe097402b2e915bcd62a5e42e47e3d4f
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
| -rw-r--r-- | packer/provision/agl_dependencies.sh | 3 | ||||
| -rw-r--r-- | packer/provision/baseline.sh | 4 | ||||
| -rw-r--r-- | packer/vars/ubuntu-16.04.json | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/packer/provision/agl_dependencies.sh b/packer/provision/agl_dependencies.sh index cadb5ca2..a3d3077c 100644 --- a/packer/provision/agl_dependencies.sh +++ b/packer/provision/agl_dependencies.sh @@ -3,5 +3,4 @@ DEBIAN_FRONTEND=noninteractive apt-get update && \ apt-get -y install gawk wget git-core diffstat unzip texinfo gcc-multilib build-essential chrpath socat \ libsdl1.2-dev xterm make xsltproc docbook-utils fop dblatex xmlto autoconf automake \ - libtool libglib2.0-dev libarchive-dev python-git git python python-2.7 python-minimal \ - repo mc
\ No newline at end of file + libtool libglib2.0-dev libarchive-dev python-git git python python-minimal repo mc diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh index 769924af..931ee57a 100644 --- a/packer/provision/baseline.sh +++ b/packer/provision/baseline.sh @@ -99,6 +99,10 @@ Dpkg::Options { EOF + # Make sure that we aren't using the vexxhost mirrors as they have issues + echo "---> Removing Vexxhost Ubuntu mirrors" + sed -i 's/ubuntu.mirror.vexxhost.com/us.archive.ubuntu.com/g' /etc/apt/sources.list + echo "---> Updating operating system" apt-get update -qq > /dev/null apt-get upgrade -qq > /dev/null diff --git a/packer/vars/ubuntu-16.04.json b/packer/vars/ubuntu-16.04.json index aedec74d..7b33b382 100644 --- a/packer/vars/ubuntu-16.04.json +++ b/packer/vars/ubuntu-16.04.json @@ -3,5 +3,5 @@ "cloud_user": "ubuntu", "distro": "Ubuntu 16.04", - "cloud_user_data": "null_data" + "cloud_user_data": "provision/null_data.sh" } |