April 2009 - darwinbuild-changes - lists.macosforge.org

[509] trunk/plists/9A581.plist
by source_changes＠macosforge.org 28 Apr '09

28 Apr '09

Revision: 509 http://trac.macosforge.org/projects/darwinbuild/changeset/509 Author: wsiegrist(a)apple.com Date: 2009-04-28 14:18:38 -0700 (Tue, 28 Apr 2009) Log Message: ----------- Add some dependencies to ppp Modified Paths: -------------- trunk/plists/9A581.plist Modified: trunk/plists/9A581.plist =================================================================== --- trunk/plists/9A581.plist 2009-04-18 01:22:06 UTC (rev 508) +++ trunk/plists/9A581.plist 2009-04-28 21:18:38 UTC (rev 509) @@ -10538,10 +10538,13 @@ ppp = { dependencies = { build = ( + CarbonHeaders, + CF, DirectoryService, Kerberos, Libm, Libsystem, + Security, bash, bsm, cctools,

1 0

[508] trunk/README
by source_changes＠macosforge.org 18 Apr '09

18 Apr '09

Revision: 508 http://trac.macosforge.org/projects/darwinbuild/changeset/508 Author: wsiegrist(a)apple.com Date: 2009-04-17 18:22:06 -0700 (Fri, 17 Apr 2009) Log Message: ----------- Update the README with the new storage options Modified Paths: -------------- trunk/README Modified: trunk/README =================================================================== --- trunk/README 2009-04-18 01:03:44 UTC (rev 507) +++ trunk/README 2009-04-18 01:22:06 UTC (rev 508) @@ -17,6 +17,7 @@ 5.1 Private Headers 5.2 Build Tools 5.3 Static Libraries + 5.4 Alternate BuildRoot Storage Appendix A. darwinxref @@ -74,22 +75,13 @@ 2.1 Creating the Build Directory After installation, you must initialize the build directory using darwinbuild. -In order to build Xcode-based projects, you need to use UFS to workaround a -bug. For Makefile-based projects, you can use any filesystem. You know you -have hit the bug when you get a build error about a missing project or -platform (depending on which version of Xcode you have). +Assuming you wanted to build projects from 9G55 in your home directory: -To create a UFS disk image: - - % hdiutil create -size 4g -type UDIF -fs UFS -volname dbufs -attach dbufs.dmg - -To initialize your build environment, assuming you used the step above: - - # cd /Volumes/dbufs - # mkdir 9G55 - # cd 9G55 + # mkdir ~/9G55 + # cd ~/9G55 # sudo -s # darwinbuild -init 9G55 + Creating build root disk image ... Attempting to download http://svn.macosforge.org/repository/darwinbuild/trunk/plists//9G55.plist ... Download complete Attempting to download http://svn.macosforge.org/repository/darwinbuild/trunk/plists//9F33.plist ... @@ -97,6 +89,7 @@ ... Attempting to download http://svn.macosforge.org/repository/darwinbuild/trunk/plists//9A581.plist ... Download complete + Initialization Complete # ls .build Headers Logs Roots Sources Symbols @@ -272,6 +265,26 @@ use of many static libraries from Libc, Libinfo, and more. +5.4 Alternate BuildRoot Storage + +By default, "darwinbuild -init" will setup your environment to use a HFSX +sparsebundle to host your BuildRoot. A sparsebundle is used to work around +problems with using xcodebuild inside of a chroot. There are two other +storage methods to choose from: NFS Loopback and Legacy Directory. + + 1. NFS Loopback (ex: darwinbuild -init 9G55 -nfs) + The NFS loopback method places a directory under .build and adds that + directory to /etc/exports. When you try to build a project, darwinbuild + will mount the NFS export on localhost. The NFS mount also works around + the xcodebuild problems. + + 2. Legacy Directory (ex: darwinbuild -init 9G55 -nodmg) + This is just the way darwinbuild worked before the sparsebundle and NFS + support was added. It just makes a directory for BuildRoot and builds + on whatever filesystem you are on at the time. If you are on HFS or ZFS, + this storage will cause problems for Xcode-based projects. + + ============= A. darwinxref =============

1 0

[507] trunk/darwinbuild/darwinbuild.in
by source_changes＠macosforge.org 18 Apr '09

18 Apr '09

Revision: 507 http://trac.macosforge.org/projects/darwinbuild/changeset/507 Author: wsiegrist(a)apple.com Date: 2009-04-17 18:03:44 -0700 (Fri, 17 Apr 2009) Log Message: ----------- NFS loopback buildroot support. This works on Leopard, though it does pollute /etc/exports. Modified Paths: -------------- trunk/darwinbuild/darwinbuild.in Modified: trunk/darwinbuild/darwinbuild.in =================================================================== --- trunk/darwinbuild/darwinbuild.in 2009-04-17 21:35:18 UTC (rev 506) +++ trunk/darwinbuild/darwinbuild.in 2009-04-18 01:03:44 UTC (rev 507) @@ -79,8 +79,10 @@ ### PREFIX=%%PREFIX%% +PWDP=$(pwd -P) XREFDB=.build/xref.db DMGFILE=.build/buildroot.sparsebundle +NFSDIR=.build/buildroot.nfs DARWINXREF=$PREFIX/bin/darwinxref DATADIR=$PREFIX/share/darwinbuild COMMONFILE=$DATADIR/darwinbuild.common @@ -161,14 +163,20 @@ ### ### Create the build root ### + stamp=$(date +'%Y%m%d%H%M%S') if [ "$3" == "-nfs" ]; then - echo "NFS not implemented"; - exit 71; + echo "Adding build root to NFS exports file ..." + mkdir -p $NFSDIR + mkdir -p BuildRoot + echo "# Added by darwinbuild on ${stamp}" >> /etc/exports + echo "${PWDP}/${NFSDIR} -maproot=0:10" >> /etc/exports + nfsd update + echo "Checking exports file ..." + nfsd checkexports elif [ "$3" == "-nodmg" ]; then mkdir -p BuildRoot else echo "Creating build root disk image ..." - stamp=$(date +'%Y%m%d%H%M%S') DMGVOLUME="BuildRoot_${build}_${stamp}" hdiutil create -size 1t -fs HFSX -quiet \ -volname $DMGVOLUME \ @@ -212,12 +220,22 @@ ### ### See if we need to attach a disk image or mount an NFS share ### -stat -L $BuildRoot >> /dev/null 2>&1 -if [ $? -eq 1 ]; then - echo "*** Attaching build root disk image ..." - hdiutil attach $DMGFILE -readwrite +if [ ! -d "$BuildRoot/var" -a -d $NFSDIR ]; then + echo "*** Mounting build root over NFS loopback ..." + mount -t nfs localhost:${PWDP}/${NFSDIR} BuildRoot if [ $? -ne 0 ]; then - echo "Error: Unable to attach sparse disk image"; + echo "Error: Unable to mount build root"; + exit 72 + fi +elif [ -d $DMGFILE ]; then + stat -L $BuildRoot >> /dev/null 2>&1 + if [ $? -eq 1 ]; then + echo "*** Attaching build root disk image ..." + hdiutil attach $DMGFILE -readwrite + if [ $? -ne 0 ]; then + echo "Error: Unable to attach sparse disk image"; + exit 70 + fi fi fi

1 0

[506] trunk/darwinbuild/darwinbuild.in
by source_changes＠macosforge.org 17 Apr '09

17 Apr '09

Revision: 506 http://trac.macosforge.org/projects/darwinbuild/changeset/506 Author: wsiegrist(a)apple.com Date: 2009-04-17 14:35:18 -0700 (Fri, 17 Apr 2009) Log Message: ----------- Fix the -init usage statement to include the new options Modified Paths: -------------- trunk/darwinbuild/darwinbuild.in Modified: trunk/darwinbuild/darwinbuild.in =================================================================== --- trunk/darwinbuild/darwinbuild.in 2009-04-17 20:41:22 UTC (rev 505) +++ trunk/darwinbuild/darwinbuild.in 2009-04-17 21:35:18 UTC (rev 506) @@ -132,7 +132,7 @@ ### if [ "$1" == "-init" ]; then if [ "$2" == "" ]; then - echo "usage: $(basename $0) -init <build>" 1>&2 + echo "usage: $(basename $0) -init <build> [-nodmg | -nfs]" 1>&2 echo "" 1>&2 echo "\t-nodmg \t do not use a sparse image for build root (use a regular directory)" 1>&2 echo "\t-nfs \t use NFS over loopback to mount the build root (implies -nodmg)" 1>&2

1 0

[505] trunk/darwinbuild/darwinbuild.in
by source_changes＠macosforge.org 17 Apr '09

17 Apr '09

Revision: 505 http://trac.macosforge.org/projects/darwinbuild/changeset/505 Author: wsiegrist(a)apple.com Date: 2009-04-17 13:41:22 -0700 (Fri, 17 Apr 2009) Log Message: ----------- New HFXS sparse image support. Use it by default to work around Xcode/chroot problems. Modified Paths: -------------- trunk/darwinbuild/darwinbuild.in Modified: trunk/darwinbuild/darwinbuild.in =================================================================== --- trunk/darwinbuild/darwinbuild.in 2009-04-17 19:57:39 UTC (rev 504) +++ trunk/darwinbuild/darwinbuild.in 2009-04-17 20:41:22 UTC (rev 505) @@ -80,6 +80,7 @@ PREFIX=%%PREFIX%% XREFDB=.build/xref.db +DMGFILE=.build/buildroot.sparsebundle DARWINXREF=$PREFIX/bin/darwinxref DATADIR=$PREFIX/share/darwinbuild COMMONFILE=$DATADIR/darwinbuild.common @@ -132,6 +133,9 @@ if [ "$1" == "-init" ]; then if [ "$2" == "" ]; then echo "usage: $(basename $0) -init <build>" 1>&2 + echo "" 1>&2 + echo "\t-nodmg \t do not use a sparse image for build root (use a regular directory)" 1>&2 + echo "\t-nfs \t use NFS over loopback to mount the build root (implies -nodmg)" 1>&2 exit 1 fi build="$2" @@ -154,12 +158,34 @@ echo "$build" > .build/build + ### + ### Create the build root + ### + if [ "$3" == "-nfs" ]; then + echo "NFS not implemented"; + exit 71; + elif [ "$3" == "-nodmg" ]; then + mkdir -p BuildRoot + else + echo "Creating build root disk image ..." + stamp=$(date +'%Y%m%d%H%M%S') + DMGVOLUME="BuildRoot_${build}_${stamp}" + hdiutil create -size 1t -fs HFSX -quiet \ + -volname $DMGVOLUME \ + $DMGFILE + ln -s "/Volumes/${DMGVOLUME}" BuildRoot + fi + + ### + ### Download the build's plist and its parents + ### while [ "$build" != "" ]; do Download .build "$build".plist "$sites ${DEFAULTPLISTSITE}" $DARWINXREF "-f$XREFDB" "-b$build" loadIndex .build/"$build".plist sites=$($DARWINXREF "-f$XREFDB" "-b$build" plist_sites | xargs echo) build=$($DARWINXREF "-f$XREFDB" "-b$build" inherits) done + echo "Initialization Complete" exit 0 fi @@ -180,12 +206,22 @@ ### Check that we're property situated in an initialized directory ### CheckDarwinBuildRoot - BuildRoot="$DARWIN_BUILDROOT/BuildRoot" -mkdir -p "$BuildRoot" export DARWINXREF_DB_FILE="$DARWIN_BUILDROOT/$XREFDB" ### +### See if we need to attach a disk image or mount an NFS share +### +stat -L $BuildRoot >> /dev/null 2>&1 +if [ $? -eq 1 ]; then + echo "*** Attaching build root disk image ..." + hdiutil attach $DMGFILE -readwrite + if [ $? -ne 0 ]; then + echo "Error: Unable to attach sparse disk image"; + fi +fi + +### ### Check and see wether there is a sources directory set in the ### environment ($DARWIN_SOURCES). If not we assign it the sources pass ### in the $DARWIN_BUILDROOT

1 0

[504] trunk/plists/9A581.plist
by source_changes＠macosforge.org 17 Apr '09

17 Apr '09

Revision: 504 http://trac.macosforge.org/projects/darwinbuild/changeset/504 Author: wsiegrist(a)apple.com Date: 2009-04-17 12:57:39 -0700 (Fri, 17 Apr 2009) Log Message: ----------- Some more bless dependencies Modified Paths: -------------- trunk/plists/9A581.plist Modified: trunk/plists/9A581.plist =================================================================== --- trunk/plists/9A581.plist 2009-03-26 20:26:36 UTC (rev 503) +++ trunk/plists/9A581.plist 2009-04-17 19:57:39 UTC (rev 504) @@ -5352,7 +5352,10 @@ bless = { dependencies = { build = ( + CarbonHeaders, + CF, DiskArbitration, + IOKitUser, Libm, Libsystem, bash, @@ -5896,6 +5899,7 @@ build = ( Libm, Libsystem, + TargetConfig, bash, bootstrap_cmds, bsdmake, @@ -6921,6 +6925,15 @@ version = 520; }; flex = { + dependencies = { + build = ( + CarbonHeaders, + gnumake, + grep, + shell_cmds, + text_cmds, + ); + }; environment = { RC_ARCHS = "ppc ppc64 i386 x86_64"; };

1 0