move olpc files to fedora-xo git repo - clean up

7 files changed, 1 insertions, 799 deletions

diff --git a/appliance.py b/appliance.py
index e5a106a..c168c5f 100644
--- a/appliance.py
+++ b/appliance.py
@@ -26,7 +26,7 @@ def main():
 	print 'Appliance %s exist already' % appliance_name
 	sys.exit(2)
 
-    ks = imgcreate.read_kickstart(os.path.join(base_dir, 'appliance.ks'))
+    ks = imgcreate.read_kickstart(os.path.join(base_dir, 'soas-appliance.ks'))
     creator = appcreate.ApplianceImageCreator(ks, 'soas2-appliance', 'vmdk', 512, 1)
 
     try:
diff --git a/base.ks b/base.ks
deleted file mode 100644
index c5173fb..0000000
--- a/base.ks
+++ /dev/null
@@ -1,469 +0,0 @@
-lang en_US.UTF-8
-keyboard us
-timezone US/Eastern
-auth --useshadow --enablemd5
-selinux --disabled
-firewall --enabled --service=mdns
-xconfig --startxonboot
-
-%packages
-@base
-@core
-
-# save some space
--cracklib-dicts
--nss_db
--acpid
--anacron
--mailcap
--nano
--wavpack
--createrepo
--irqbalance
--specspo
--esc
--samba-client
--a2ps
--mpage
--redhat-lsb
--sox
--hplip
--hpijs
--sendmail
--ssmtp
--numactl
--isdn4k-utils
--autofs
-
-# exclude input methods
--scim*
--m17n*
-
-# dictionaries are big
--aspell-*
--hunspell-*
--man-pages-*
--words
-
-# smartcards won't really work on the livecd.
--coolkey
--ccid
-
-# duplicate functionality
--pinfo
--vorbis-tools
--wget
-
-# lose the compat stuff
--compat*
-
-# scanning takes quite a bit of space :/
--xsane
--xsane-gimp
--sane-backends
-
-# no printing
--system-config-printer
--cups*
--foomatic*
--gutenprint*
-
-# attempt to remove dependencies on perl
--w3m
--logwatch
--lftp
--fbset
--exim
--deltarpm
-
-# remove SELinux stack
--setroubleshoot
--policycoreutils
--policycoreutils-gui
--checkpolicy
--selinux-*
--libselinux-python
--libselinux
-
-# other random stuff
--PackageKit*
--bluez*
--samba*
--*-backgrounds
--compiz-gnome
-
-# strip fedora trademarks
--fedora-logos
-generic-logos
-
-# bits to set up the livecd while anaconda has been removed here
-isomd5sum
-%end
-
-%post
-# FIXME: it'd be better to get this installed from a package
-cat > /etc/rc.d/init.d/livesys << EOF
-#!/bin/bash
-#
-# live: Init script for live image
-#
-# chkconfig: 345 00 99
-# description: Init script for live image.
-
-. /etc/init.d/functions
-
-if ! strstr "\`cat /proc/cmdline\`" liveimg || [ "\$1" != "start" ]; then
-    exit 0
-fi
-
-if [ -e /.liveimg-configured ] ; then
-    configdone=1
-fi
-
-exists() {
-    which \$1 >/dev/null 2>&1 || return
-    \$*
-}
-
-touch /.liveimg-configured
-
-# mount live image
-if [ -b \`readlink -f /dev/live\` ]; then
-   mkdir -p /mnt/live
-   mount -o ro /dev/live /mnt/live 2>/dev/null || mount /dev/live /mnt/live
-fi
-
-# enable swaps unless requested otherwise
-swaps=\`blkid -t TYPE=swap -o device\`
-if ! strstr "\`cat /proc/cmdline\`" noswap && [ -n "\$swaps" ] ; then
-  for s in \$swaps ; do
-    action "Enabling swap partition \$s" swapon \$s
-  done
-fi
-if ! strstr "\`cat /proc/cmdline\`" noswap && [ -f /mnt/live/LiveOS/swap.img ] ; then
-  action "Enabling swap file" swapon /mnt/live/LiveOS/swap.img
-fi
-
-mountPersistentHome() {
-  # support label/uuid
-  if [ "\${homedev##LABEL=}" != "\${homedev}" -o "\${homedev##UUID=}" != "\${homedev}" ]; then
-    homedev=\`/sbin/blkid -o device -t "\$homedev"\`
-  fi
-
-  # if we're given a file rather than a blockdev, loopback it
-  if [ "\${homedev##mtd}" != "\${homedev}" ]; then
-    # mtd devs don't have a block device but get magic-mounted with -t jffs2
-    mountopts="-t jffs2"
-  elif [ ! -b "\$homedev" ]; then
-    loopdev=\`losetup -f\`
-    if [ "\${homedev##/mnt/live}" != "\${homedev}" ]; then
-      action "Remounting live store r/w" mount -o remount,rw /mnt/live
-    fi
-    losetup \$loopdev \$homedev
-    homedev=\$loopdev
-  fi
-
-  # if it's encrypted, we need to unlock it
-  if [ "\$(/lib/udev/vol_id -t \$homedev 2>/dev/null)" = "crypto_LUKS" ]; then
-    echo
-    echo "Setting up encrypted /home device"
-    plymouth ask-for-password --command="cryptsetup luksOpen \$homedev EncHome"
-    homedev=/dev/mapper/EncHome
-  fi
-
-  # and finally do the mount
-  mount \$mountopts \$homedev /home
-  # if we have /home under what's passed for persistent home, then
-  # we should make that the real /home.  useful for mtd device on olpc
-  if [ -d /home/home ]; then mount --bind /home/home /home ; fi
-  [ -x /sbin/restorecon ] && /sbin/restorecon /home
-  if [ -d /home/liveuser ]; then USERADDARGS="-M" ; fi
-}
-
-findPersistentHome() {
-  for arg in \`cat /proc/cmdline\` ; do
-    if [ "\${arg##persistenthome=}" != "\${arg}" ]; then
-      homedev=\${arg##persistenthome=}
-      return
-    fi
-  done
-}
-
-if strstr "\`cat /proc/cmdline\`" persistenthome= ; then
-  findPersistentHome
-elif [ -e /mnt/live/LiveOS/home.img ]; then
-  homedev=/mnt/live/LiveOS/home.img
-fi
-
-# if we have a persistent /home, then we want to go ahead and mount it
-if ! strstr "\`cat /proc/cmdline\`" nopersistenthome && [ -n "\$homedev" ] ; then
-  action "Mounting persistent /home" mountPersistentHome
-fi
-
-# make it so that we don't do writing to the overlay for things which
-# are just tmpdirs/caches
-mount -t tmpfs -o mode=0755 varcacheyum /var/cache/yum
-mount -t tmpfs tmp /tmp
-mount -t tmpfs vartmp /var/tmp
-[ -x /sbin/restorecon ] && /sbin/restorecon /var/cache/yum /tmp /var/tmp >/dev/null 2>&1
-
-if [ -n "\$configdone" ]; then
-  exit 0
-fi
-
-# add fedora user with no passwd
-action "Adding live user" useradd \$USERADDARGS -c "Live System User" liveuser
-passwd -d liveuser > /dev/null
-
-# turn off firstboot for livecd boots
-chkconfig --level 345 firstboot off 2>/dev/null
-
-# don't start yum-updatesd for livecd boots
-chkconfig --level 345 yum-updatesd off 2>/dev/null
-
-# turn off mdmonitor by default
-chkconfig --level 345 mdmonitor off 2>/dev/null
-
-# turn off setroubleshoot on the live image to preserve resources
-chkconfig --level 345 setroubleshoot off 2>/dev/null
-
-# don't do packagekit checking by default
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /apps/gnome-packagekit/frequency_get_updates never >/dev/null
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /apps/gnome-packagekit/frequency_get_upgrades never >/dev/null
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /apps/gnome-packagekit/frequency_refresh_cache never >/dev/null
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/notify_available false >/dev/null
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/notify_distro_upgrades false >/dev/null
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_check_firmware false >/dev/null
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_check_hardware false >/dev/null
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_codec_helper false >/dev/null
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_font_helper false >/dev/null
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/enable_mime_type_helper false >/dev/null
-
-
-# don't start cron/at as they tend to spawn things which are
-# disk intensive that are painful on a live image
-chkconfig --level 345 crond off 2>/dev/null
-chkconfig --level 345 atd off 2>/dev/null
-chkconfig --level 345 anacron off 2>/dev/null
-chkconfig --level 345 readahead_early off 2>/dev/null
-chkconfig --level 345 readahead_later off 2>/dev/null
-
-# Stopgap fix for RH #217966; should be fixed in HAL instead
-touch /media/.hal-mtab
-
-# workaround clock syncing on shutdown that we don't want (#297421)
-sed -i -e 's/hwclock/no-such-hwclock/g' /etc/rc.d/init.d/halt
-
-# and hack so that we eject the cd on shutdown if we're using a CD...
-if strstr "\`cat /proc/cmdline\`" CDLABEL= ; then
-  cat >> /sbin/halt.local << FOE
-#!/bin/bash
-# we want to eject the cd on halt, but let's also try to avoid
-# io errors due to not being able to get files...
-cat /sbin/halt > /dev/null
-cat /sbin/reboot > /dev/null
-/usr/sbin/eject -p -m \$(readlink -f /dev/live) >/dev/null 2>&1
-echo "Please remove the CD from your drive and press Enter to finish restarting"
-read -t 30 < /dev/console
-FOE
-chmod +x /sbin/halt.local
-fi
-
-EOF
-
-# bah, hal starts way too late
-cat > /etc/rc.d/init.d/livesys-late << EOF
-#!/bin/bash
-#
-# live: Late init script for live image
-#
-# chkconfig: 345 99 01
-# description: Late init script for live image.
-
-. /etc/init.d/functions
-
-if ! strstr "\`cat /proc/cmdline\`" liveimg || [ "\$1" != "start" ] || [ -e /.liveimg-late-configured ] ; then
-    exit 0
-fi
-
-exists() {
-    which \$1 >/dev/null 2>&1 || return
-    \$*
-}
-
-touch /.liveimg-late-configured
-
-# read some variables out of /proc/cmdline
-for o in \`cat /proc/cmdline\` ; do
-    case \$o in
-    ks=*)
-        ks="\${o#ks=}"
-        ;;
-    xdriver=*)
-        xdriver="--set-driver=\${o#xdriver=}"
-        ;;
-    esac
-done
-
-# setup support for QEMU
-grep QEMU /sys/firmware/acpi/tables/APIC >/dev/null \
-    && cat > /etc/X11/xorg.conf <<FOE
-Section "ServerLayout"
-        Identifier     "Default layout"
-        Screen      0  "Screen0" 0 0
-        InputDevice    "Keyboard0" "CoreKeyboard"
-EndSection
- 
-Section "InputDevice"
-        Identifier  "Keyboard0"
-        Driver      "kbd"
-        Option      "XkbModel" "pc105+inet"
-        Option      "XkbLayout" "us"
-EndSection
- 
-Section "Monitor"
-        Identifier   "Monitor0"
-        ModelName    "Monitor 1024x768"
-        HorizSync    31.5 - 61.0
-        VertRefresh  50.0 - 75.0
-        Option      "dpms"
-EndSection
- 
-Section "Device"
-        Identifier  "Videocard0"
-        Driver      "cirrus"
-EndSection
- 
-Section "Screen"
-        Identifier "Screen0"
-        Device     "Videocard0"
-        Monitor    "Monitor0"
-        DefaultDepth     24
-        SubSection "Display"
-                Viewport   0 0
-                Depth     24
-        EndSubSection
-EndSection
-FOE
-
-# this is a bad hack to work around #460581 for the geode
-# purely to help move testing along for now
-if [ \`grep -c Geode /proc/cpuinfo\` -ne 0 ]; then
-  cat > /etc/X11/xorg.conf <<FOE
-Section "ServerLayout"
-	Identifier     "Default Layout"
-	Screen      0  "Screen0" 0 0
-	InputDevice    "Keyboard0" "CoreKeyboard"
-EndSection
-
-Section "InputDevice"
-# keyboard added by rhpxl
-	Identifier  "Keyboard0"
-	Driver      "kbd"
-	Option	    "XkbModel" "pc105"
-	Option	    "XkbLayout" "us"
-EndSection
-
-Section "Monitor"
-	Identifier  "Monitor0"
-	HorizSync   30-67
-	VertRefresh 48-52
-	DisplaySize 152 114
-	Mode "1200x900"
-		DotClock 57.275
-		HTimings 1200 1208 1216 1240
-		VTimings 900 905 908 912
-		Flags    "-HSync" "-VSync"
-	EndMode
-EndSection
-
-Section "Device"
-	Identifier  "Videocard0"
-	Driver      "amd"
-	VendorName  "Advanced Micro Devices, Inc."
-	BoardName   "AMD Geode GX/LX"
-
-	Option     "AccelMethod" "EXA"
-	Option     "NoCompression" "true"
-        Option     "MigrationHeuristic" "greedy"
-	Option     "PanelGeometry" "1200x900"
-EndSection
-
-Section "Screen"
-	Identifier "Screen0"
-	Device     "Videocard0"
-	Monitor    "Monitor0"
-	DefaultDepth 16
-	SubSection "Display"
-		Depth   16
-		Modes   "1200x900"
-	EndSubSection
-EndSection
-FOE
-
-echo "Xft.dpi: 150" > /home/liveuser/.Xresources
-
-fi
-
-# if liveinst or textinst is given, start anaconda
-if strstr "\`cat /proc/cmdline\`" liveinst ; then
-   plymouth --quit
-   /usr/sbin/liveinst \$ks
-fi
-if strstr "\`cat /proc/cmdline\`" textinst ; then
-   plymouth --quit
-   /usr/sbin/liveinst --text \$ks
-fi
-
-# configure X, allowing user to override xdriver
-if [ -n "\$xdriver" ]; then
-   exists system-config-display --noui --reconfig --set-depth=24 \$xdriver
-fi
-
-EOF
-
-# workaround avahi segfault (#279301)
-touch /etc/resolv.conf
-/sbin/restorecon /etc/resolv.conf
-
-chmod 755 /etc/rc.d/init.d/livesys
-/sbin/restorecon /etc/rc.d/init.d/livesys
-/sbin/chkconfig --add livesys
-
-chmod 755 /etc/rc.d/init.d/livesys-late
-/sbin/restorecon /etc/rc.d/init.d/livesys-late
-/sbin/chkconfig --add livesys-late
-
-# work around for poor key import UI in PackageKit
-rm -f /var/lib/rpm/__db*
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
-
-# go ahead and pre-make the man -k cache (#455968)
-/usr/sbin/makewhatis -w
-
-# save a little bit of space at least...
-rm -f /boot/initrd*
-# make sure there aren't core files lying around
-rm -f /core*
-
-# try to work-around issues with NM and APs
-rm -f /etc/NetworkManager/dispatcher.d/05-netfs
-
-# permanently set %__dbi_cdb rpm macro to work around jffs2's lack of writeable mmap()
-mkdir -p /etc/rpm
-echo "%__dbi_cdb create private nommap" > /etc/rpm/macros.rpmdb
-
-# Needed for spin debranding
-sed -i -e 's/Fedora/Generic/g' /etc/fedora-release
-%end
-
-%post --nochroot
-cp $INSTALL_ROOT/usr/share/doc/*-release-*/GPL $LIVE_ROOT/GPL
-cp $INSTALL_ROOT/usr/share/doc/HTML/readme-live-image/en_US/readme-live-image-en_US.txt $LIVE_ROOT/README
-
-# only works on x86, x86_64
-if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
-  if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
-  cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
-fi
-%end
diff --git a/gnome.ks b/gnome.ks
deleted file mode 100644
index 0b99c6b..0000000
--- a/gnome.ks
+++ /dev/null
@@ -1,62 +0,0 @@
-%packages
-
-# gnome desktop
-gdm
-gnome-desktop
-gnome-panel
-gnome-session
-gnome-terminal
-metacity
-nautilus
-
-# internet
-midori
-empathy
-alpine
-
-# office
-abiword
-gnumeric
-evince
-
-# graphics
-mirage
-
-# audio & video
-cheese
-totem
-totem-gstreamer
-totem-mozplugin
--totem-xine
--xine-lib
-
-# more desktop stuff
-alsa-plugins-pulseaudio
-file-roller
-gedit
-gnash-plugin
-gnome-power-manager
-NetworkManager-gnome
-xdg-user-dirs-gtk
-
-%end
-
-%post
-
-cat >> /etc/rc.d/init.d/livesys << EOF
-
-# disable screensaver locking
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null
-# make sure the fonts are not too big
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t int /desktop/gnome/font_rendering/dpi 120 >/dev/null
-# enable the logout menu item in Sugar
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/show_logout true >/dev/null
-
-# set up timed auto-login for after 60 seconds
-cat >> /etc/gdm/custom.conf << FOE
-[daemon]
-TimedLoginEnable=true
-TimedLogin=liveuser
-TimedLoginDelay=60
-FOE
-%end
diff --git a/olpc.ks b/olpc.ks
deleted file mode 100644
index d856c63..0000000
--- a/olpc.ks
+++ /dev/null
@@ -1,41 +0,0 @@
-%include base.ks
-%include gnome.ks
-%include sugar.ks
-
-bootloader --timeout=1
-part / --size 1024
-services --enabled=NetworkManager --disabled=acpid,auditd,cups,dnsmasq,exim,ip6tables,iptables,irda,kerneloops,mdmonitor,netfs,network,nfs,nfslock,nscd,portreserve,rpcbind,rpcgssd,rpcidmapd,sshd
-
-# compose against rawhide now again
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386 --excludepkgs=PolicyKit-kde
-
-# use if mirrors are outdated
-# repo --name=rawhide --baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/i386/os/ --excludepkgs=PolicyKit-kde
-
-%packages --excludedocs --instLangs en_US
-
-# basic system packages
-libertas-usb8388-firmware
-kernel.i586
-chkconfig
-
-# graphical base environment
-desktop-backgrounds-basic
-openssh-askpass
-plymouth-plugin-spinfinity
-xorg-x11-server-Xorg
-xorg-x11-drv-void
-xorg-x11-drv-fbdev
-xorg-x11-drv-geode
-xorg-x11-drv-evdev
-xorg-x11-drv-keyboard
-xorg-x11-drv-mouse
-xorg-x11-drv-cirrus
-xorg-x11-utils
-xorg-x11-xinit
-xorg-x11-xauth
-
-# move to generic release notes
--fedora-release-notes
-generic-release-notes
-%end
diff --git a/appliance.ks b/soas-appliance.ks
index 9c8b3db..9c8b3db 100644
--- a/appliance.ks
+++ b/soas-appliance.ks
diff --git a/soas.ks b/soas.ks
deleted file mode 100644
index f24b37b..0000000
--- a/soas.ks
+++ /dev/null
@@ -1,147 +0,0 @@
-%include base.ks
-%include sugar.ks
-
-bootloader --timeout=1
-part / --size 2048
-services --enabled=NetworkManager --disabled=acpid,auditd,cups,dnsmasq,exim,ip6tables,iptables,irda,kerneloops,mdmonitor,netfs,network,nfs,nfslock,nscd,portreserve,rpcbind,rpcgssd,rpcidmapd,sshd
-
-# compose against rawhide now again
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386 --excludepkgs=abiword,libabiword,generic-logos,generic-release,generic-release-notes,plymouth,plymouth-*,PolicyKit-kde
-
-# use if mirrors are outdated
-# repo --name=rawhide --baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/i386/os/ --excludepkgs=abiword,libabiword,generic-logos,generic-release,generic-release-notes,plymouth,plymouth-*,PolicyKit-kde
-
-# include soas repo
-repo --name=sugar --baseurl=http://download.sugarlabs.org/soas/repositories/2/
-
-%packages
-
-# basic system packages
-@hardware-support
-kernel
-
-# graphical base environment
-@base-x
-slim
-
-# work around for keyboard layout
-system-config-keyboard
-
-# allow reproduction of images
-livecd-tools
-
-# include to get better feedback
-smolt
-
-# additional packages from our repo
-gstreamer-plugins-espeak
-
-# qlogic firmwares
--ql2100-firmware
--ql2200-firmware
--ql23xx-firmware
--ql2400-firmware
-
-# use soas release package
--fedora-release
-generic-release
-%end
-
-%post
-cat > /etc/sysconfig/desktop <<EOF
-DISPLAYMANAGER=/usr/bin/slim-dynwm
-EOF
-
-cat >> /etc/rc.d/init.d/livesys << EOF
-
-# add Sugar repository to yum
-cat >> /etc/yum.repos.d/sugar.repo << FOE
-[sugar]
-name=Sugar
-failovermethod=priority
-baseurl=http://download.sugarlabs.org/soas/repositories/2/
-enabled=1
-gpgcheck=0
-FOE
-
-# disable the logout menu item in Sugar
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/show_logout false >/dev/null
-
-# setup auto-login for slim
-cat >> /etc/slim.conf << FOE
-auto_login	yes
-default_user	liveuser
-FOE
-
-# setup activity directory
-mkdir -p /home/liveuser/Activities
-chown liveuser:liveuser /home/liveuser/Activities
-chown -R liveuser:liveuser /usr/share/sugar/honey
-for bundle in \`find /usr/share/sugar/honey -maxdepth 1\` ; do
-ln -s \$bundle /home/liveuser/Activities
-done
-
-# add more activities to the favorites
-cat > /usr/share/sugar/data/activities.defaults << FOE
-com.garycmartin.Moon
-org.laptop.AbiWordActivity
-org.laptop.Calculate
-org.laptop.Chat
-org.sugarlabs.InfoSlicer
-org.sugarlabs.IRC
-org.laptop.Memorize
-org.laptop.Pippy
-org.laptop.Terminal
-org.laptop.TurtleArtActivity
-org.laptop.WebActivity
-org.vpri.EtoysActivity
-vu.lux.olpc.Speak
-org.worldwideworkshop.olpc.JigsawPuzzle
-FOE
-
-EOF
-%end
-
-%post --nochroot
-
-ASLO="$ASLO 4042" # InfoSlicer
-ASLO="$ASLO 4034" # Moon
-ASLO="$ASLO 4046" # JigsawPuzzle
-ASLO="$ASLO 4047" # SliderPuzzle
-ASLO="$ASLO 4063" # Memorize
-ASLO="$ASLO 4038" # Speak
-ASLO="$ASLO 4037" # CartoonBuilder
-ASLO="$ASLO 4044" # FlipSticks
-ASLO="$ASLO 4064" # JokeMachine
-ASLO="$ASLO 4029" # IRC
-ASLO="$ASLO 4054" # FreeCell
-ASLO="$ASLO 4039" # ViewSlides
-ASLO="$ASLO 4073" # StoryBuilder
-ASLO="$ASLO 4074" # Poll
-ASLO="$ASLO 4058" # Develop
-ASLO="$ASLO 4078" # Labyrinth
-ASLO="$ASLO 4082" # Paint
-ASLO="$ASLO 4081" # Record
-ASLO="$ASLO 4059" # TamTamEdit
-ASLO="$ASLO 4060" # TamTamJam
-ASLO="$ASLO 4061" # TamTamMini
-ASLO="$ASLO 4062" # TamTamSynth Lab
-
-WD=$PWD
-BUNDLES_DIR=$INSTALL_ROOT/usr/share/sugar/honey
-
-mkdir -p $BUNDLES_DIR
-cd $BUNDLES_DIR
-
-for id in $ASLO ; do
-  curl -L http://activities.sugarlabs.org/en-US/sugar/downloads/latest/$id > $id.xo
-done
-
-for file in *.xo ; do
-    unzip $file
-    rm $file
-done
-
-cd $WD
-
-%end
diff --git a/sugar.ks b/sugar.ks
deleted file mode 100644
index 1e62800..0000000
--- a/sugar.ks
+++ /dev/null
@@ -1,79 +0,0 @@
-%packages
-
-# sugar!
-# temporary changes until comps group gets fixed
-sugar
-sugar-browse
-sugar-calculator
-sugar-chat
-sugar-imageviewer
-sugar-jukebox
-sugar-log
-sugar-pippy
-sugar-read
-sugar-terminal
-sugar-turtleart
-sugar-write
-
-# additional packages
-DeviceKit-disks
-espeak
-etoys
-evince-djvu
-gtksourceview2
-gvfs
-libffi
-numpy
-olpcsound
-pygame
-python-json
-squeak-vm
-sugar-update-control
-
-# e-mail client
-alpine
-
-# multimedia implementations
-gnash-plugin
-
-# sound
-pulseaudio
-alsa-plugins-pulseaudio
-alsa-utils
-gstreamer-plugins-good
-# espeak plugin is in soas.ks
-
-%end
-
-%post
-cat >> /etc/rc.d/init.d/livesys << EOF
-
-# fix permissions on home directory
-chown liveuser /home/liveuser
-chgrp liveuser /home/liveuser
-
-# setup Xclients
-cat >> /home/liveuser/.Xclients << FOE
-xsetroot -def
-
-eval \\\$(dbus-launch --sh-syntax --exit-with-session)
-
-RESOLUTION=\\\$(xdpyinfo | grep resolution | sed "s/.* \\([0-9][0-9]*\\)x.*/\\1/")
-if [ "\\\$RESOLUTION" -gt 150 ]; then
-    SUGAR_SCALING=100
-else
-    SUGAR_SCALING=72
-fi
-
-SUGAR_SCALING=\\\$SUGAR_SCALING sugar
-FOE
-
-# fix issues with dbus and ck
-rm /etc/X11/xinit/xinitrc.d/00-start-message-bus.sh
-
-chmod a+x /home/liveuser/.Xclients
-chown liveuser:liveuser /home/liveuser/.Xclients
-
-EOF
-
-%end