[darwinbuild-changes] [277] trunk/darwinbuild/darwinmaster.sh

[source_changes at macosforge.org]

Revision: 277
          http://trac.macosforge.org/projects/darwinbuild/changeset/277
Author:   kevin
Date:     2006-10-04 02:02:12 -0700 (Wed, 04 Oct 2006)

Log Message:
-----------
- use darwinxref to get list of projects required for booting
- use InstallRoot() to install roots onto the image

Modified Paths:
--------------
    trunk/darwinbuild/darwinmaster.sh

Modified: trunk/darwinbuild/darwinmaster.sh
===================================================================
--- trunk/darwinbuild/darwinmaster.sh	2005-09-21 23:51:12 UTC (rev 276)
+++ trunk/darwinbuild/darwinmaster.sh	2006-10-04 09:02:12 UTC (rev 277)
@@ -75,6 +75,8 @@
 MKISOFS="/opt/local/bin/mkisofs"
 SIZE="650m"
 
+export DARWINXREF_DB_FILE="$DARWIN_BUILDROOT/$XREFDB"
+
 ###
 ### Must be run as root.  Enforce this.
 ###
@@ -84,6 +86,32 @@
 fi
 
 ###
+### Look for a build number
+###
+if [ "$DARWINBUILD_BUILD" != "" ]; then
+	build="$DARWINBUILD_BUILD"
+fi
+
+###
+### No build number specified.  Look in the DARWIN_BUILDROOT for
+### a cached value.
+###
+if [ "$build" == "" -a -f "$DARWIN_BUILDROOT/.build/build" ]; then
+	build="$(cat $DARWIN_BUILDROOT/.build/build)"
+fi
+
+###
+### Still no build number specified.  Error.
+###
+if [ "$build" == "" ]; then
+	echo "Error: no build number specified." 2>&1
+	exit 1
+fi
+export DARWINBUILD_BUILD="$build"
+
+
+
+###
 ### Update binary packages
 ###
 "$DATADIR/packageRoots"
@@ -107,7 +135,6 @@
 DESTDIR=$(hdiutil attach "$DMG" \
 		-readwrite \
 		-owners on | tail -1 | awk '{print $3}')
-RECEIPTS="$DESTDIR/.receipts"
 
 ###
 ### Copy roots necessary for booting / installation onto disk image
@@ -117,21 +144,8 @@
 chmod 1775 "$DESTDIR"
 
 echo "Installing Roots ..."
-[ -d "$RECEIPTS" ] || mkdir "$RECEIPTS"
-#for X in $PKGDIR/files-*.tar.gz $PKGDIR/*-*.tar.gz ; do
-for Z in $(cat "$DARWIN_BUILDROOT/boot.txt") ; do
-	X=$DARWIN_BUILDROOT/BinaryDrivers_${ARCH}/$Z-*.tar.bz2
-	if [ ! -f "$X" ]; then
-		X=$DARWIN_BUILDROOT/Packages_${ARCH}/$Z-*.tar.bz2
-	fi
-	if [ -f "$X" ]; then
-		RECEIPT=$RECEIPTS/$(basename $X)
-		if [ "$RECEIPT" -ot $X ]; then
-			echo ... $(basename $X)
-			tar xjf $X
-			touch $RECEIPT
-		fi
-	fi
+for Project in $("$DARWINXREF" group boot) ; do
+	InstallRoot "$DESTDIR" "$Project" "$build"
 done
 
 ###

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20061004/daad32b6/attachment.html