[PC-BSD Commits] r1699 - pbibuild/pbibuilder/scripts

[svn at pcbsd.org]

Author: kris
Date: 2008-04-08 11:36:35 -0700 (Tue, 08 Apr 2008)
New Revision: 1699

Modified:
   pbibuild/pbibuilder/scripts/2.1.startmake.sh
Log:

Updated the startmake.sh script to include the /usr/src contents since a
few more ports need system source now



Modified: pbibuild/pbibuilder/scripts/2.1.startmake.sh
===================================================================
--- pbibuild/pbibuilder/scripts/2.1.startmake.sh	2008-04-08 17:37:08 UTC (rev 1698)
+++ pbibuild/pbibuilder/scripts/2.1.startmake.sh	2008-04-08 18:36:35 UTC (rev 1699)
@@ -62,6 +62,8 @@
   tar cvf - -C ${BUILDWORLD} . 2>/dev/null | tar xvpf - -C ${PDESTDIR} 2>/dev/null
   mkdir -p ${PDESTDIR}/usr/ports
   tar cvf - -C ${PROGDIR}/usr/ports . 2>/dev/null | tar xvpf - -C ${PDESTDIR}/usr/ports 2>/dev/null
+  mkdir -p ${PDESTDIR}/usr/src
+  tar cvf - -C /usr/src . 2>/dev/null | tar xvpf - -C ${PDESTDIR}/usr/src 2>/dev/null
 
 else
   echo "Removing ${PDESTDIR}"
@@ -72,6 +74,8 @@
   tar cvf - -C ${BUILDWORLD} . 2>/dev/null | tar xvpf - -C ${PDESTDIR} 2>/dev/null
   mkdir -p ${PDESTDIR}/usr/ports
   tar cvf - -C ${PROGDIR}/usr/ports . 2>/dev/null | tar xvpf - -C ${PDESTDIR}/usr/ports 2>/dev/null
+  mkdir -p ${PDESTDIR}/usr/src
+  tar cvf - -C /usr/src . 2>/dev/null | tar xvpf - -C ${PDESTDIR}/usr/src 2>/dev/null
 fi
 
 
@@ -181,7 +185,14 @@
 else
   echo "ERROR: 2.1 Build failed of ${module}!!!"
   echo "ERROR: 2.1 Build failed of ${module}!!!" >>${BLOG}
-  echo "PDESTDIR: ${PDESTDIR}"
-  echo "PROGDIR: ${PROGDIR}"
+  if [ -e "${PROGDIR}/scripts/4.mailresults.sh" ]
+  then
+    ${PROGDIR}/scripts/4.mailresults.sh ${module} Failed
+    touch ${OUTDIR}/.buildfailed
+    rm ${OUTDIR}/.buildgood
+    echo "PDESTDIR: ${PDESTDIR}"
+    echo "PROGDIR: ${PROGDIR}"
+    ${PROGDIR}/cron/upload-nightly.sh
+  fi
   exit 1
 fi