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

svn at pcbsd.org svn at pcbsd.org
Tue Nov 25 14:50:08 PST 2008


Author: kris
Date: 2008-11-25 14:50:08 -0800 (Tue, 25 Nov 2008)
New Revision: 2991

Added:
   pbibuild/pbibuilder/scripts/3.1.makeinmate.sh
Modified:
   pbibuild/pbibuilder/scripts/2.1.startmake.sh
   pbibuild/pbibuilder/scripts/2.makeport.sh
   pbibuild/pbibuilder/scripts/3.makepbi.sh
Log:

Updated the pbibuilder scripts, to now allow building of warden inmate files from modules in SVN. Will be adding some initial modules here after the Thanksgiving holiday. 



Modified: pbibuild/pbibuilder/scripts/2.1.startmake.sh
===================================================================
--- pbibuild/pbibuilder/scripts/2.1.startmake.sh	2008-11-25 17:39:51 UTC (rev 2990)
+++ pbibuild/pbibuilder/scripts/2.1.startmake.sh	2008-11-25 22:50:08 UTC (rev 2991)
@@ -53,7 +53,7 @@
 fi
 
 BLOG="${OUTDIR}/build.log" ; export BLOG
-rm ${BLOG}.bz2
+rm ${BLOG}.bz2 >/dev/null 2>/dev/null
 
 # Clear out the log file
 echo "" >${BLOG}

Modified: pbibuild/pbibuilder/scripts/2.makeport.sh
===================================================================
--- pbibuild/pbibuilder/scripts/2.makeport.sh	2008-11-25 17:39:51 UTC (rev 2990)
+++ pbibuild/pbibuilder/scripts/2.makeport.sh	2008-11-25 22:50:08 UTC (rev 2991)
@@ -80,7 +80,7 @@
      BUILD="1" 
      MODULEDIR="${PROGDIR}/modules/${module}" ; export MODULEDIR
      BLOG="${OUTDIR}/build.log" ; export BLOG
-     rm ${BLOG}.bz2
+     rm ${BLOG}.bz2 2>/dev/null 2>/dev/null
   else
      echo "Module ${module} is up to date"
   fi


Property changes on: pbibuild/pbibuilder/scripts/3.1.makeinmate.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: pbibuild/pbibuilder/scripts/3.makepbi.sh
===================================================================
--- pbibuild/pbibuilder/scripts/3.makepbi.sh	2008-11-25 17:39:51 UTC (rev 2990)
+++ pbibuild/pbibuilder/scripts/3.makepbi.sh	2008-11-25 22:50:08 UTC (rev 2991)
@@ -36,9 +36,21 @@
 
 cd ${PROGDIR}/modules
 
+# Unset the PBIVERSION
+PBIVERSION="" ; export PBIVERSION
+INMATEVER="" ; export INMATEVER
+BUILDINMATE="" ; export BUILDINMATE
 
+# Source the modules configuration file
 . ${module}/pbi.conf
 
+# Check if we are working on an inmate file, and call the right script if so
+if [ "${BUILDINMATE}" = "YES" ]
+then
+  ${PROGDIR}/scripts/3.1.makeinmate.sh ${module}
+  exit 0
+fi
+
 # Set our variables for this PBI Creation
 MODULEDIR="${PROGDIR}/modules/${module}" ; export MODULEDIR
 BLOG="${OUTDIR}/build.log" ; export BLOG



More information about the Commits mailing list