--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build-scripts/147/02-chroot-template-configure-repos.shx	Tue Sep 28 16:19:56 2010 +0100
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+set -e
+
+PATH=/usr/sbin:/sbin:/usr/bin
+
+BRFS=rpool/br
+
+# Repository containing onnv+pkg+caiman >=137 matching current running system
+REPO_OI=http://pkg.openindiana.org/exp/
+
+# Repository containing legacy OpenSolaris b134 packages
+#REPO_LEGACY=http://pkg.opensolaris.org/dev/
+REPO_LEGACY=http://pkg-eu-2.opensolaris.org/dev/
+
+# OpenSolaris extra repository
+REPO_EXTRA=https://pkg.sun.com/opensolaris/extra/
+
+[ -e $HOME/.oibldenvrc ] && . $HOME/.oibldenvrc
+
+MNTPOINT=`zfs get -H mountpoint $BRFS/\`basename \\\`pwd\\\`\`/base 2>/dev/null|awk '{ print $3 }'`
+
+# OpenIndiana repository
+echo "Configuring openindiana.org repository"
+pkg image-create --zone -p os-snap=$REPO_OI $MNTPOINT
+pkg -R $MNTPOINT set-publisher --non-sticky os-snap
+
+# Legacy OpenSolaris repository
+echo "Configuring opensolaris.org repository"
+pkg -R $MNTPOINT set-publisher --non-sticky -O $REPO_LEGACY opensolaris.org
+
+# OpenSolaris extra repository
+echo "Configuring extra repository"
+
+
+if echo $REPO_EXTRA|grep ^https:// >/dev/null; then
+    mkdir $MNTPOINT/var/pkg/ssl
+    cp ../../non-redist/OpenSolaris_extras.certificate.pem ../../non-redist/OpenSolaris_extras.key.pem $MNTPOINT/var/pkg/ssl
+    pkg -R $MNTPOINT set-publisher --non-sticky -O $REPO_EXTRA \
+	-k /var/pkg/ssl/OpenSolaris_extras.key.pem \
+	-c /var/pkg/ssl/OpenSolaris_extras.certificate.pem extra
+else
+    pkg -R $MNTPOINT set-publisher --non-sticky -O $REPO_EXTRA extra
+fi
\ No newline at end of file

--- a/build-scripts/147/03-chroot-template-install-packages.sh	Sun Sep 12 01:39:24 2010 +0100
+++ b/build-scripts/147/03-chroot-template-install-packages.sh	Tue Sep 28 16:19:56 2010 +0100
@@ -13,5 +13,5 @@
 echo Installing default set of packages
 
 pkg -R $MNTPOINT install \
-consolidation/osnet/[email protected].`uname -v |sed -e 's/[^0-9]//g'` \
+consolidation/osnet/[email protected]`pkg info pkg:/consolidation/osnet/osnet-incorporation|awk '/Branch:/ { print $2 }'` \
 SUNWcs

--- a/build-scripts/147/04-chroot-template-extract-sunstudio.sh	Sun Sep 12 01:39:24 2010 +0100
+++ b/build-scripts/147/04-chroot-template-extract-sunstudio.sh	Tue Sep 28 16:19:56 2010 +0100
@@ -11,7 +11,7 @@
 MNTPOINT=`zfs get -H mountpoint $BRFS/\`basename \\\`pwd\\\`\`/base 2>/dev/null|awk '{ print $3 }'`
 
 echo Extracting sunstudio12-patched-ii-2009Sep-sol-x86.tar.bz2
-mkdir $MNTPOINT/opt/SUNWspro
+[ -d $MNTPOINT/opt/SUNWspro ] || mkdir $MNTPOINT/opt/SUNWspro
 bzip2 -dc ../../non-redist/sunstudio12-patched-ii-2009Sep-sol-x86.tar.bz2 | (cd $MNTPOINT/opt/SUNWspro; pfexec tar xf -)
 
 echo Extracting sunstudio12u1-patched-ii-2010Feb-sol-x86.tar.gz

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build-scripts/147/05-chroot-template-prepare.sh	Tue Sep 28 16:19:56 2010 +0100
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -e
+
+PATH=/usr/sbin:/sbin:/usr/bin
+
+BRFS=rpool/br
+
+[ -e $HOME/.oibldenvrc ] && . $HOME/.oibldenvrc
+
+MNTPOINT=`zfs get -H mountpoint $BRFS/\`basename \\\`pwd\\\`\`/base 2>/dev/null|awk '{ print $3 }'`
+
+echo Preparing chroot template
+
+cp /etc/passwd $MNTPOINT/etc
+cp /etc/resolv.conf $MNTPOINT/etc
+cp $MNTPOINT/etc/nsswitch.dns $MNTPOINT/etc/nsswitch.conf
+
+[ -d $MNTPOINT/devices ] || mkdir $MNTPOINT/devices

--- a/build-scripts/147/13-pkg-unpack-source.sh	Sun Sep 12 01:39:24 2010 +0100
+++ b/build-scripts/147/13-pkg-unpack-source.sh	Tue Sep 28 16:19:56 2010 +0100
@@ -15,7 +15,7 @@
 mkdir -p $MNTPOINT/build
 
 #hg clone http://pkgdev.openindiana.org/hg/pkg-gate $MNTPOINT/build/pkg
-#hg clone -U --ssh "ssh -o \"StrictHostKeyChecking no\"" ssh://[email protected]/hg/pkg/gate $MNTPOINT/build/pkg
+hg clone -U --ssh "ssh -o \"StrictHostKeyChecking no\"" ssh://[email protected]/hg/pkg/gate $MNTPOINT/build/pkg
 
-hg -R $MNTPOINT/build/pkg update -C 2055
+hg -R $MNTPOINT/build/pkg update -C in147
 cp -r $MNTPOINT/build/pkg $MNTPOINT/build/pkg-legacy

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build-scripts/147/15-pkg-chroot-mount-vfs.sh	Tue Sep 28 16:19:56 2010 +0100
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+set -e
+
+PATH=/usr/sbin:/sbin:/usr/bin
+
+BRFS=rpool/br
+
+[ -e $HOME/.oibldenvrc ] && . $HOME/.oibldenvrc
+
+MNTPOINT=`zfs get -H mountpoint $BRFS/\`basename \\\`pwd\\\`\`/pkg 2>/dev/null|awk '{ print $3 }'`
+
+echo Mounting filesystems
+
+for i in dev devices proc; do
+    mount|grep ^$MNTPOINT/$i\ >/dev/null || pfexec mount -F lofs /$i $MNTPOINT/$i
+done
+
+mount|grep ^$MNTPOINT/dev/fd\ >/dev/null || pfexec mount -F fd /dev/fd $MNTPOINT/dev/fd
+
+for i in etc/svc/volatile tmp var/run; do
+    mount|grep ^$MNTPOINT/$i\ >/dev/null || pfexec mount -F tmpfs swap $MNTPOINT/$i
+done
+
+if ! mount|grep ^$MNTPOINT/etc/svc/volatile/kcfd_door\  >/dev/null; then
+    touch $MNTPOINT/etc/svc/volatile/kcfd_door
+    pfexec mount -F lofs /etc/svc/volatile/kcfd_door $MNTPOINT/etc/svc/volatile/kcfd_door
+fi
+
+if ! mount|grep ^$MNTPOINT/lib/libc.so.1\  >/dev/null; then
+    if mount|grep ^/lib/libc.so.1\  >/dev/null; then
+	LIBC=`mount|awk '/^\/lib\/libc.so.1\ / { print $3 }'|sed s%^/%%`
+        mount -F lofs $MNTPOINT/$LIBC $MNTPOINT/lib/libc.so.1
+    fi
+fi

--- a/build-scripts/147/15-pkg-chroot-prepare.sh	Sun Sep 12 01:39:24 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PATH=/usr/sbin:/sbin:/usr/bin
-
-BRFS=rpool/br
-
-[ -e $HOME/.oibldenvrc ] && . $HOME/.oibldenvrc
-
-MNTPOINT=`zfs get -H mountpoint $BRFS/\`basename \\\`pwd\\\`\`/pkg 2>/dev/null|awk '{ print $3 }'`
-
-echo Preparing chroot
-
-cp /etc/passwd $MNTPOINT/etc
-cp /etc/resolv.conf $MNTPOINT/etc
-cp $MNTPOINT/etc/nsswitch.dns $MNTPOINT/etc/nsswitch.conf
-
-[ -d $MNTPOINT/devices ] || mkdir $MNTPOINT/devices

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build-scripts/147/16-pkg-build-packages-legacy.sh	Tue Sep 28 16:19:56 2010 +0100
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+PATH=/usr/sbin:/sbin:/usr/bin
+
+BRFS=rpool/br
+
+[ -e $HOME/.oibldenvrc ] && . $HOME/.oibldenvrc
+
+MNTPOINT=`zfs get -H mountpoint $BRFS/\`basename \\\`pwd\\\`\`/pkg 2>/dev/null|awk '{ print $3 }'`
+
+echo Building packages
+
+#/usr/sbin/chroot $MNTPOINT /bin/bash -c "cd /builds/pkg-gate/src; dmake -e BUILDNUM=145 packages"
+
+/usr/bin/env -i PATH=/opt/SUNWspro/bin:/usr/bin:/usr/gnu/bin /usr/sbin/chroot $MNTPOINT \
+/bin/bash -c "cd /build/pkg-legacy/src; dmake -e BUILDNUM=147 packages"

--- a/build-scripts/147/16-pkg-chroot-mount-vfs.sh	Sun Sep 12 01:39:24 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PATH=/usr/sbin:/sbin:/usr/bin
-
-BRFS=rpool/br
-
-[ -e $HOME/.oibldenvrc ] && . $HOME/.oibldenvrc
-
-MNTPOINT=`zfs get -H mountpoint $BRFS/\`basename \\\`pwd\\\`\`/pkg 2>/dev/null|awk '{ print $3 }'`
-
-echo Mounting filesystems
-
-[ -d $MNTPOINT/devices ] || mkdir $MNTPOINT/devices
-
-
-for i in dev devices proc; do
-    mount|grep ^$MNTPOINT/$i\ >/dev/null || pfexec mount -F lofs /$i $MNTPOINT/$i
-done
-
-mount|grep ^$MNTPOINT/dev/fd\ >/dev/null || pfexec mount -F fd /dev/fd $MNTPOINT/dev/fd
-
-for i in etc/svc/volatile tmp var/run; do
-    mount|grep ^$MNTPOINT/$i\ >/dev/null || pfexec mount -F tmpfs swap $MNTPOINT/$i
-done
-
-if ! mount|grep ^$MNTPOINT/etc/svc/volatile/kcfd_door\  >/dev/null; then
-    touch $MNTPOINT/etc/svc/volatile/kcfd_door
-    pfexec mount -F lofs /etc/svc/volatile/kcfd_door $MNTPOINT/etc/svc/volatile/kcfd_door
-fi
-
-if ! mount|grep ^$MNTPOINT/lib/libc.so.1\  >/dev/null; then
-    if mount|grep ^/lib/libc.so.1\  >/dev/null; then
-	LIBC=`mount|awk '/\/lib\/libc.so.1\ / { print $3 }'|sed s%^/%%`
-        mount -F lofs $MNTPOINT/$LIBC $MNTPOINT/lib/libc.so.1
-    fi
-fi

--- a/build-scripts/147/18-pkg-build-packages-legacy.sh	Sun Sep 12 01:39:24 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PATH=/usr/sbin:/sbin:/usr/bin
-
-BRFS=rpool/br
-
-[ -e $HOME/.oibldenvrc ] && . $HOME/.oibldenvrc
-
-MNTPOINT=`zfs get -H mountpoint $BRFS/\`basename \\\`pwd\\\`\`/pkg 2>/dev/null|awk '{ print $3 }'`
-
-echo Building packages
-
-#/usr/sbin/chroot $MNTPOINT /bin/bash -c "cd /builds/pkg-gate/src; dmake -e BUILDNUM=145 packages"
-
-/usr/bin/env -i PATH=/opt/SUNWspro/bin:/usr/bin:/usr/gnu/bin /usr/sbin/chroot $MNTPOINT \
-/bin/bash -c "cd /build/pkg-legacy/src; dmake -e BUILDNUM=146 packages"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build-scripts/147/18-pkg-chroot-umount-vfs.sh	Tue Sep 28 16:19:56 2010 +0100
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -e
+
+PATH=/usr/sbin:/sbin:/usr/bin
+
+BRFS=rpool/br
+
+[ -e $HOME/.oibldenvrc ] && . $HOME/.oibldenvrc
+
+MNTPOINT=`zfs get -H mountpoint $BRFS/\`basename \\\`pwd\\\`\`/pkg 2>/dev/null|awk '{ print $3 }'`
+
+echo Unmounting filesystems
+
+mount|grep ^$MNTPOINT/dev/fd\ >/dev/null && pfexec umount $MNTPOINT/dev/fd
+
+for i in `mount|grep  ^$MNTPOINT\/|awk '{ print $1 }'|sort -r`; do
+    pfexec umount $i
+done

--- a/build-scripts/147/19-pkg-chroot-umount-vfs.sh	Sun Sep 12 01:39:24 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PATH=/usr/sbin:/sbin:/usr/bin
-
-BRFS=rpool/br
-
-[ -e $HOME/.oibldenvrc ] && . $HOME/.oibldenvrc
-
-MNTPOINT=`zfs get -H mountpoint $BRFS/\`basename \\\`pwd\\\`\`/pkg 2>/dev/null|awk '{ print $3 }'`
-
-echo Unmounting filesystems
-
-mount|grep ^$MNTPOINT/dev/fd\ >/dev/null && pfexec umount $MNTPOINT/dev/fd
-
-for i in `mount|grep  ^$MNTPOINT\/|awk '{ print $1 }'|sort -r`; do
-    pfexec umount $i
-done

--- a/build-scripts/147/21-onnv-install-packages.sh	Sun Sep 12 01:39:24 2010 +0100
+++ b/build-scripts/147/21-onnv-install-packages.sh	Tue Sep 28 16:19:56 2010 +0100
@@ -17,4 +17,9 @@
 system/management/snmp/sea \
 system/library/install \
 library/libxslt \
-developer/opensolaris/osnet runtime/perl-510 runtime/perl-510/extra
+developer/opensolaris/osnet runtime/perl-510 runtime/perl-510/extra \
+developer/linker system/xopen/xcu4 system/extended-system-utilities \
+text/locale developer/dtrace system/zones/internal package/pkg \
+print/cups
+
+

--- a/build-scripts/147/23-onnv-pull-source.sh	Sun Sep 12 01:39:24 2010 +0100
+++ b/build-scripts/147/23-onnv-pull-source.sh	Tue Sep 28 16:19:56 2010 +0100
@@ -16,6 +16,7 @@
 
 #hg clone http://pkgdev.openindiana.org/hg/onnv-gate $MNTPOINT/build/onnv
 #hg clone -U --ssh "ssh -o \"StrictHostKeyChecking no\"" ssh://[email protected]/hg/onnv/onnv-gate $MNTPOINT/build/onnv
-#hg clone -U /wd/onnv-gate/onnv-gate $MNTPOINT/build/onnv
+hg clone -U /wd/onnv-gate/onnv-gate $MNTPOINT/build/onnv
+#hg clone -U /ssd/onnv-gate $MNTPOINT/build/onnv
 
-hg -R $MNTPOINT/build/onnv update -C
+hg -R $MNTPOINT/build/onnv update -C 13149

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build-scripts/147/23.2-onnv-get-closed-bins.sh	Tue Sep 28 16:19:56 2010 +0100
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+PATH=/usr/sbin:/sbin:/usr/bin
+
+BRFS=rpool/br
+
+DLC_SUN_COM=http://dlc.sun.com
+
+[ -e $HOME/.oibldenvrc ] && . $HOME/.oibldenvrc
+
+MNTPOINT=`zfs get -H mountpoint $BRFS/\`basename \\\`pwd\\\`\`/onnv 2>/dev/null|awk '{ print $3 }'`
+
+echo Downloading closed bins
+
+wget $DLC_SUN_COM/osol/on/downloads/20100817/on-closed-bins-nd.`uname -p`.tar.bz2 -O -|bzip2 -dc|(cd $MNTPOINT/build/onnv; tar xvf -)
+wget $DLC_SUN_COM/osol/on/downloads/20100817/on-crypto-nd.`uname -p`.tar.bz2 -O $MNTPOINT/build/onnv/on-crypto-nd.`uname -p`.tar.bz2

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build-scripts/147/24-onnv-patch-source.sh	Tue Sep 28 16:19:56 2010 +0100
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+PATH=/usr/sbin:/sbin:/usr/bin
+
+BRFS=rpool/br
+
+[ -e $HOME/.oibldenvrc ] && . $HOME/.oibldenvrc
+
+MNTPOINT=`zfs get -H mountpoint $BRFS/\`basename \\\`pwd\\\`\`/onnv 2>/dev/null|awk '{ print $3 }'`
+
+echo Patching the source
+
+cat patches/onnv-*.diff|(cd $MNTPOINT/build/onnv; gpatch -p1)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build-scripts/147/25-onnv-prepare-env-file.sh	Tue Sep 28 16:19:56 2010 +0100
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+set -e
+
+PATH=/usr/sbin:/sbin:/usr/bin
+
+BRFS=rpool/br
+
+[ -e $HOME/.oibldenvrc ] && . $HOME/.oibldenvrc
+
+MNTPOINT=`zfs get -H mountpoint $BRFS/\`basename \\\`pwd\\\`\`/onnv 2>/dev/null|awk '{ print $3 }'`
+
+RELEASE=`basename \`pwd\``
+
+echo Preparing the env file
+
+cat $MNTPOINT/build/onnv/usr/src/tools/env/opensolaris.sh | \
+sed s/^NIGHTLY_OPTIONS=\".*\"\;/NIGHTLY_OPTIONS=\"-nprt\"\;/ | \
+sed s/GATE=testws\;/GATE=oi_$RELEASE\;/ | \
+sed s%CODEMGR_WS=\"/export/\$GATE\"\;%CODEMGR_WS=\"/build/onnv\"\;% | \
+sed s%^\#ONBLD_TOOLS=%ONBLD_TOOLS=% \
+> $MNTPOINT/build/onnv/openindiana.sh
+cat <<EOF >> $MNTPOINT/build/onnv/openindiana.sh
+i386_LINT=/opt/sunstudio12.1/bin/lint; export i386_LINT
+amd64_LINT=/opt/sunstudio12.1/bin/lint; export amd64_LINT
+sparc_LINT=/opt/sunstudio12.1/bin/lint; export sparc_LINT
+sparcv9_LINT=/opt/sunstudio12.1/bin/lint; export sparcv9_LINT
+CW_NO_SHADOW=1; export CW_NO_SHADOW
+EOF

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build-scripts/147/26-onnv-chroot-mount-vfs.sh	Tue Sep 28 16:19:56 2010 +0100
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+set -e
+
+PATH=/usr/sbin:/sbin:/usr/bin
+
+BRFS=rpool/br
+
+[ -e $HOME/.oibldenvrc ] && . $HOME/.oibldenvrc
+
+MNTPOINT=`zfs get -H mountpoint $BRFS/\`basename \\\`pwd\\\`\`/onnv 2>/dev/null|awk '{ print $3 }'`
+
+echo Mounting filesystems
+
+for i in dev devices proc; do
+    mount|grep ^$MNTPOINT/$i\ >/dev/null || pfexec mount -F lofs /$i $MNTPOINT/$i
+done
+
+mount|grep ^$MNTPOINT/dev/fd\ >/dev/null || pfexec mount -F fd /dev/fd $MNTPOINT/dev/fd
+
+#for i in etc/svc/volatile tmp var/run; do
+for i in etc/svc/volatile var/run; do
+    mount|grep ^$MNTPOINT/$i\ >/dev/null || pfexec mount -F tmpfs swap $MNTPOINT/$i
+done
+
+if ! mount|grep ^$MNTPOINT/etc/svc/volatile/kcfd_door\  >/dev/null; then
+    touch $MNTPOINT/etc/svc/volatile/kcfd_door
+    pfexec mount -F lofs /etc/svc/volatile/kcfd_door $MNTPOINT/etc/svc/volatile/kcfd_door
+fi
+
+if ! mount|grep ^$MNTPOINT/lib/libc.so.1\  >/dev/null; then
+    if mount|grep ^/lib/libc.so.1\  >/dev/null; then
+	LIBC=`mount|awk '/^\/lib\/libc.so.1\ / { print $3 }'|sed s%^/%%`
+        mount -F lofs $MNTPOINT/$LIBC $MNTPOINT/lib/libc.so.1
+    fi
+fi

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build-scripts/147/27-onnv-build-tools.sh	Tue Sep 28 16:19:56 2010 +0100
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+PATH=/usr/sbin:/sbin:/usr/bin
+
+BRFS=rpool/br
+
+[ -e $HOME/.oibldenvrc ] && . $HOME/.oibldenvrc
+
+MNTPOINT=`zfs get -H mountpoint $BRFS/\`basename \\\`pwd\\\`\`/onnv 2>/dev/null|awk '{ print $3 }'`
+
+echo Building tools
+
+/usr/bin/env -i PATH=/opt/SUNWspro/bin:/usr/bin /usr/sbin/chroot $MNTPOINT \
+/usr/bin/ksh93 /build/onnv/usr/src/tools/scripts/bldenv.sh /build/onnv/openindiana.sh \
+"cd /build/onnv/usr/src/tools && dmake install"
+
+pkg -R $MNTPOINT uninstall -r developer/build/onbld || :
+
+[ -d $MNTPOINT/opt/onbld ] && rm -rf $MNTPOINT/opt/onbld
+cp -r $MNTPOINT/build/onnv/usr/src/tools/proto/root_`uname -p`-nd/opt/onbld $MNTPOINT/opt

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build-scripts/147/28-onnv-build-osnet.sh	Tue Sep 28 16:19:56 2010 +0100
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+PATH=/usr/sbin:/sbin:/usr/bin
+
+BRFS=rpool/br
+
+[ -e $HOME/.oibldenvrc ] && . $HOME/.oibldenvrc
+
+MNTPOINT=`zfs get -H mountpoint $BRFS/\`basename \\\`pwd\\\`\`/onnv 2>/dev/null|awk '{ print $3 }'`
+
+echo Building OS/Net \(20 mins - 240 mins \;\)
+
+/usr/bin/env -i PATH=/opt/SUNWspro/bin:/usr/bin /usr/sbin/chroot $MNTPOINT \
+/bin/bash -c "cd /build/onnv; /opt/onbld/bin/nightly -i openindiana.sh"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build-scripts/147/29-onnv-umount-vfs.sh	Tue Sep 28 16:19:56 2010 +0100
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -e
+
+PATH=/usr/sbin:/sbin:/usr/bin
+
+BRFS=rpool/br
+
+[ -e $HOME/.oibldenvrc ] && . $HOME/.oibldenvrc
+
+MNTPOINT=`zfs get -H mountpoint $BRFS/\`basename \\\`pwd\\\`\`/onnv 2>/dev/null|awk '{ print $3 }'`
+
+echo Unmounting filesystems
+
+mount|grep ^$MNTPOINT/dev/fd\ >/dev/null && pfexec umount $MNTPOINT/dev/fd
+
+for i in `mount|grep  ^$MNTPOINT\/|awk '{ print $1 }'|sort -r`; do
+    pfexec umount $i
+done

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build-scripts/147/31-caiman-create-chroot.sh	Tue Sep 28 16:19:56 2010 +0100
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+PATH=/usr/sbin:/sbin:/usr/bin
+
+BRFS=rpool/br
+
+[ -e $HOME/.oibldenvrc ] && . $HOME/.oibldenvrc
+
+zfs clone $BRFS/`basename \`pwd\``/base@base $BRFS/`basename \`pwd\``/caiman
+
+#MNTPOINT=`zfs get -H mountpoint $BRFS/\`basename \\\`pwd\\\`\`/pkg 2>/dev/null|awk '{ print $3 }'`

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build-scripts/147/32-caiman-install-packages.sh	Tue Sep 28 16:19:56 2010 +0100
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+set -e
+
+PATH=/usr/sbin:/sbin:/usr/bin
+
+BRFS=rpool/br
+
+[ -e $HOME/.oibldenvrc ] && . $HOME/.oibldenvrc
+
+MNTPOINT=`zfs get -H mountpoint $BRFS/\`basename \\\`pwd\\\`\`/caiman 2>/dev/null|awk '{ print $3 }'`
+
+echo Installing Caiman build dependencies
+
+pkg -R $MNTPOINT install developer/versioning/mercurial \
+developer/build/onbld \
+developer/build/make \
+system/header \
+developer/object-file \
+developer/swig \
+system/library/math/header-math \
+package/svr4 \
+developer/library/lint \
+library/gnome/gnome-libs \
+text/locale text/gnu-gettext \
+developer/linker \
+system/library/sysidtool \
+system/extended-system-utilities \
+package/pkg

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build-scripts/147/33-caiman-pull-source.sh	Tue Sep 28 16:19:56 2010 +0100
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+set -e
+
+PATH=/usr/sbin:/sbin:/usr/bin
+
+BRFS=rpool/br
+
+[ -e $HOME/.oibldenvrc ] && . $HOME/.oibldenvrc
+
+MNTPOINT=`zfs get -H mountpoint $BRFS/\`basename \\\`pwd\\\`\`/caiman 2>/dev/null|awk '{ print $3 }'`
+
+RELEASE=`basename \`pwd\``
+
+echo Extracting the source
+
+mkdir -p $MNTPOINT/build
+
+#hg clone http://pkgdev.openindiana.org/hg/onnv-gate $MNTPOINT/build/onnv
+#hg clone -U --ssh "ssh -o \"StrictHostKeyChecking no\"" ssh://[email protected]/hg/onnv/onnv-gate $MNTPOINT/build/onnv
+#hg clone -U /wd/onnv-gate/onnv-gate $MNTPOINT/build/onnv
+#hg clone -U /ssd/onnv-gate $MNTPOINT/build/onnv
+
+#hg clone http://pkgdev.openindiana.org/hg/slim_source $MNTPOINT/build/caiman
+hg clone -U --ssh "ssh -o \"StrictHostKeyChecking no\"" ssh://[email protected]/hg/caiman/slim_source $MNTPOINT/build/caiman
+
+hg -R $MNTPOINT/build/caiman update -C Build$RELEASE

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build-scripts/147/33.1-caiman-patch-source.sh	Tue Sep 28 16:19:56 2010 +0100
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+PATH=/usr/sbin:/sbin:/usr/bin
+
+BRFS=rpool/br
+
+[ -e $HOME/.oibldenvrc ] && . $HOME/.oibldenvrc
+
+MNTPOINT=`zfs get -H mountpoint $BRFS/\`basename \\\`pwd\\\`\`/caiman 2>/dev/null|awk '{ print $3 }'`
+
+echo Patching the source
+
+cat patches/caiman*.diff|(cd $MNTPOINT/build/caiman; gpatch -p1)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build-scripts/147/34-caiman-prepare-env-file.sh	Tue Sep 28 16:19:56 2010 +0100
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -e
+
+PATH=/usr/sbin:/sbin:/usr/bin
+
+BRFS=rpool/br
+
+[ -e $HOME/.oibldenvrc ] && . $HOME/.oibldenvrc
+
+MNTPOINT=`zfs get -H mountpoint $BRFS/\`basename \\\`pwd\\\`\`/caiman 2>/dev/null|awk '{ print $3 }'`
+
+RELEASE=`basename \`pwd\``
+
+echo Preparing the env file
+
+cat $MNTPOINT/build/caiman/usr/src/tools/env/developer.sh | \
+sed s%CODEMGR_WS=.*%CODEMGR_WS=/build/caiman% | \
+sed s%^\#ONREF_GATE=\"%ONREF_GATE=\"/build/onnv% | \
+sed s%^SPRO_ROOT=.*%SPRO_ROOT=/opt/SUNWspro\;\ export\ SPRO_ROOT% > $MNTPOINT/build/caiman/usr/src/developer.sh
+
+echo "CW_NO_SHADOW=1; export CW_NO_SHADOW" >>$MNTPOINT/build/caiman/usr/src/developer.sh
+echo "INSTALL_BUILDNUM=$RELEASE; export INSTALL_BUILDNUM" >>$MNTPOINT/build/caiman/usr/src/developer.sh
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build-scripts/147/35-caiman-chroot-mount-vfs.sh	Tue Sep 28 16:19:56 2010 +0100
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+set -e
+
+PATH=/usr/sbin:/sbin:/usr/bin
+
+BRFS=rpool/br
+
+[ -e $HOME/.oibldenvrc ] && . $HOME/.oibldenvrc
+
+MNTPOINT=`zfs get -H mountpoint $BRFS/\`basename \\\`pwd\\\`\`/caiman 2>/dev/null|awk '{ print $3 }'`
+
+echo Mounting filesystems
+
+for i in dev devices proc; do
+    mount|grep ^$MNTPOINT/$i\ >/dev/null || pfexec mount -F lofs /$i $MNTPOINT/$i
+done
+
+mount|grep ^$MNTPOINT/dev/fd\ >/dev/null || pfexec mount -F fd /dev/fd $MNTPOINT/dev/fd
+
+for i in etc/svc/volatile tmp var/run; do
+    mount|grep ^$MNTPOINT/$i\ >/dev/null || pfexec mount -F tmpfs swap $MNTPOINT/$i
+done
+
+if ! mount|grep ^$MNTPOINT/etc/svc/volatile/kcfd_door\  >/dev/null; then
+    touch $MNTPOINT/etc/svc/volatile/kcfd_door
+    pfexec mount -F lofs /etc/svc/volatile/kcfd_door $MNTPOINT/etc/svc/volatile/kcfd_door
+fi
+
+if ! mount|grep ^$MNTPOINT/lib/libc.so.1\  >/dev/null; then
+    if mount|grep ^/lib/libc.so.1\  >/dev/null; then
+	LIBC=`mount|awk '/^\/lib\/libc.so.1\ / { print $3 }'|sed s%^/%%`
+        mount -F lofs $MNTPOINT/$LIBC $MNTPOINT/lib/libc.so.1
+    fi
+fi
+
+[ -d $MNTPOINT/build/onnv ] || mkdir $MNTPOINT/build/onnv
+
+mount -F lofs $MNTPOINT/../onnv/build/onnv $MNTPOINT/build/onnv

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build-scripts/147/36-caiman-build.sh	Tue Sep 28 16:19:56 2010 +0100
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+PATH=/usr/sbin:/sbin:/usr/bin
+
+BRFS=rpool/br
+
+[ -e $HOME/.oibldenvrc ] && . $HOME/.oibldenvrc
+
+MNTPOINT=`zfs get -H mountpoint $BRFS/\`basename \\\`pwd\\\`\`/caiman 2>/dev/null|awk '{ print $3 }'`
+
+echo Building Caiman
+
+/usr/bin/env -i PATH=/opt/SUNWspro/bin:/usr/bin /usr/sbin/chroot $MNTPOINT \
+/bin/bash -c "cd /build/caiman/usr/src; /opt/onbld/bin/bldenv developer.sh \"dmake install\""

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build-scripts/147/39-caiman-umount-vfs.sh	Tue Sep 28 16:19:56 2010 +0100
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -e
+
+PATH=/usr/sbin:/sbin:/usr/bin
+
+BRFS=rpool/br
+
+[ -e $HOME/.oibldenvrc ] && . $HOME/.oibldenvrc
+
+MNTPOINT=`zfs get -H mountpoint $BRFS/\`basename \\\`pwd\\\`\`/caiman 2>/dev/null|awk '{ print $3 }'`
+
+echo Unmounting filesystems
+
+mount|grep ^$MNTPOINT/dev/fd\ >/dev/null && pfexec umount $MNTPOINT/dev/fd
+
+for i in `mount|grep  ^$MNTPOINT\/|awk '{ print $1 }'|sort -r`; do
+    pfexec umount $i
+done

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build-scripts/147/patches/caiman.diff	Tue Sep 28 16:19:56 2010 +0100
@@ -0,0 +1,82 @@
+diff -r 5a915c215754 usr/src/cmd/auto-install/Makefile
+--- a/usr/src/cmd/auto-install/Makefile	Fri Aug 20 12:01:21 2010 -0700
++++ b/usr/src/cmd/auto-install/Makefile	Tue Sep 28 00:44:15 2010 +0100
+@@ -67,7 +67,7 @@
+ ROOTSCPROFILES= $(SC_PROFILE_FILES:%=$(ROOTAUTOINSTSCPROFILES)/%)
+ 
+ LIBDIR  = $(ROOTADMINLIB)
+-LIBDIRS = -L${LIBDIR} -L$(SFWLIBDIR) -R$(SFWLIBRDIR) -L$(ROOTUSRLIB)
++LIBDIRS = -L$(ONUSRLIBDIR) -L${LIBDIR} -L$(SFWLIBDIR) -R$(SFWLIBRDIR) -L$(ROOTUSRLIB)
+ 
+ INCLUDEDIR = -I. -I${SRC}/lib/liborchestrator -I${SRC}/lib/libtd -I${SRC}/lib/libti -I${SRC}/lib/liblogsvc -I${SRC}/lib/libtransfer -I$(ROOTINCADMIN) -I/usr/include/python2.6
+ 
+diff -r 5a915c215754 usr/src/cmd/gui-install/src/Makefile
+--- a/usr/src/cmd/gui-install/src/Makefile	Fri Aug 20 12:01:21 2010 -0700
++++ b/usr/src/cmd/gui-install/src/Makefile	Tue Sep 28 00:44:15 2010 +0100
+@@ -112,7 +112,7 @@
+ CFLAGS = 
+ CPP = ${CC} -E
+ #CPP = /ws/onnv-tools/SUNWspro/SS11/bin/cc -E
+-CPPFLAGS = -I${SRC}/lib/liborchestrator -I${SRC}/lib/liblogsvc
++CPPFLAGS = -I${SRC}/lib/liborchestrator -I${SRC}/lib/liblogsvc -I${ONINCDIR}
+ CYGPATH_W = echo
+ DATADIRNAME = share
+ DEFS = -DHAVE_CONFIG_H
+diff -r 5a915c215754 usr/src/lib/libspmicommon/Makefile
+--- a/usr/src/lib/libspmicommon/Makefile	Fri Aug 20 12:01:21 2010 -0700
++++ b/usr/src/lib/libspmicommon/Makefile	Tue Sep 28 00:44:15 2010 +0100
+@@ -62,7 +62,7 @@
+ CPPFLAGS	+= -D${ARCH}
+ CFLAGS		+= $(DEBUG_CFLAGS) -Xa ${CPPFLAGS}
+ LDFLAGS		+=
+-SOFLAGS		+= -ldl -lwanboot
++SOFLAGS		+= -ldl -L$(ONUSRLIBDIR) -lwanboot
+ 
+ LINTERR		= lint_errors
+ LINTFILES	= ${SRCS:%.c=${ARCH}/%.ln}
+diff -r 5a915c215754 usr/src/lib/libtd/Makefile
+--- a/usr/src/lib/libtd/Makefile	Fri Aug 20 12:01:21 2010 -0700
++++ b/usr/src/lib/libtd/Makefile	Tue Sep 28 00:44:15 2010 +0100
+@@ -59,6 +59,7 @@
+ LDFLAGS		+=
+ SOFLAGS		+= -L$(ROOTADMINLIB) -R$(ROOTADMINLIB:$(ROOT)%=%) \
+ 		-L$(ROOTUSRLIB) -R$(ROOTUSRLIB:$(ROOT)%=%) \
++		-L$(ONUSRLIBDIR) -R$(ONUSRLIBDIR) \
+ 		-ldiskmgt -lfstyp -lnvpair -llogsvc -linstzones -lima
+ 
+ ROOT_TEST_PROGS	= $(TEST_PROGS:%=$(ROOTOPTINSTALLTESTBIN)/%)
+@@ -80,6 +81,7 @@
+ tdmgtst_static:	static tdmgtst.o
+ 	$(LINK.c) -o tdmgtst_static tdmgtst.o \
+ 		-L$(ROOTADMINLIB) -Lobjs/$(ARCH) \
++		-L$(ONUSRLIBDIR) \
+ 		-Bstatic \
+ 		-ltd -llogsvc \
+ 		-Bdynamic \
+@@ -97,6 +99,7 @@
+ test_td_static:	static test_td.o
+ 	$(LINK.c) -o test_td_static test_td.o \
+ 		-L$(ROOTADMINLIB) -Lobjs/$(ARCH) \
++		-L$(ONUSRLIBDIR) \
+ 		-Bstatic \
+ 		-ltd -llogsvc \
+ 		-Bdynamic \
+diff -r 5a915c215754 usr/src/lib/libti/Makefile
+--- a/usr/src/lib/libti/Makefile	Fri Aug 20 12:01:21 2010 -0700
++++ b/usr/src/lib/libti/Makefile	Tue Sep 28 00:44:15 2010 +0100
+@@ -55,6 +55,7 @@
+ LDFLAGS		+=
+ SOFLAGS		+= -L$(ROOTADMINLIB) -R$(ROOTADMINLIB:$(ROOT)%=%) \
+ 		-L$(ROOTUSRLIB) -R$(ROOTUSRLIB:$(ROOT)%=%) \
++		-L$(ONUSRLIBDIR) -R$(ONUSRLIBDIR) \
+ 		-ladm -lnvpair -llogsvc -lbe -lefi
+ 
+ ROOT_TEST_PROGS	= $(TEST_PROGS:%=$(ROOTOPTINSTALLTESTBIN)/%)
+@@ -76,6 +77,7 @@
+ test_ti_static:	static test_ti.o
+ 	$(LINK.c) -o test_ti_static test_ti.o \
+ 		-L$(ROOTADMINLIB) -L$(ROOTUSRLIB) -Lobjs/$(ARCH) \
++		-L$(ONUSRLIBDIR) \
+ 		-Bstatic \
+ 		-lti -llogsvc \
+ 		-Bdynamic \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build-scripts/147/patches/onnv-xvm-rootnex-fix.diff	Tue Sep 28 16:19:56 2010 +0100
@@ -0,0 +1,36 @@
+diff -r 67d1861e02c1 usr/src/uts/i86pc/io/rootnex.c
+--- a/usr/src/uts/i86pc/io/rootnex.c	Mon Aug 16 22:47:01 2010 -0700
++++ b/usr/src/uts/i86pc/io/rootnex.c	Sun Sep 12 03:28:06 2010 +0100
+@@ -2208,14 +2208,19 @@
+ 	 * Clean up and return an error.
+ 	 */
+ 
++#if defined(__amd64) && !defined(__xpv)
++
+ 	if (dma->dp_dvma_used) {
+ 		(void) iommulib_nexdma_unmapobject(dip, rdip, handle,
+ 		    &dma->dp_dvma);
+ 		e = DDI_DMA_NOMAPPING;
+ 	} else {
++#endif
+ 		e = rootnex_bind_slowpath(hp, dmareq, dma, attr, &dma->dp_dma,
+ 		    kmflag);
+-	}
++#if defined(__amd64) && !defined(__xpv)
++	}
++#endif
+ 	if ((e != DDI_DMA_MAPPED) && (e != DDI_DMA_PARTIAL_MAP)) {
+ 		if (dma->dp_need_to_free_cookie) {
+ 			kmem_free(dma->dp_cookies, dma->dp_cookie_size);
+@@ -2328,9 +2333,11 @@
+ 	rootnex_teardown_copybuf(dma);
+ 	rootnex_teardown_windows(dma);
+ 
++#if defined(__amd64) && !defined(__xpv)
+ 	if (IOMMU_USED(rdip))
+ 		(void) iommulib_nexdma_unmapobject(dip, rdip, handle,
+ 		    &dma->dp_dvma);
++#endif
+ 
+ 	/*
+ 	 * If we had to allocate space to for the worse case sgl (it didn't