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

[svn at pcbsd.org]

Author: kris
Date: 2008-05-12 12:59:42 -0700 (Mon, 12 May 2008)
New Revision: 1892

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

Fixed up the pbibuilder scripts to only do 1 version of FreeBSD, since you
can't cross build in a chroot environment properly



Modified: pbibuild/pbibuilder/buildpbi.sh
===================================================================
--- pbibuild/pbibuilder/buildpbi.sh	2008-05-12 17:25:25 UTC (rev 1891)
+++ pbibuild/pbibuilder/buildpbi.sh	2008-05-12 19:59:42 UTC (rev 1892)
@@ -28,7 +28,7 @@
 
 
 # Check if we need to remake the buildworld environment
-if [ ! -e "/pbi-build/buildworld63/.cshrc" -o "$REBUILDWORLD" = "1" ]
+if [ ! -e "/pbi-build/buildworld/.cshrc" -o "$REBUILDWORLD" = "1" ]
 then
   echo "Rebuilding the world environment..."
 
@@ -37,17 +37,7 @@
   ./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

Modified: pbibuild/pbibuilder/scripts/1.createworld.sh
===================================================================
--- pbibuild/pbibuilder/scripts/1.createworld.sh	2008-05-12 17:25:25 UTC (rev 1891)
+++ pbibuild/pbibuilder/scripts/1.createworld.sh	2008-05-12 19:59:42 UTC (rev 1892)
@@ -13,7 +13,7 @@
   exit 1
 fi
 
-PDESTDIR="${PROGDIR}/buildworld63" ; export PDESTDIR
+PDESTDIR="${PROGDIR}/buildworld" ; export PDESTDIR
 
 if [ -e "${PDESTDIR}" ]
 then
@@ -24,27 +24,8 @@
 
 mkdir -p ${PDESTDIR}
 
-echo "Making the /pbi-build/buildworld63 environment..."
+echo "Making the /pbi-build/buildworld 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-05-12 17:25:25 UTC (rev 1891)
+++ pbibuild/pbibuilder/scripts/2.1.startmake.sh	2008-05-12 19:59:42 UTC (rev 1892)
@@ -42,15 +42,9 @@
 
 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
+# Set our buildworld variables
+BUILDWORLD="${PROGDIR}/buildworld" ; export BUILDWORLD
+WORLDSRC="${PROGDIR}/fbsd-source/6.3/src" ; export WORLDSRC
 
 # Check that the output directory for module 
 if [ ! -e "${OUTDIR}" ]