merge lunge

diff --git a/README b/README
index c709559b6346f87a7680f80ac0301206731ee47e..317f4fd2e59d65d1b8b46edc0637d1963ecbbe0d 100644 (file)
--- a/README
+++ b/README
@@ -18,7 +18,7 @@ How to use xodist to generate a Debian KDE image:
 
        cp kde.{dat,crc,img} /mnt/
 
-4.  boot an XO into OFW, then type:
+4.  boot an XO into OFW (note: OFW q2e14 or newer is required), then type:
 
         update-nand u:\kde.img
 

diff --git a/TODO b/TODO
new file mode 100644 (file)
index 0000000..102d3db
--- /dev/null
+++ b/TODO
@@ -0,0 +1,33 @@
+general
+-------
+complete build script
+       shared package list (less, xchat, ..)
+       support lenny and sid
+new image type:
+       debian-edu standalone
+       debian-edu thinclient
+       sugar-sid
+publish images on people.d.o
+use debian-edu packaging, for the debxo package...
+
+general but later
+-----------------
+mic is on after boot
+optional: allow to create user on boot (for all images except sugar*)
+mount sd cards automatically
+emdebian images.. :)
+
+sugar
+-----
+say "yes" to use unauthenticated packages from jonas
+lots of activities missing
+browse broken: 
+       report as bug: echo /usr/libxulrunner-1.9/ > /etc/ld.so.conf.d/xulhack.conf
+       but still segfaults
+
+
+lxde
+----
+start nm-applet automatically
+fonts in lxterminal are broken (worked-around by installing xterm)
+

diff --git a/awesome.packages b/awesome.packages
new file mode 100644 (file)
index 0000000..074b003
--- /dev/null
+++ b/awesome.packages
@@ -0,0 +1,36 @@
+xserver-xorg-core
+xserver-xorg-input-kbd
+xserver-xorg-input-mouse
+xserver-xorg-input-evdev
+xserver-xorg-video-geode
+xfonts-100dpi
+xfonts-scalable
+xfonts-base
+openssh-client
+openntpd
+diff
+bzip2
+menu
+aspell-en
+info
+manpages-dev
+rsync
+gdm
+awesome
+stalonetray
+network-manager-gnome
+claws-mail
+epiphany-browser
+file-roller
+links2
+pidgin
+evince
+xpdf
+totem
+gstreamer0.10-ffmpeg
+gstreamer0.10-plugins-bad
+gstreamer0.10-plugins-ugly
+xchat
+irssi
+gnash
+mozilla-plugin-gnash

diff --git a/base.packages b/base.packages
index 01cf8eb5b5fdcf47d0c538b6fa46dbb4120a3224..ce2d1017110411fbdaeca286e777129a40ad91ba 100644 (file)
--- a/base.packages
+++ b/base.packages
@@ -3,3 +3,5 @@ libertas-firmware
 initramfs-tools
 wireless-tools
 sudo
+less
+alsa-utils

diff --git a/gnome.packages b/gnome.packages
index 46dd1fb9bd21a7a0e8eccab008ace64147094446..b316eca4fefbb33796095feb0f2d30ea7212cd9e 100644 (file)
--- a/gnome.packages
+++ b/gnome.packages
@@ -9,7 +9,6 @@ xfonts-base
 openssh-client
 openntpd
 diff
-less
 bzip2
 menu
 aspell-en

diff --git a/initchroot.sh b/initchroot.sh
index 79a45094e57fc4c8528803f83de1ca8b1a6cb08b..565a18c5e0102102a9d066ba4c6630f6b48ba93e 100755 (executable)
--- a/initchroot.sh
+++ b/initchroot.sh
@@ -55,6 +55,10 @@ do
                ;;
        --package-list)
                PLIST=$2
+               [ -f ${PLIST} ] || {
+                       echo "Error: can't find file '${PLIST}'!" 1>&2
+                       exit 2
+               }
                shift
                ;;
        --mirror)
@@ -135,7 +139,7 @@ echo "en_US.UTF-8 UTF-8" >${ROOT_DIR}/etc/locale.gen
 
 k="http://lunge.mit.edu/~dilinger/debxo-0.2/initramfs-tools_0.92l.2_all.deb 
  http://lunge.mit.edu/~dilinger/debxo-0.2/ofw-config_0.1_all.deb 
- http://lunge.mit.edu/~dilinger/debxo-0.2/linux-2.6.25.15_2.6.25.15-140_i386.deb"
+ http://lunge.mit.edu/~dilinger/debxo-0.2/linux-2.6.25.15_2.6.25.15-144_i386.deb"
 mkdir -p cache
 for i in $k; do
        pkg=$(basename ${i})
@@ -229,14 +233,21 @@ rm -rf ${ROOT_DIR}/home/*;        # i have no idea what's adding this crap...
 echo "${DEFUSER} ALL=(ALL) NOPASSWD: ALL" >> ${ROOT_DIR}/etc/sudoers
 
 # add local network interface
-# (works around a kde session start problem)
 cat <<EOF >> ${ROOT_DIR}/etc/network/interfaces
-
-# added by xodist
 auto lo
 iface lo inet loopback
 EOF
 
+# configure sugar
+if [ -d ${ROOT_DIR}/usr/share/sugar ]; then
+    # #?
+    ln -sf /usr/share/activities/ ${ROOT_DIR}/usr/share/sugar
+    cat >> ${ROOT_DIR}/home/${DEFUSER}/.Xsession <<- EOF
+matchbox-window-manager -use_titlebar no &
+sugar
+EOF
+fi
+
 # done, clean up
 mv ${ROOT_DIR}/sbin/start-stop-daemon.REAL ${ROOT_DIR}/sbin/start-stop-daemon
 (chroot ${ROOT_DIR} aptitude clean)

diff --git a/sugar.packages b/sugar.packages
new file mode 100644 (file)
index 0000000..929476c
--- /dev/null
+++ b/sugar.packages
@@ -0,0 +1,32 @@
+xserver-xephyr
+xserver-xorg-core
+xserver-xorg-input-kbd
+xserver-xorg-input-mouse
+xserver-xorg-input-evdev
+xserver-xorg-video-geode
+xfonts-100dpi
+xfonts-scalable
+xfonts-base
+openssh-client
+openntpd
+menu
+aspell-en
+big-cursor
+kdm
+network-manager-gnome
+sugar
+sugar-artwork
+sugar-calculate-activity
+sugar-chat-activity
+sugar-journal-activity
+sugar-pippy-activity
+sugar-presence-service
+sugar-sharedstate-classes
+sugar-sharingtest-activity
+sugar-web-activity
+matchbox
+network-manager
+sugar-doc
+etoys
+etoys-doc
+squeak-vm