Changeset 1753 for pbibuild/pbibuilder/scripts/2.1.startmake.sh

Timestamp:

04/23/08 12:40:58 (8 months ago)

Author:

kris

Message:

Updated pbi builder scripts

Files:

• pbibuild/pbibuilder/scripts/2.1.startmake.sh (modified) (3 diffs)

pbibuild/pbibuilder/scripts/2.1.startmake.sh

@@ -22 +22 @@
 module="${1}"
 
-BUILDWORLD="${PROGDIR}/buildworld" ; export BUILDWORLD
 PDESTDIR="${PROGDIR}/pbisandbox" ; export PDESTDIR
 PBIDIR="/pbi" ; export PBIDIR
@@ -43 +42 @@
 
 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 
@@ -64 +73 @@
   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