Changeset 1892

Show
Ignore:
Timestamp:
05/12/08 12:59:42 (2 months ago)
Author:
kris
Message:

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

Location:
pbibuild/pbibuilder
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • pbibuild/pbibuilder/buildpbi.sh

    r1753 r1892  
    2929 
    3030# Check if we need to remake the buildworld environment 
    31 if [ ! -e "/pbi-build/buildworld63/.cshrc" -o "$REBUILDWORLD" = "1" ] 
    32 then 
    33   echo "Rebuilding the world environment..." 
    34  
    35   # Make the world environment 
    36   cd ${PROGDIR}/scripts 
    37   ./1.createworld.sh 
    38 fi 
    39  
    40 # Check if we need to remake the buildworld environment 
    41 if [ ! -e "/pbi-build/buildworld70/.cshrc" -o "$REBUILDWORLD" = "1" ] 
     31if [ ! -e "/pbi-build/buildworld/.cshrc" -o "$REBUILDWORLD" = "1" ] 
    4232then 
    4333  echo "Rebuilding the world environment..." 

  • pbibuild/pbibuilder/scripts/1.createworld.sh

    r1753 r1892  
    1414fi 
    1515 
    16 PDESTDIR="${PROGDIR}/buildworld63" ; export PDESTDIR 
     16PDESTDIR="${PROGDIR}/buildworld" ; export PDESTDIR 
    1717 
    1818if [ -e "${PDESTDIR}" ] 
    … …  
    2525mkdir -p ${PDESTDIR} 
    2626 
    27 echo "Making the /pbi-build/buildworld63 environment..." 
     27echo "Making the /pbi-build/buildworld environment..." 
    2828cd /pbi-build/fbsd-source/6.3/src 
    2929make buildworld installworld DESTDIR=${PDESTDIR} >${PROGDIR}/log/buildworld.log 2>${PROGDIR}/log/buildworld.log 
    3030make distribution DESTDIR=${PDESTDIR} >>${PROGDIR}/log/buildworld.log 2>>${PROGDIR}/log/buildworld.log 
    3131 
    32  
    33  
    34 PDESTDIR="${PROGDIR}/buildworld70" ; export PDESTDIR 
    35  
    36 if [ -e "${PDESTDIR}" ] 
    37 then 
    38   echo "Removing ${PDESTDIR}" 
    39   chflags -R noschg ${PDESTDIR} 
    40   rm -rf ${PDESTDIR} 
    41 fi 
    42  
    43 mkdir -p ${PDESTDIR} 
    44  
    45 echo "Making the /pbi-build/buildworld70 environment..." 
    46 cd /pbi-build/fbsd-source/7.0/src 
    47 make buildworld installworld DESTDIR=${PDESTDIR} >${PROGDIR}/log/buildworld.log 2>${PROGDIR}/log/buildworld.log 
    48 make distribution DESTDIR=${PDESTDIR} >>${PROGDIR}/log/buildworld.log 2>>${PROGDIR}/log/buildworld.log 
    49  
    50  

  • pbibuild/pbibuilder/scripts/2.1.startmake.sh

    r1753 r1892  
    4343OUTDIR="${PROGDIR}/outgoing/${module}" ; export OUTDIR 
    4444 
    45 if [ "${FBSDBASE}" = "7.0" ] 
    46 then 
    47   BUILDWORLD="${PROGDIR}/buildworld70" ; export BUILDWORLD70 
    48   WORLDSRC="${PROGDIR}/fbsd-source/7.0/src" ; export WORLDSRC 
    49 elif [ "${FBSDBASE}" = "6.3" -o -z "${FBSDBASE}" ] 
    50 then 
    51   BUILDWORLD="${PROGDIR}/buildworld63" ; export BUILDWORLD63 
    52   WORLDSRC="${PROGDIR}/fbsd-source/6.3/src" ; export WORLDSRC 
    53 fi 
     45# Set our buildworld variables 
     46BUILDWORLD="${PROGDIR}/buildworld" ; export BUILDWORLD 
     47WORLDSRC="${PROGDIR}/fbsd-source/6.3/src" ; export WORLDSRC 
    5448 
    5549# Check that the output directory for module