2006-08-25 10:54:25 by steve

1.  Added new global function in our global functions file "removeDebianPackage".

  2.  Updated all role scripts to use the common function code instead of their own individual functions.

roles/builder

@@ -13,16 +13,14 @@ prefix=$1
 
 
 #
-#  This function installs a single package into the chroot, forcing
-# the installation to be non-interactive.
+#  Source our common functions - this will let us install a Debian package.
 #
-function install_package
-{
-    package=$1
-    
-    DEBIAN_FRONTEND=noninteractive chroot ${prefix} /usr/bin/apt-get --yes --force-yes install $package
+if [ -e /usr/lib/xen-tools/common.sh ]; then
+    . /usr/lib/xen-tools/common.sh
+else
+    echo "Installation problem"
+fi
 
-}
 
 
 
@@ -32,13 +30,14 @@ function install_package
 #
 chroot ${prefix} /usr/bin/apt-get update
 
+
 #
 #  Install the packages
 #
-install_package dpkg-dev
-install_package devscripts
-install_package fakeroot
-install_package debhelper
-install_package build-essential
-install_package lintian
-install_package linda
+installDebianPackage ${prefix} dpkg-dev
+installDebianPackage ${prefix} devscripts
+installDebianPackage ${prefix} fakeroot
+installDebianPackage ${prefix} debhelper
+installDebianPackage ${prefix} build-essential
+installDebianPackage ${prefix} lintian
+installDebianPackage ${prefix} linda