From: Andres Salomon <dilinger@lunge.queued.net>
Date: Sun, 19 Jun 2011 02:30:10 +0000 (-0700)
Subject: debxo: drop gnome ubifs images
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?p=xodist;a=commitdiff_plain;h=8f0b5f4dfb3630507bef0215d32d10f882b7ff44

debxo: drop gnome ubifs images

Gnome barely fits in the 1GB XO-1 nand; when running dist-upgrade
inside of gnome, gconftool-2 easily eats up all 256MB of ram and
causes an OOM crash.  The gnome utilities quickly exhaust the XO-1s
ram, as well.  As such, gnome will no longer be supported for the
XO-1 nand.  Drop the ubifs config files accordingly.

It will remain supported for the XO-1.5, as well as larger SD/USB
devices on XO-1.  Don't expect me to care about memory usage,
though! :)

Signed-off-by: Andres Salomon <dilinger@lunge.queued.net>
---

diff --git a/configs/debxo-gnome/fstab-ubifs b/configs/debxo-gnome/fstab-ubifs
deleted file mode 100644
index dd3a20d..0000000
--- a/configs/debxo-gnome/fstab-ubifs
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/fstab: static file system information 
-#
-# <file system>	<mount point>	<type>	<options>	<dump>	<pass>
-proc		/proc		proc	defaults	0	0	# <partition size in MB>
-mtd:boot	/boot		jffs2	defaults,noatime 1	1	# 50
-ubi:root	/		ubifs	defaults,noatime 1	1
diff --git a/configs/debxo-gnome/olpc.fth-ubifs b/configs/debxo-gnome/olpc.fth-ubifs
deleted file mode 100644
index 206ed8f..0000000
--- a/configs/debxo-gnome/olpc.fth-ubifs
+++ /dev/null
@@ -1,25 +0,0 @@
-\ OLPC boot script
-
-\ fetch the /chosen/bootpath property
-" /chosen" find-package  if                       ( phandle )
-  " bootpath" rot  get-package-property  0=  if   ( propval$ )
-    get-encoded-string                            ( bootpath$ )
-    [char] \ left-parse-string  2nip              ( dn$ )
-
-    \ store the first part of bootpath (up to the '\') in $DN
-    dn-buf place                                  ( )
-  then
-then
-
-" ro ubi.mtd=root root=ubi:root rootfstype=ubifs video=lxfb fbcon=font:SUN12x22" to boot-file
-game-key-mask h# 80 and if
-	\ boot from backup kernel
-	" ${DN}\vmlinuz.bak" expand$ to boot-device
-	" ${DN}\initrd.img.bak" expand$ to ramdisk
-else
-	\ boot from regular kernel
-	" ${DN}\vmlinuz" expand$ to boot-device
-	" ${DN}\initrd.img" expand$ to ramdisk
-then
-dcon-unfreeze
-boot
diff --git a/release.sh b/release.sh
index bc2be4a..9238d25 100755
--- a/release.sh
+++ b/release.sh
@@ -8,12 +8,12 @@ for f in configs/debxo-*; do
 deb http://localhost:9999/security squeeze/updates main contrib non-free
 deb http://localhost:9999/backports squeeze-backports main contrib non-free" \
 			debxo-${desktop}
-	./mkubifs.sh --config-type debxo-${desktop} debxo-${desktop} ${desktop}.img
-	./mkext3.sh --config-type debxo-${desktop} debxo-${desktop} \
+	[ -f ./configs/debxo-${desktop}/fstab-ubifs ] && ./mkubifs.sh --config-type debxo-${desktop} debxo-${desktop} ${desktop}.img
+	[ -f ./configs/debxo-${desktop}/fstab-ext3 ] && ./mkext3.sh --config-type debxo-${desktop} debxo-${desktop} \
 			debxo-${desktop}.ext3.img
-	gzip debxo-${desktop}.ext3.img
+	[ -f debxo-${desktop}.ext3.img ] && gzip debxo-${desktop}.ext3.img
 
 	mkdir -p ext3 nand
-	mv debxo-${desktop}.ext3.img.gz ext3
-	mv ${desktop}.img ${desktop}.dat nand
+	[ -f debxo-${desktop}.ext3.img.gz ] && mv debxo-${desktop}.ext3.img.gz ext3
+	[ -f ${desktop}.img ] && mv ${desktop}.img ${desktop}.dat nand
 done