Summary
Description: Unnamed repository; edit this file to name it for gitweb.
Last Change: Wed 2/3/10 13:04
Recent Commits
>
--git a/pts-core/functions/pts-functions-install.php b/pts-core/functions/pts-functions-install.php
index 3eca2cc..b3a0ab4 100644
--- a/pts-core/functions/pts-functions-install.php
+++ b/pts-core/functions/pts-functions-install.php
@@ -123,14 +123,16 @@ function pts_install_external_dependencies($Benchmark, &$INSTALL_OBJ)
$dependencies = explode(", ", $dependencies);
$dep_match_count = 0;
- if(is_file(MISC_LOCATION . "distro-xml/" . os_vendor() . "-packages.xml"))
+ $vendor = strtolower(os_vendor());
+
+ if(is_file(MISC_LOCATION . "distro-xml/" . $vendor . "-packages.xml"))
{
- $xml_parser = new tandem_XmlReader(file_get_contents(MISC_LOCATION . "distro-xml/" . os_vendor() . "-packages.xml"));
- $generic_package = $xml_parser->getXMLArrayValues("Distribution/Package/GenericName");
- $distro_package = $xml_parser->getXMLArrayValues("Distribution/Package/PackageName");
+ $xml_parser = new tandem_XmlReader(file_get_contents(MISC_LOCATION . "distro-xml/" . $vendor . "-packages.xml"));
+ $generic_package = $xml_parser->getXMLArrayValues("PhoronixTestSuite/ExternalDependencies/Package/GenericName");
+ $distro_package = $xml_parser->getXMLArrayValues("PhoronixTestSuite/ExternalDependencies/Package/PackageName");
for($i = 0; $i < count($generic_package); $i++)
- if(in_array($generic_package[$i], $dependencies))
+ if(!empty($generic_package[$i]) && in_array($generic_package[$i], $dependencies))
if(!in_array($distro_package[$i], $INSTALL_OBJ))
{
array_push($INSTALL_OBJ, $distro_package[$i]);
diff --git a/pts-core/pts-run-cmd.php b/pts-core/pts-run-cmd.php
index d377de2..a69ecf2 100644
--- a/pts-core/pts-run-cmd.php
+++ b/pts-core/pts-run-cmd.php
@@ -77,7 +77,7 @@ switch($COMMAND)
if(!empty($install_objects))
{
$install_objects = implode(" ", $install_objects);
- echo pts_exec("cd " . MISC_LOCATION . "distro-scripts/ && sh install-" . os_vendor() . "-packages.sh $install_objects\n");
+ echo pts_exec("cd " . MISC_LOCATION . "distro-scripts/ && sh install-" . strtolower(os_vendor()) . "-packages.sh $install_objects");
}
break;
case "REMOTE_COMPARISON":
diff --git a/pts/misc-files/distro-scripts/install-ubuntu-packages.sh b/pts/misc-files/distro-scripts/install-ubuntu-packages.sh
new file mode 100755
index 0000000..9e3517f
--- /dev/null
+++ b/pts/misc-files/distro-scripts/install-ubuntu-packages.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+# Portions based on Debian fglrx install script
+# http://phorogit.com/index.php?p=fglrx-packaging.git&b=c67ac96d765ca95130bd07cb240ab69cfc06baa2
+
+if [ `whoami` != "root" ]; then
+ if [ -x /usr/bin/gksudo ] && [ ! -z "$DISPLAY" ]; then
+ ROOT="/usr/bin/gksudo"
+ elif [ -x /usr/bin/kdesu ] && [ ! -z "$DISPLAY" ]; then
+ ROOT="/usr/bin/kdesu"
+ elif [ -x /usr/bin/sudo ]; then
+ ROOT="/usr/bin/sudo"
+ fi
+else
+ ROOT=""
+fi
+
+if [ -x /usr/sbin/synaptic ]; then
+ SYNAPTIC="TRUE"
+else
+ SYNAPTIC=""
+fi
+
+
+# if [ ! -z "$SYNAPTIC" ] && [ ! -z "$DISPLAY" ]; then
+# $ROOT "/usr/sbin/synaptic --set-selections --non-interactive $@"
+# else
+# $ROOT "apt-get -y install $@"
+# fi
+
+$ROOT "apt-get -y install $@"
diff --git a/pts/misc-files/distro-xml/ubuntu-packages.xml b/pts/misc-files/distro-xml/ubuntu-packages.xml
new file mode 100644
index 0000000..2d4b6ee
--- /dev/null
+++ b/pts/misc-files/distro-xml/ubuntu-packages.xml
@@ -0,0 +1,8 @@
+<PhoronixTestSuite>
+ <ExternalDependencies>
+ <Package>
+ <GenericName>gtk-development</GenericName>
+ <PackageName>libgtk2.0-dev</PackageName>
+ </Package>
+ </ExternalDependencies>
+</PhoronixTestSuite>
<
Copyright © 2010 by Phoronix Media