fixing builds

diff --git a/config.planetlab/devel.pkgs b/config.planetlab/devel.pkgs
index 0bea302..b8b04eb 100644 (file)
--- a/config.planetlab/devel.pkgs
+++ b/config.planetlab/devel.pkgs
@@ -71,6 +71,8 @@ package: postgresql postgresql-devel postgresql-python postgresql-server
 # if we don't specify @arch@ for php-devel, we end up with the 2 variants (i386 and x86_64)
 # in an undetermined order, and php-config --extension-dir might return the wrong place
 package: php php-devel.@arch@ php-gd php-pgsql 
 # if we don't specify @arch@ for php-devel, we end up with the 2 variants (i386 and x86_64)
 # in an undetermined order, and php-config --extension-dir might return the wrong place
 package: php php-devel.@arch@ php-gd php-pgsql 

+# now this seems to have been fixed in f12
+pacakge+f12: php-devel

 package: PyXML 
 # used to reference SOAPpy as well
 # for pypcilib
 package: PyXML 
 # used to reference SOAPpy as well
 # for pypcilib

diff --git a/onelab.mk b/onelab.mk
index e7f9425..ba8fab1 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -49,7 +49,8 @@ ipfwroot-DEPEND-DEVEL-RPMS := kernel-devel
 ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \
         kernel_release=$(kernel.rpm-release) \
         kernel_arch=$(kernel.rpm-arch)
 ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \
         kernel_release=$(kernel.rpm-release) \
         kernel_arch=$(kernel.rpm-arch)

-ALL += ipfwroot
+### temporarily off
+### ALL += ipfwroot

 
 ipfwslice-MODULES := ipfwsrc
 ipfwslice-SPEC := planetlab/ipfwslice.spec
 
 ipfwslice-MODULES := ipfwsrc
 ipfwslice-SPEC := planetlab/ipfwslice.spec

diff --git a/vbuild-nightly.sh b/vbuild-nightly.sh
index 47f8315..d33d83c 100755 (executable)
--- a/vbuild-nightly.sh
+++ b/vbuild-nightly.sh
@@ -124,7 +124,7 @@ function failure() {
            echo "See full build log at ${LOG_URL}" ; \
            echo "and tail version at ${LOG_URL}.ko" ; \
            echo "See complete set of testlogs at ${TESTLOGS_URL}" ; \
            echo "See full build log at ${LOG_URL}" ; \
            echo "and tail version at ${LOG_URL}.ko" ; \
            echo "See complete set of testlogs at ${TESTLOGS_URL}" ; \

-           tail --lines=1000 ${WEBLOG} ) | mail -s "Failures with ${MAIL_SUBJECT} ${BASE}" $MAILTO
+           tail --lines=1000 ${WEBLOG} ) | mail -s "Failures with ${MAIL_SUBJECT} ${BASE} on $(hostname)" $MAILTO

     fi
     exit 1
 }
     fi
     exit 1
 }


@@ -157,7 +157,7 @@ function success () {
            echo "$PLDISTRO ($BASE) build for $FCDISTRO completed on $(date)" ; \
            echo "See full build log at ${LOG_URL}" ; \
             [ -n "$DO_TEST" ] && echo "See complete set of testlogs at ${TESTLOGS_URL}" ) \
            echo "$PLDISTRO ($BASE) build for $FCDISTRO completed on $(date)" ; \
            echo "See full build log at ${LOG_URL}" ; \
             [ -n "$DO_TEST" ] && echo "See complete set of testlogs at ${TESTLOGS_URL}" ) \

-           | mail -s "Success with ${MAIL_SUBJECT} ${BASE}" $MAILTO
+           | mail -s "Success with ${MAIL_SUBJECT} ${BASE} on $(hostname)" $MAILTO

     fi
     # XXX For some reason, we haven't been getting this email for successful builds. If this sleep
     # doesn't fix the problem, I'll remove it -- Sapan.
     fi
     # XXX For some reason, we haven't been getting this email for successful builds. If this sleep
     # doesn't fix the problem, I'll remove it -- Sapan.