[Trisquel-devel] Rev 7: Updated for TOAST 5.0 test images in file:///home/systems/makeiso/

Ruben Rodriguez ruben at trisquel.info
Sat Jun 9 17:13:07 CEST 2012 

At file:///home/systems/makeiso/

------------------------------------------------------------
revno: 7
revision-id: ruben en trisquel.info-20120609151215-3snpde5gxmdom55w
parent: ruben en trisquel.info-20120405030358-r8k6yj4lty415e2w
committer: Ruben Rodriguez <ruben en trisquel.info>
branch nick: makeiso
timestamp: Sat 2012-06-09 17:12:15 +0200
message:
  Updated for TOAST 5.0 test images
------------ pr�xima parte ------------
=== modified file '.bzrignore'
--- a/.bzrignore	2012-03-12 02:17:23 +0000
+++ b/.bzrignore	2012-06-09 15:12:15 +0000
@@ -7,3 +7,5 @@
 logs
 iso
 doall
+source/*
+source

=== modified file 'files/activities.defaults'
--- a/files/activities.defaults	2011-11-15 01:02:07 +0000
+++ b/files/activities.defaults	2012-06-09 15:12:15 +0000
@@ -1,3 +1,6 @@
+vu.lux.olpc.Maze
+org.laptop.sugar.GetIABooksActivity
+org.laptop.Pippy
 org.laptop.AbiWordActivity
 org.laptop.Calculate
 org.laptop.Chat
@@ -18,7 +21,6 @@
 org.worldwideworkshop.olpc.FlipSticks
 org.worldwideworkshop.olpc.JigsawPuzzle
 org.worldwideworkshop.olpc.SliderPuzzle
-org.laptop.community.Colors
 org.squeak.FreeCell
 org.laptop.TamTamEdit
 org.laptop.TamTamJam
@@ -30,7 +32,6 @@
 org.worldwideworkshop.PollBuilder
 org.gnome.Labyrinth
 org.laptop.RecordActivity
-org.laptop.Oficina
 tv.alterna.Clock
 org.laptop.physics
 org.laptop.sugar.GetIABooksActivity

=== added file 'files/artwork/dextrose.png'
Binary files a/files/artwork/dextrose.png	1970-01-01 00:00:00 +0000 and b/files/artwork/dextrose.png	2012-06-09 15:12:15 +0000 differ
=== modified file 'files/honey.sh'
--- a/files/honey.sh	2011-11-15 01:02:07 +0000
+++ b/files/honey.sh	2012-06-09 15:12:15 +0000
@@ -13,25 +13,25 @@
 ASLO="$ASLO org.worldwideworkshop.olpc.FlipSticks"
 ASLO="$ASLO org.worldwideworkshop.olpc.JigsawPuzzle"
 ASLO="$ASLO org.worldwideworkshop.olpc.SliderPuzzle"
-ASLO="$ASLO org.laptop.community.Colors"
+#ASLO="$ASLO org.laptop.community.Colors"
 ASLO="$ASLO org.squeak.FreeCell"
-ASLO="$ASLO org.laptop.Develop"
+#ASLO="$ASLO org.laptop.Develop"
 ASLO="$ASLO org.laptop.TamTamEdit"
 ASLO="$ASLO org.laptop.TamTamJam"
 ASLO="$ASLO org.laptop.TamTamMini"
 ASLO="$ASLO org.laptop.TamTamSynthLab"
 ASLO="$ASLO org.laptop.Memorize"
 ASLO="$ASLO org.worldwideworkshop.JokeMachineActivity"
-#ASLO="$ASLO vu.lux.olpc.Maze"
+ASLO="$ASLO vu.lux.olpc.Maze"
 ASLO="$ASLO org.worldwideworkshop.olpc.storybuilder"
 ASLO="$ASLO org.worldwideworkshop.PollBuilder"
 ASLO="$ASLO org.gnome.Labyrinth"
 ASLO="$ASLO org.laptop.RecordActivity"
-ASLO="$ASLO org.laptop.Oficina"
+#ASLO="$ASLO org.laptop.Oficina"
 #ASLO="$ASLO org.tuxpaint.sugar-is-lame"
 ASLO="$ASLO tv.alterna.Clock"
 ASLO="$ASLO org.laptop.physics"
-#ASLO="$ASLO org.laptop.sugar.GetIABooksActivity"
+ASLO="$ASLO org.laptop.sugar.GetIABooksActivity"
 ASLO="$ASLO org.laptop.Arithmetic"
 
 WD=$PWD

=== modified file 'files/master-template/isolinux/gfxboot.cfg'
--- a/files/master-template/isolinux/gfxboot.cfg	2011-11-15 01:02:07 +0000
+++ b/files/master-template/isolinux/gfxboot.cfg	2012-06-09 15:12:15 +0000
@@ -1,4 +1,4 @@
-foreground=0xD1EE89
+foreground=0xFOREGROUND
 background=0xffffff
 screen-colour=0x000000
 label normal=Normal

=== modified file 'files/master-template/isolinux/stdmenu.cfg'
--- a/files/master-template/isolinux/stdmenu.cfg	2011-11-15 01:02:07 +0000
+++ b/files/master-template/isolinux/stdmenu.cfg	2012-06-09 15:12:15 +0000
@@ -1,8 +1,8 @@
 menu background splash.png
 menu color title        * #FFFFFFFF *
 menu color border       * #00000000 #00000000 none
-menu color sel          * #ffffffff #D1EE89ff *
-menu color hotsel       1;7;37;40 #ffffffff #D1EE89ff *
+menu color sel          * #ffffffff #FOREGROUND *
+menu color hotsel       1;7;37;40 #ffffffff #FOREGROUND *
 menu color tabmsg       * #ffffffff #00000000 *
 menu color help         37;40 #ffdddd00 #00000000 none
 menu vshift 12

=== modified file 'makeiso.sh'
--- a/makeiso.sh	2012-04-05 03:03:58 +0000
+++ b/makeiso.sh	2012-06-09 15:12:15 +0000
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-#    Copyright (C) 2004,2005,2006,2007,2008,2009,2010,2011  Rub��n Rodr��guez <ruben en trisquel.info>
+#    Copyright (C) 2004,2005,2006,2007,2008,2009,2010,2011,2012 Rub��n Rodr��guez <ruben en trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
 set -e
 
 export TRACKER=http://trisquel.info:6969/announce
-export MIRRORS="http://cdimage.trisquel.info/trisquel-images/ http://gdsol.uta.cl/trisquel/iso/ http://us.archive.trisquel.info/iso/ http://ftp.udc.es/trisquel-iso/ http://es.gnu.org/~ruben/trisquel/ http://ftp.linux.org.tr/trisquel/iso/ http://ftp.rediris.es/mirror/Trisquel/iso/"
+export MIRRORS="http://cdimage.trisquel.info/trisquel-images/ http://gdsol.uta.cl/trisquel/iso/ http://us.archive.trisquel.info/iso/ http://es.gnu.org/~ruben/trisquel/ http://ftp.linux.org.tr/trisquel/iso/ http://ftp.rediris.es/mirror/Trisquel/iso/ http://nl.cdimage.trisquel.info/ ftp://in.archive.trisquel.info/trisquel-iso/ http://ibelin.mx.gnu.org/ http://ftp.linux.org.tr/trisquel/iso/"
 export MIRROR="http://archive.trisquel.info/trisquel/" # The upsream full repository
 export MKTORRENT=$PWD/"files/mktorrent-1.0/mktorrent"
 
@@ -120,14 +120,14 @@
 deb-src $MIRROR $CODENAME main
 deb-src $MIRROR $CODENAME-updates main
 deb-src $MIRROR $CODENAME-security main
-$LOCALMIRROR
 EOF
 
 apt-get update
-mkdir source || true
+rm -rf source
+mkdir source
 cd source
 
-for i in $(cut -d" " -f1 ../package.list |sort -u) 
+for i in $(cut -d" " -f1 ../iso/*manifest |sort -u) 
 do
 echo $i
     source=$(apt-cache showsrc $i | grep '^Package: ' | awk '{print $2}')
@@ -173,7 +173,9 @@
 -------------------------------------------------------------------------
 "
 
-[ -d master ] || cp -a files/master-template master
+rm -rf master
+cp -a files/master-template master
+sed -i 's/FOREGROUND/84B0FF/g' master/isolinux/stdmenu.cfg master/isolinux/gfxboot.cfg
 echo "Trisquel $VERSION \"$CODENAME\" - Release $ARCH ($(date +%Y%m%d))" | sed s/i386/i686/g > master/.disk/info
 echo http://trisquel.info/wiki/$CODENAME > master/.disk/release_notes_url
 
@@ -341,8 +343,9 @@
 rm $CHROOT/usr/sbin/start $CHROOT/usr/sbin/stop
 
 echo "-- CLEANING UP ---------------------------------------------------------------"
-
+if [ $DIST != "trisquel-sugar" ]; then
 $C apt-get remove -y --force-yes --purge humanity-icon-theme || true
+fi
 
 umount $CHROOT/proc
 umount $CHROOT/dev/pts
@@ -364,8 +367,7 @@
 #deb-src http://es.archive.trisquel.info/trisquel $CODENAME-backports main
 EOF
 $C apt-get update
-rm $CHROOT/var/lib/apt/lists/*Translation*
-[ $ARCH = "amd64" ] && rm $CHROOT/var/lib/apt/lists/*i386*
+#rm $CHROOT/var/lib/apt/lists/*Translation*
 
 [ -f  $CHROOT/usr/lib/locale/locale-archive ] && rm -v $CHROOT/usr/lib/locale/locale-archive
 ##############################################################################
@@ -412,6 +414,7 @@
 
 if [ $DIST = "trisquel-sugar" ] 
 then
+cp files/artwork/dextrose.png $CHROOT/lib/plymouth/themes/sugar/custom.png
 
 sed -i '/software.html/d' $CHROOT/usr/share/ubiquity-slideshow/slides/index.html $CHROOT/usr/share/ubiquity-slideshow/slides/directory.js
 
@@ -476,6 +479,16 @@
 $C sudo -u gdm gconftool-2 --set --type string --set /desktop/gnome/background/picture_filename /lib/plymouth/themes/sugar/sugar.png
 fi
 
+cat << EOF > $CHROOT/usr/share/gconf/defaults/95_toast
+/apps/gdm/simple-greeter/logo_icon_name sugar-xo
+/desktop/gnome/interface/gtk_theme sugar-72
+/desktop/gnome/interface/icon_theme sugar
+/desktop/gnome/background/color_shading_type solid
+/desktop/gnome/background/primary_color \#282828282828
+/desktop/gnome/background/picture_filename /lib/plymouth/themes/sugar/sugar.png
+EOF
+$C update-gconf-defaults
+
 [ $DIST = "trisquel" ] && sed 's/\(TimedLogin=.*\)/\1\nDefaultSession=gnome\\n\\/' -i $CHROOT/usr/lib/ubiquity/user-setup/user-setup-apply
 
 ## INITRD ####################################################################
@@ -503,9 +516,20 @@
 then
     sh files/honey.sh
     find honey -type d -exec chmod 755 {} \;
+    find honey -type f -exec chmod a+r {} \;
     cp -a honey/*.activity $CHROOT/opt/sweets/
     rename s/.activity// $CHROOT/opt/sweets/*
     cp files/activities.defaults $CHROOT/opt/sweets/sugar/share/sugar/data/
+cat << EOF > $CHROOT/etc/rc.local
+#!/bin/sh
+find /opt -name aclient.so -exec file {} \;
+find /opt -name aclient.so -exec touch {} \;
+find /opt -name aclient.so -exec ldd {} \;
+
+exit 0
+EOF
+
+grep "import logging" $CHROOT/opt/sweets/TamTamMini/TamTamMini.py || sed '/import pygtk/ s/$/\nimport logging/' -i $CHROOT/opt/sweets/TamTamMini/TamTamMini.py
 
 #    for i in TamTamEdit TamTamJam TamTamSynthLab
 #    do
@@ -534,9 +558,9 @@
 
 [ $ARCH = "i386" ] &&  ARCH=i686
 
-FILE=${DIST}_${VERSION}_${ARCH}-$(date +%Y%m%d).iso
-[ $i18n = "true" ] && FILE=${DIST}_${VERSION}-i18n_${ARCH}-$(date +%Y%m%d).iso
-[ $fsf = "true" ] && FILE=${DIST}_${VERSION}-fsf_${ARCH}-$(date +%Y%m%d).iso
+FILE=${DIST}_${VERSION}_${ARCH}.iso
+[ $i18n = "true" ] && FILE=${DIST}_${VERSION}-i18n_${ARCH}.iso
+[ $fsf = "true" ] && FILE=${DIST}_${VERSION}-fsf_${ARCH}.iso
 
 [ $DIST != "trisquel" ] && EXTRACOMMENT=", $DIST edition"
 
@@ -553,7 +577,7 @@
 # builds the CD iso image using the squashfs compressed filesystem
 
 cd master
-find casper -type f | xargs md5sum >> md5sum.txt
+find casper -type f | xargs md5sum > md5sum.txt
 cd $WORKDIR
 
 [ $ARCH = "i386" ] && SUBARCH=i686 || SUBARCH=amd64
@@ -567,6 +591,7 @@
    -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table \
    -o iso/${NAME}.iso master
 isohybrid iso/${NAME}.iso
+cp master/casper/filesystem.manifest iso/${NAME}.manifest
 cd iso
 md5sum ${NAME}.iso > ${NAME}.iso.md5
 cd ..
@@ -609,8 +634,8 @@
 all)		COLUMNS=500 DO_DEBOOTSTRAP 2>&1 3>&1 0>&1 | COLUMNS=500 tee $LOG || exit 1
 		COLUMNS=500 DO_SQUASH 2>&1 3>&1 0>&1 | COLUMNS=500 tee -a $LOG
 		COLUMNS=500 DO_ISO 2>&1 3>&1 0>&1 | COLUMNS=500 tee -a $LOG
-#		COLUMNS=500 DO_TORRENT 2>&1 3>&1 0>&1 | COLUMNS=500 tee -a $LOG
-		DELETE_CHROOT $CHROOT
+	#	COLUMNS=500 DO_TORRENT 2>&1 3>&1 0>&1 | COLUMNS=500 tee -a $LOG
+	#	DELETE_CHROOT $CHROOT
 		;;
 esac

More information about the Trisquel-devel mailing list