SUNWsqlite3 is moved from sfw to desktop consolidation, so changed to build it at beginning, which is required by svbversion gnome-2-28
authordavelam
Mon, 01 Mar 2010 08:00:40 +0000
branchgnome-2-28
changeset 18650 eebf490e8ff6
parent 18649 2322fcc8fe0b
child 18651 a30cd8b30fda
SUNWsqlite3 is moved from sfw to desktop consolidation, so changed to build it at beginning, which is required by svbversion
cron-script.sh
--- a/cron-script.sh	Mon Mar 01 05:47:08 2010 +0000
+++ b/cron-script.sh	Mon Mar 01 08:00:40 2010 +0000
@@ -174,13 +174,16 @@
 
 cd $SPECDIR
 
-#FIXME: The smf service could not run correctly in jail, hack the script here.
 if [ -f /THIS_IS_JAIL_* ]; then
+    # make sure there is no libsqlite3.so because it will be built out later on
+    rm -f /usr/lib/libsqlite3.so*
+
+    # build SUNWdesktop-cache.spec and SUNWsqlite3.spec at beginning
     egrep -v '^(Requires|BuildRequires):' SUNWdesktop-cache.spec > 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.$$
+    pkgtool build --nonotify --with-l10n ${DEBUG_BUILD} --define "nightly 1" --with-indiana-branding --define 'support_level supported' SUNWdesktop-cache.spec.tmp.$$ SUNWsqlite3.spec
     rm -f SUNWdesktop-cache.spec.tmp.$$
 
-    # hack the svc script
+    #FIXME: The smf service could not run correctly in jail, hack desktop-cache smf script here.
     grep -i "OpenSolaris" /etc/release >/dev/null 2>&1
     if [ $? -eq 0 ]; then
         printf "1a\n\nexit 0\n.\nw"| pfexec ed -s /usr/share/desktop-cache/restart_fmri