Set up branches for the build system to match the releases.

Changes for r151004:

Fixes/enhancements to buildctl for various build styles

Add build directories for entire and illumos-jeos incorporations, which were previously hand-crafted.

Remove gcc3 packages, as we now use gcc-4.4.4-il for building illumos-gate.

Update automake 1.11 to latest patch level (bugfixes)

Update BIND to 9.9.2

gnu-coreutils: link /usr/gnu/bin/install to /usr/bin/install

gcc44/libgmp: explicitly set ABI=32

gcc46/libgmp: fix license file name, explicitly set ABI=32

illumos-kvm: build latest available code by default, switch to gcc4, patch to work around hard-coded path to ctfconvert

Don't let buildctl ignore developer/build/make

Clean up nonexistent ntp patches

pci.ids: Update to 2012-10-10 snapshot

Update release packages

Use an "rc" pkg repo for staging new packages before they are merged into the main release repo

build/automake-111/build.sh

@@ -28,13 +28,14 @@
 . ../../lib/functions.sh
 
 PROG=automake
-VER=1.11.3
+VER=1.11.6
 VERHUMAN=$VER
 PKG=developer/build/automake-111
 SUMMARY="GNU Automake $VER"
 DESC="GNU Automake - A Makefile generator ($VER)"
 
 BUILDARCH=32
+BUILD_DEPENDS_IPS="compress/xz developer/build/autoconf"
 DEPENDS_IPS="developer/macro/gnu-m4 runtime/perl-5142"
 
 # Since it's 32-bit only we don't worry about isaexec for bins

build/automake-19/build.sh

@@ -35,6 +35,7 @@ SUMMARY="GNU Automake $VER"
 DESC="GNU Automake - A Makefile generator ($VER)"
 
 BUILDARCH=32
+BUILD_DEPENDS_IPS="developer/build/autoconf"
 DEPENDS_IPS="developer/macro/gnu-m4 runtime/perl-5142"
 
 # Since it's 32-bit only we don't worry about isaexec for bins

build/bind/build.sh

@@ -28,7 +28,7 @@
 . ../../lib/functions.sh
 
 PROG=bind
-VER=9.9.1-P2
+VER=9.9.2
 VERHUMAN=$VER
 PKG=network/dns/bind
 SUMMARY="BIND DNS tools"

build/buildctl

@@ -75,16 +75,28 @@ build() {
         fi
         SCRIPT=$(basename ${targets[$1]})
         if [[ -n $(echo $SCRIPT | grep ".p5m$") ]]; then
-            echo "Simple manifest to import... importing to $PKGSRVR"
+            echo "Found a manifest file. Preparing it for publishing."
             sed -e "s/@PKGPUBLISHER@/$PKGPUBLISHER/g" < $SCRIPT > $SCRIPT.final
             if [[ -f root.tar.bz2 ]]; then
-                bzip2 -dc root.tar.bz2 | tar xf -
+                echo "File archive found. Extracting..."
+                bzip2 -dc root.tar.bz2 | tar xf - || \
+                    bail "Failed to extract root.tar.bz2"
+                echo "Publishing from $SCRIPT.final"
+                pkgsend -s $PKGSRVR publish -d $PKGROOT $SCRIPT.final || \
+                    bail "pkgsend failed"
+                rm -rf $PKGROOT
+            # In case we just have a tree of files and not a tarball
+            elif [[ -d $PKGROOT ]]; then
+                echo "Publishing from $SCRIPT.final"
+                pkgsend -s $PKGSRVR publish -d $PKGROOT $SCRIPT.final || \
+                    bail "pkgsend failed"
+            # Else we just have a manifest to import
+            else
+                echo "Simple manifest to import... importing to $PKGSRVR"
+                pkgsend -s $PKGSRVR publish $SCRIPT.final || \
+                    bail "pkgsend failed"
+                rm $SCRIPT.final
             fi
-            pkgsend -s $PKGSRVR publish -d $PKGROOT $SCRIPT.final
-            if [[ -f root.tar.bz2 ]]; then
-                rm -rf ./root
-            fi
-            rm $SCRIPT.final
         else
             PATH=$PATH:. $SCRIPT
         fi

build/caiman/build.sh

@@ -37,14 +37,14 @@ fi
 . ../../lib/functions.sh
 
 PROG=caiman
-VER=151002
+VER=151004
 PKG=caiman
 SUMMARY="$PROG"
 DESC="$SUMMARY"
 
 #all of the ips depends should be available from OmniTI repos
 
-BUILD_DEPENDS_IPS="developer/sunstudio12.1 system/boot/wanboot system/boot/wanboot/internal developer/build/onbld system/library developer/versioning/git"
+BUILD_DEPENDS_IPS="developer/sunstudio12.1 system/boot/wanboot system/boot/wanboot/internal developer/build/onbld system/library developer/versioning/git developer/swig"
 
 GIT=git
 

build/coreutils/build.sh

@@ -43,12 +43,13 @@ CONFIGURE_OPTS_32="$CONFIGURE_OPTS_32 --libexecdir=/usr/lib --bindir=/usr/gnu/bi
 CONFIGURE_OPTS_64="$CONFIGURE_OPTS_64 --libexecdir=/usr/lib/$ISAPART64"
 
 link_in_usr_bin() {
-    mkdir -p $DESTDIR/usr/bin
-    for cmd in [ base64 dir dircolors ginstall md5sum nproc pinky printenv \
+    logmsg "Making links to /usr/bin"
+    logcmd mkdir -p $DESTDIR/usr/bin
+    for cmd in [ base64 dir dircolors install md5sum nproc pinky printenv \
 	ptx readlink seq sha1sum sha224sum sha256sum sha384sum sha512sum \
 	shred shuf stat stdbuf tac timeout truncate users vdir whoami 
     do
-        ln $DESTDIR/usr/gnu/bin/$cmd $DESTDIR/usr/bin/$cmd
+        logcmd ln $DESTDIR/usr/gnu/bin/$cmd $DESTDIR/usr/bin/$cmd
     done
 }
 

build/g11n/build.sh

@@ -39,8 +39,8 @@ SUMMARY="This isn't used, it's in the makefiles for pkg"
 DESC="This isn't used, it's in the makefiles for pkg"
 
 PROG=g11n
-VER=0.151002
-BUILDNUM=151002
+VER=0.151004
+BUILDNUM=151004
 if [[ -z "$PKGPUBLISHER" ]]; then
     logerr "No PKGPUBLISHER specified in config.sh"
     exit # Force it, we're fucked here.