[PC-BSD Commits] r1753 - in pbibuild/pbibuilder: . scripts

[svn at pcbsd.org]

Author: kris
Date: 2008-04-23 12:40:58 -0700 (Wed, 23 Apr 2008)
New Revision: 1753

Modified:
   pbibuild/pbibuilder/buildpbi.sh
   pbibuild/pbibuilder/scripts/1.createworld.sh
   pbibuild/pbibuilder/scripts/2.1.startmake.sh
Log:

Updated pbi builder scripts



Modified: pbibuild/pbibuilder/buildpbi.sh
===================================================================
--- pbibuild/pbibuilder/buildpbi.sh	2008-04-22 18:27:40 UTC (rev 1752)
+++ pbibuild/pbibuilder/buildpbi.sh	2008-04-23 19:40:58 UTC (rev 1753)
@@ -28,16 +28,26 @@
 
 
 # Check if we need to remake the buildworld environment
-if [ ! -e "/pbi-build/buildworld/.cshrc" -o "$REBUILDWORLD" = "1" ]
+if [ ! -e "/pbi-build/buildworld63/.cshrc" -o "$REBUILDWORLD" = "1" ]
 then
   echo "Rebuilding the world environment..."
 
   # Make the world environment
   cd ${PROGDIR}/scripts
   ./1.createworld.sh
+fi
 
+# Check if we need to remake the buildworld environment
+if [ ! -e "/pbi-build/buildworld70/.cshrc" -o "$REBUILDWORLD" = "1" ]
+then
+  echo "Rebuilding the world environment..."
+
+  # Make the world environment
+  cd ${PROGDIR}/scripts
+  ./1.createworld.sh
 fi
 
+
 # Check if the user has the ports collection before starting on the modules
 if [ ! -e "/pbi-build/usr/ports/COPYRIGHT" ]
 then
@@ -61,7 +71,7 @@
 # Make our modules now
 echo "Starting module traversal..."
 cd ${PROGDIR}/scripts
-./2.makeport.sh
+./2.makeport.sh "$@"
 
 rm /pbi-build/.lock
 exit 0

Modified: pbibuild/pbibuilder/scripts/1.createworld.sh
===================================================================
--- pbibuild/pbibuilder/scripts/1.createworld.sh	2008-04-22 18:27:40 UTC (rev 1752)
+++ pbibuild/pbibuilder/scripts/1.createworld.sh	2008-04-23 19:40:58 UTC (rev 1753)
@@ -13,7 +13,7 @@
   exit 1
 fi
 
-PDESTDIR="${PROGDIR}/buildworld" ; export PDESTDIR
+PDESTDIR="${PROGDIR}/buildworld63" ; export PDESTDIR
 
 if [ -e "${PDESTDIR}" ]
 then
@@ -24,8 +24,27 @@
 
 mkdir -p ${PDESTDIR}
 
-echo "Making the /pbi-build/buildworld environment..."
-cd /usr/src
+echo "Making the /pbi-build/buildworld63 environment..."
+cd /pbi-build/fbsd-source/6.3/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
 
+
+
+PDESTDIR="${PROGDIR}/buildworld70" ; export PDESTDIR
+
+if [ -e "${PDESTDIR}" ]
+then
+  echo "Removing ${PDESTDIR}"
+  chflags -R noschg ${PDESTDIR}
+  rm -rf ${PDESTDIR}
+fi
+
+mkdir -p ${PDESTDIR}
+
+echo "Making the /pbi-build/buildworld70 environment..."
+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-04-22 18:27:40 UTC (rev 1752)
+++ pbibuild/pbibuilder/scripts/2.1.startmake.sh	2008-04-23 19:40:58 UTC (rev 1753)
@@ -21,7 +21,6 @@
 
 module="${1}"
 
-BUILDWORLD="${PROGDIR}/buildworld" ; export BUILDWORLD
 PDESTDIR="${PROGDIR}/pbisandbox" ; export PDESTDIR
 PBIDIR="/pbi" ; export PBIDIR
 MODULEDIR="${PROGDIR}/modules/${module}" ; export MODULEDIR
@@ -43,6 +42,16 @@
 
 OUTDIR="${PROGDIR}/outgoing/${module}" ; export OUTDIR
 
+if [ "${FBSDBASE}" = "7.0" ]
+then
+  BUILDWORLD="${PROGDIR}/buildworld70" ; export BUILDWORLD70
+  WORLDSRC="${PROGDIR}/fbsd-source/7.0/src" ; export WORLDSRC
+elif [ "${FBSDBASE}" = "6.3" -o -z "${FBSDBASE}" ]
+then
+  BUILDWORLD="${PROGDIR}/buildworld63" ; export BUILDWORLD63
+  WORLDSRC="${PROGDIR}/fbsd-source/6.3/src" ; export WORLDSRC
+fi
+
 # Check that the output directory for module 
 if [ ! -e "${OUTDIR}" ]
 then
@@ -63,19 +72,28 @@
   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
+  tar cvf - -C ${WORLDSRC} . 2>/dev/null | tar xvpf - -C ${PDESTDIR}/usr/src 2>/dev/null
 
+
 else
+  # Remove the old pbisandbox and recreate it
   echo "Removing ${PDESTDIR}"
   chflags -R noschg ${PDESTDIR}
   rm -rf ${PDESTDIR}
   mkdir -p ${PDESTDIR}
+
+  # Copy the buildworld environment
   echo "Copying ${BUILDWORLD} to ${PDESTDIR}" >>${BLOG}
   tar cvf - -C ${BUILDWORLD} . 2>/dev/null | tar xvpf - -C ${PDESTDIR} 2>/dev/null
+
+  # Copy over the ports tree
   mkdir -p ${PDESTDIR}/usr/ports
   tar cvf - -C ${PROGDIR}/usr/ports . 2>/dev/null | tar xvpf - -C ${PDESTDIR}/usr/ports 2>/dev/null
+
+  # Copy over the system-source
   mkdir -p ${PDESTDIR}/usr/src
-  tar cvf - -C /usr/src . 2>/dev/null | tar xvpf - -C ${PDESTDIR}/usr/src 2>/dev/null
+  tar cvf - -C ${WORLDSRC} . 2>/dev/null | tar xvpf - -C ${PDESTDIR}/usr/src 2>/dev/null
+
 fi