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

[svn at pcbsd.org]

Author: kris
Date: 2008-11-10 08:24:11 -0800 (Mon, 10 Nov 2008)
New Revision: 2956

Modified:
   pbibuild/pbibuilder/scripts/1.createworld.sh
   pbibuild/pbibuilder/scripts/2.1.startmake.sh
   pbibuild/pbibuilder/scripts/2.makeport.sh
   pbibuild/pbibuilder/scripts/3.makepbi.sh
Log:

Updated the pbi builder scripts to latest versions in use on our build systems



Modified: pbibuild/pbibuilder/scripts/1.createworld.sh
===================================================================
--- pbibuild/pbibuilder/scripts/1.createworld.sh	2008-11-09 16:05:22 UTC (rev 2955)
+++ pbibuild/pbibuilder/scripts/1.createworld.sh	2008-11-10 16:24:11 UTC (rev 2956)
@@ -25,7 +25,7 @@
 mkdir -p ${PDESTDIR}
 
 echo "Making the /pbi-build/buildworld environment..."
-cd /pbi-build/fbsd-source/6.3/src
+cd /pbi-build/fbsd-source/7.0/src
 make buildworld installworld DESTDIR=${PDESTDIR} >${PROGDIR}/log/buildworld.log 2>${PROGDIR}/log/buildworld.log
 make distribution DESTDIR=${PDESTDIR} >>${PROGDIR}/log/buildworld.log 2>>${PROGDIR}/log/buildworld.log
 

Modified: pbibuild/pbibuilder/scripts/2.1.startmake.sh
===================================================================
--- pbibuild/pbibuilder/scripts/2.1.startmake.sh	2008-11-09 16:05:22 UTC (rev 2955)
+++ pbibuild/pbibuilder/scripts/2.1.startmake.sh	2008-11-10 16:24:11 UTC (rev 2956)
@@ -44,7 +44,7 @@
 
 # Set our buildworld variables
 BUILDWORLD="${PROGDIR}/buildworld" ; export BUILDWORLD
-WORLDSRC="${PROGDIR}/fbsd-source/6.3/src" ; export WORLDSRC
+WORLDSRC="${PROGDIR}/fbsd-source/7.0/src" ; export WORLDSRC
 
 # Check that the output directory for module 
 if [ ! -e "${OUTDIR}" ]
@@ -53,6 +53,7 @@
 fi
 
 BLOG="${OUTDIR}/build.log" ; export BLOG
+rm ${BLOG}.bz2
 
 # Clear out the log file
 echo "" >${BLOG}
@@ -122,7 +123,7 @@
 FORCE_PKG_REGISTER="Y" ; export FORCE_PKG_REGISTER
 
 
-mount_devfs devfs /dev
+mount -t devfs devfs /dev
 
 cd /
 /etc/rc.d/ldconfig start
@@ -197,6 +198,7 @@
 else
   echo "ERROR: 2.1 Build failed of ${module}!!!"
   echo "ERROR: 2.1 Build failed of ${module}!!!" >>${BLOG}
+  bzip2 ${BLOG}
   if [ -e "${PROGDIR}/scripts/4.mailresults.sh" ]
   then
     ${PROGDIR}/scripts/4.mailresults.sh ${module} Failed

Modified: pbibuild/pbibuilder/scripts/2.makeport.sh
===================================================================
--- pbibuild/pbibuilder/scripts/2.makeport.sh	2008-11-09 16:05:22 UTC (rev 2955)
+++ pbibuild/pbibuilder/scripts/2.makeport.sh	2008-11-10 16:24:11 UTC (rev 2956)
@@ -80,6 +80,7 @@
      BUILD="1" 
      MODULEDIR="${PROGDIR}/modules/${module}" ; export MODULEDIR
      BLOG="${OUTDIR}/build.log" ; export BLOG
+     rm ${BLOG}.bz2
   else
      echo "Module ${module} is up to date"
   fi

Modified: pbibuild/pbibuilder/scripts/3.makepbi.sh
===================================================================
--- pbibuild/pbibuilder/scripts/3.makepbi.sh	2008-11-09 16:05:22 UTC (rev 2955)
+++ pbibuild/pbibuilder/scripts/3.makepbi.sh	2008-11-10 16:24:11 UTC (rev 2956)
@@ -84,6 +84,12 @@
   PORTVER="${PORTVER}_${PORTREV}" ; export PORTVER
 fi
 
+if [ ! -z "${PBIVERSION}" ]
+then
+   echo "Using set PBIVERSION"
+   PORTVER="${PBIVERSION}"
+fi
+
 echo "PORTREV ${PORTREV}
 PORTVER ${PORTVER}"
 
@@ -108,7 +114,7 @@
 echo '#!/bin/sh
 
 # Create our dup mounts
-mount_devfs devfs /dev 
+mount -t devfs devfs /dev 
 
 # Clean up any old PBI directory and remake it
 rm -rf ${PBIDIR}
@@ -228,22 +234,25 @@
   echo "SUCCESS! PBI Creation finished for ${module}" >>${BLOG}
 
   # Clean up any old PBI's in the outdir
-  count=0
-  for i in `ls -t ${OUTDIR}/*.pbi`
-  do
-   count="`expr $count + 1`" 
-   if [ "${count}" -gt "2" ]
-   then
-     echo "Purging old PBI ${i}" >> ${BLOG}
-     rm ${i}
-   fi
-  done
+  #count=0
+  #for i in `ls -t ${OUTDIR}/*.pbi`
+  #do
+  # count="`expr $count + 1`" 
+  # if [ "${count}" -gt "1" ]
+  # then
+  #   echo "Purging old PBI ${i}" >> ${BLOG}
+  #   rm ${i}
+  # fi
+  #done
 
+  rm ${OUTDIR}/*.pbi
   ls ${PDESTDIR}/root/*.pbi >> ${BLOG} 2>>${BLOG}
   mv ${PDESTDIR}/root/*.pbi ${OUTDIR}/ 2>>${BLOG}
 
   # The build is finished, go ahead and make the .built and .oldbk files 
   echo "`md5 ${PDESTDIR}/${PBIPORT}/Makefile | cut -d \" \" -f 4`" >${OUTDIR}/.built
+  echo "Getting md5 for ${PDESTDIR}/${PBIPORT}/Makefile"
+  echo "`md5 ${PDESTDIR}/${PBIPORT}/Makefile | cut -d \" \" -f 4`"
   echo "${BUILDKEY}" >${OUTDIR}/.oldbk
 
   if [ -e "${PROGDIR}/scripts/4.mailresults.sh" ]
@@ -268,7 +277,11 @@
 
 fi
 
+# Compress our log file now
+rm ${BLOG}.bz2
+bzip2 ${BLOG}
 
+
 if [ -e "${PROGDIR}/cron/upload-nightly.sh" ]
 then
   # Sync the outgoing directory now