[PC-BSD Commits] r6423 - pbibuild/pbibuilder8/scripts

[svn at pcbsd.org]

Author: kris
Date: 2010-03-17 10:08:58 -0700 (Wed, 17 Mar 2010)
New Revision: 6423

Modified:
   pbibuild/pbibuilder8/scripts/1.createworld.sh
   pbibuild/pbibuilder8/scripts/2.makeport.sh
   pbibuild/pbibuilder8/scripts/3.1.makeinmate.sh
   pbibuild/pbibuilder8/scripts/3.makepbi.sh
Log:

Updated the build scripts for pbibuilder8



Modified: pbibuild/pbibuilder8/scripts/1.createworld.sh
===================================================================
--- pbibuild/pbibuilder8/scripts/1.createworld.sh	2010-03-17 17:07:50 UTC (rev 6422)
+++ pbibuild/pbibuilder8/scripts/1.createworld.sh	2010-03-17 17:08:58 UTC (rev 6423)
@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 
 # Check if we have sourced the variables yet
-if [ "${PROGDIR}" == "" ]
+if [ "${PROGDIR}" = "" ]
 then
   . /pbi-build/conf/pbibuild.conf
 fi
@@ -25,7 +25,7 @@
 mkdir -p ${PDESTDIR}
 
 echo "Making the /pbi-build/buildworld environment..."
-cd /pbi-build/fbsd-source/7.0/src
+cd /pbi-build/fbsd-source/8.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/pbibuilder8/scripts/2.makeport.sh
===================================================================
--- pbibuild/pbibuilder8/scripts/2.makeport.sh	2010-03-17 17:07:50 UTC (rev 6422)
+++ pbibuild/pbibuilder8/scripts/2.makeport.sh	2010-03-17 17:08:58 UTC (rev 6423)
@@ -13,21 +13,6 @@
   exit 1
 fi
 
-if [ -d "${PROGDIR}/svn" ]
-then
-
-  # Make sure we update the svn source
-  cd ${PROGDIR}/svn
-  svn update
-
-  # Copy the module directory
-  echo "Copying modules directory..."
-  rm -rf ${PROGDIR}/modules
-  mkdir ${PROGDIR}/modules
-  tar cvf - -C /pbi-build/svn/ --exclude .svn . 2>/dev/null | tar xvpf - -C ${PROGDIR}/modules 2>/dev/null
-
-fi
-  
 PDESTDIR="${PROGDIR}/pbisandbox" ; export PDESTDIR
 PBIDIR="/pbi" ; export PBIDIR
 

Modified: pbibuild/pbibuilder8/scripts/3.1.makeinmate.sh
===================================================================
--- pbibuild/pbibuilder8/scripts/3.1.makeinmate.sh	2010-03-17 17:07:50 UTC (rev 6422)
+++ pbibuild/pbibuilder8/scripts/3.1.makeinmate.sh	2010-03-17 17:08:58 UTC (rev 6423)
@@ -150,11 +150,11 @@
 
 # Set the File Name variable
 cp ${IDIR}/conf/inmate-name .
-FNAME="`cat ${IDIR}/conf/inmate-name | tr -d \" \"`"
+FNAME="`cat ${IDIR}/conf/inmate-name | tr -d ' '`"
 
 # Set our File Version variable
 cp ${IDIR}/conf/inmate-version .
-FVER="`cat ${IDIR}/conf/inmate-version | tr -d \" \"`"
+FVER="`cat ${IDIR}/conf/inmate-version | tr -d ' '`"
 
 cp ${IDIR}/conf/inmate-descr .
 echo "`uname -r | cut -d \"-\" -f 1`" > inmate-OS
@@ -168,7 +168,7 @@
 ___INMATE_START___" > .spacer
 
 # Create the lzma of the package
-tar cvf - -C ${IDIR} . 2>/dev/null | /lzma -si e "pkg.lzma" 2>/dev/null
+tar cvf - -C ${IDIR} . 2>/dev/null | /lzma -z -c - >pkg.lzma 2>/dev/null
 
 # Make the .wit file now
 cat header.tgz .spacer pkg.lzma > ../${FNAME}${FVER}.wit

Modified: pbibuild/pbibuilder8/scripts/3.makepbi.sh
===================================================================
--- pbibuild/pbibuilder8/scripts/3.makepbi.sh	2010-03-17 17:07:50 UTC (rev 6422)
+++ pbibuild/pbibuilder8/scripts/3.makepbi.sh	2010-03-17 17:08:58 UTC (rev 6423)
@@ -75,7 +75,7 @@
 echo "Copying over ${module}..." >>${BLOG}
 rm -rf ${PDESTDIR}/module
 mkdir ${PDESTDIR}/module
-tar cvf - -C ${module} . 2>/dev/null | tar xvpf - -C ${PDESTDIR}/module 2>/dev/null
+tar cvf - -C ${module} --exclude .svn . 2>/dev/null | tar xvpf - -C ${PDESTDIR}/module 2>/dev/null
 
 # Copy over the PBI Creator program
 echo "Copying over PBC..." >>${BLOG}