--- a/ChangeLog	Sun Jan 03 11:49:30 2010 +0000
+++ b/ChangeLog	Sun Jan 03 12:31:24 2010 +0000
@@ -1,3 +1,7 @@
+2010-01-03  Dave Lin <[email protected]>
+
+    * cron-script.sh: Updated the build options for OpenSolaris only.
+
 2010-01-03  Dave Lin <[email protected]>
 
     * SUNWgnome-desktop-prefs.spec: Update OpenGL path.

--- a/cron-script.sh	Sun Jan 03 11:49:30 2010 +0000
+++ b/cron-script.sh	Sun Jan 03 12:31:24 2010 +0000
@@ -123,7 +123,7 @@
 svn -q up > /dev/null 2>&1 || fatal_error "SVN update of spec-files-other failed"
 
 # Uninstall the spec-files-other packages.
-pkgtool uninstall-pkgs --with-l10n --with-sun-branding core/*.spec experimental/*.spec l10n/*.spec
+pkgtool uninstall-pkgs --with-l10n --with-indiana-branding core/*.spec experimental/*.spec l10n/*.spec
 
 # Uninstall and cleanup spec-files packages.
 cd $SPECDIR || fatal_error "$SPECDIR not found"
@@ -139,7 +139,7 @@
 if ! /usr/bin/cmp -s ./cron-script.sh $MYNAME; then exec ./cron-script.sh; fi
 
 # uninstall all pkgs left behind by a previous build
-pkgtool uninstall-pkgs --with-l10n --with-sun-branding --define 'support_level supported' closed/*.spec *.spec >/dev/null
+pkgtool uninstall-pkgs --with-l10n --with-indiana-branding --define 'support_level supported' closed/*.spec *.spec indiana/*.spec >/dev/null
 # remove-gnome will now remove anything left from uninstall-pkgs in case
 # or a packaging change for example
 $SPECDIR/scripts/remove-gnome --version jds -q -f --no_extras > /dev/null 2>&1
@@ -177,7 +177,7 @@
 #FIXME: The smf service could not run correctly in jail, hack the script here.
 if [ -f /THIS_IS_JAIL_* ]; then
     egrep -v '^(Requires|BuildRequires):' SUNWdesktop-cache.spec > SUNWdesktop-cache.spec.tmp.$$
-    pkgtool build --nonotify --with-l10n ${DEBUG_BUILD} --define "nightly 1" --with-sun-branding --define 'support_level supported' SUNWdesktop-cache.spec.tmp.$$
+    pkgtool build --nonotify --with-l10n ${DEBUG_BUILD} --define "nightly 1" --with-indiana-branding --define 'support_level supported' SUNWdesktop-cache.spec.tmp.$$
     rm -f SUNWdesktop-cache.spec.tmp.$$
     su<<EO_SU
     cat<<EOF>/usr/share/desktop-cache/restart_fmri
@@ -189,14 +189,16 @@
 fi
 
 # start the build
-pkgtool -v --nightly --date "$RELEASE_DATE" build  closed/SUNWevolution-bdb-devel.spec closed/*.spec *.spec \
+pkgtool -v --nightly --date "$RELEASE_DATE" build  closed/SUNWevolution-bdb-devel.spec closed/*.spec *.spec indiana/*.spec \
         --download \
         --logdir=$WEBROOT/$LOGDIR \
         --logdir-url=http://jds.ireland/$LOGDIR \
 	[email protected] \
         --prodname="${PRODNAME}/s${OSrel}${OSarch}" \
         --live --with-l10n ${DEBUG_BUILD} \
-        --define "nightly 1" --with-sun-branding --define 'support_level supported' \
+        --define "nightly 1" --with-indiana-branding \
+        --without-dt --without-blueprint \
+        --define 'support_level supported' \
         --summary-log=$WEBROOT/$LOGDIR.html \
         --summary-title="${PRODNAME} S${OSrel}/${OSarch_full} Nightly Build Report `date +'%d %B %Y'`" \
         --rpm-url=file:///net/jdsserv.ireland/$RPMSDIR/all_pkgs \
@@ -215,7 +217,9 @@
 	[email protected] \
         --prodname="${PRODNAME}/s${OSrel}${OSarch}" \
         --live --with-l10n ${DEBUG_BUILD} \
-        --define "nightly 1" --with-sun-branding --define 'support_level supported' \
+        --define "nightly 1" --with-indiana-branding \
+        --without-dt --without-blueprint \
+        --define 'support_level supported' \
         --summary-log=$WEBROOT/$LOGDIR-other.html \
         --summary-title="${PRODNAME} S${OSrel}/${OSarch_full} SFO Nightly Build Report `date +'%d %B %Y'`" \
         --rpm-url=file:///net/jdsserv.ireland/$RPMSDIR/all_pkgs \
@@ -228,7 +232,7 @@
 #FIXME: Removed the hacked package SUNWdesktop-cache and build a regular one at the end
 if [ -f /THIS_IS_JAIL_* ]; then
     pkgtool uninstall-pkgs --nonotify --with-l10n SUNWdesktop-cache.spec
-    pkgtool build-only --nonotify --with-l10n ${DEBUG_BUILD} --define "nightly 1" --with-sun-branding --define 'support_level supported' SUNWdesktop-cache.spec
+    pkgtool build-only --nonotify --with-l10n ${DEBUG_BUILD} --define "nightly 1" --with-indiana-branding --define 'support_level supported' SUNWdesktop-cache.spec
 fi
 
 # rotate rpms dir