[mapguide-commits] r8621 - in trunk/Tools/Vagrant/packer/scripts: mapguide ubuntu

[svn_mapguide at osgeo.org]

Author: jng
Date: 2015-04-08 17:11:14 -0700 (Wed, 08 Apr 2015)
New Revision: 8621

Modified:
   trunk/Tools/Vagrant/packer/scripts/mapguide/ubuntu32.sh
   trunk/Tools/Vagrant/packer/scripts/mapguide/ubuntu64.sh
   trunk/Tools/Vagrant/packer/scripts/ubuntu/virtualbox.sh
Log:
#2520: Fix packer build scripts for Ubuntu. The problem is apt-get is essentially broken out of the box on 12.04.5 and causes nearly most of the packages we're trying to apt-get install to not be installed. We actually already had the workaround in place (wipe out everything in /var/lib/apt/lists/ and regenerate with apt-get update), but that workaround needed to be executed before the first apt-get package install command is ever made. This submission relocates the workaround to where it needed to be executed.

Modified: trunk/Tools/Vagrant/packer/scripts/mapguide/ubuntu32.sh
===================================================================
--- trunk/Tools/Vagrant/packer/scripts/mapguide/ubuntu32.sh	2015-04-02 12:06:45 UTC (rev 8620)
+++ trunk/Tools/Vagrant/packer/scripts/mapguide/ubuntu32.sh	2015-04-09 00:11:14 UTC (rev 8621)
@@ -2,9 +2,6 @@
 # Set bash as the default shell
 echo "dash    dash/sh boolean false" | sudo debconf-set-selections
 sudo dpkg-reconfigure --frontend=noninteractive dash
-# Guard against (http://askubuntu.com/questions/41605/trouble-downloading-updates-due-to-a-hash-sum-mismatch-error)
-sudo rm -rf /var/lib/apt/lists/*
-sudo apt-get update
 sudo apt-get install -y build-essential bison automake libtool libpng-dev libjpeg62-dev libxslt-dev libfreetype6-dev libpcre3-dev openjdk-7-jdk subversion lintian ant scons dos2unix liboss4-salsa-dev libldap-dev libssl-dev libcurl4-openssl-dev libexpat-dev libmysqlclient-dev unixODBC-dev python-dev libpq-dev libcppunit-dev
 # For producing .tar.xz archives
 sudo apt-get install -y xz-utils

Modified: trunk/Tools/Vagrant/packer/scripts/mapguide/ubuntu64.sh
===================================================================
--- trunk/Tools/Vagrant/packer/scripts/mapguide/ubuntu64.sh	2015-04-02 12:06:45 UTC (rev 8620)
+++ trunk/Tools/Vagrant/packer/scripts/mapguide/ubuntu64.sh	2015-04-09 00:11:14 UTC (rev 8621)
@@ -2,9 +2,6 @@
 # Set bash as the default shell
 echo "dash    dash/sh boolean false" | sudo debconf-set-selections
 sudo dpkg-reconfigure --frontend=noninteractive dash
-# Guard against (http://askubuntu.com/questions/41605/trouble-downloading-updates-due-to-a-hash-sum-mismatch-error)
-sudo rm -rf /var/lib/apt/lists/*
-sudo apt-get update
 sudo apt-get install -y build-essential bison automake libtool libpng-dev libjpeg62-dev libxslt-dev libfreetype6-dev libpcre3-dev openjdk-7-jdk subversion lintian ant scons dos2unix liboss4-salsa-dev libldap-dev libssl-dev libcurl4-openssl-dev libexpat-dev libmysqlclient-dev unixODBC-dev python-dev libpq-dev libcppunit-dev
 # For producing .tar.xz archives
 sudo apt-get install -y xz-utils

Modified: trunk/Tools/Vagrant/packer/scripts/ubuntu/virtualbox.sh
===================================================================
--- trunk/Tools/Vagrant/packer/scripts/ubuntu/virtualbox.sh	2015-04-02 12:06:45 UTC (rev 8620)
+++ trunk/Tools/Vagrant/packer/scripts/ubuntu/virtualbox.sh	2015-04-09 00:11:14 UTC (rev 8621)
@@ -3,6 +3,12 @@
 set -e
 set -x
 
+# I suspect that apt-get out of the box is fubar'd on 12.04.5 due to 
+# (http://askubuntu.com/questions/41605/trouble-downloading-updates-due-to-a-hash-sum-mismatch-error)
+# We already had a workaround for this in one of the down-level scripts, but it seems we need to do this right here, right now
+sudo rm -rf /var/lib/apt/lists/*
+sudo apt-get update
+
 sudo aptitude -y install dkms
 sudo aptitude -y install make