[Debian-eeepc-commits] [SCM] A live-helper based Debian live & installer image for the Eee PC. branch, master, updated. 1.0b1-119-gfc8d669

[Ben Armstrong]

The following commit has been merged in the master branch:
commit ade1fe6ff4e451dd9765123d7b410ef26dadfa50
Author: Ben Armstrong <synrg at debian.org>
Date:   Fri Nov 12 10:03:05 2010 -0400

    Simplify auto/config and balance package selection between functional and minimal.

diff --git a/auto/config b/auto/config
index 72b8551..faf6e37 100755
--- a/auto/config
+++ b/auto/config
@@ -1,46 +1,15 @@
 #!/bin/sh
 
-DEFAULT_CHROOT=http://mirror.its.dal.ca/debian/
-DEFAULT_CHROOT_SECURITY=http://security.debian.org/
-DEFAULT_BINARY=http://cdn.debian.net/debian/
-DEFAULT_BINARY_SECURITY=http://security.debian.org/
-
-MIRROR_CHROOT="${1:-$DEFAULT_CHROOT}"
-MIRROR_CHROOT_SECURITY="${2:-$DEFAULT_CHROOT_SECURITY}"
-MIRROR_BINARY="${3:-${1:-$DEFAULT_BINARY}}"
-MIRROR_BINARY_SECURITY="${4:-${2:-$DEFAULT_BINARY_SECURITY}}"
-MIRROR_BOOTSTRAP="${5:-${1:-$DEFAULT_CHROOT}}"
-
-if test "$MIRROR_CHROOT" = -; then
-	MIRROR_CHROOT="$DEFAULT_CHROOT"
-fi
-if test "$MIRROR_CHROOT_SECURITY" = -; then
-	MIRROR_CHROOT_SECURITY="$DEFAULT_CHROOT_SECURITY"
-fi
-if test "$MIRROR_BINARY" = -; then
-	MIRROR_BINARY="$DEFAULT_BINARY"
-fi
-if test "$MIRROR_BINARY_SECURITY" = -; then
-	MIRROR_BINARY_SECURITY="$DEFAULT_BINARY_SECURITY"
-fi
-if test "$MIRROR_BOOTSTRAP" = -; then
-	MIRROR_BOOTSTRAP="$DEFAULT_CHROOT"
-fi
-
 lb config noauto \
 	--clean \
 	--architecture i386 \
 	--bootappend-live 'acpi_osi="Linux"' \
 	-k 486 \
-	-b usb-hdd \
+	-b iso-hybrid \
 	--distribution squeeze \
         --archive-areas "main non-free" \
-	--mirror-bootstrap ${MIRROR_BOOTSTRAP} \
-	--mirror-chroot ${MIRROR_CHROOT} \
-	--mirror-chroot-security ${MIRROR_CHROOT_SECURITY} \
-	--mirror-binary ${MIRROR_BINARY} \
-	--mirror-binary-security ${MIRROR_BINARY_SECURITY} \
 	--packages-lists "standard" \
+	--tasks "standard" \
 	--debian-installer live \
 	--debian-installer-gui true \
 	--debian-installer-distribution daily \
diff --git a/config/chroot_local-packageslists/eeepc.list b/config/chroot_local-packageslists/eeepc.list
index f76f09e..6edea50 100644
--- a/config/chroot_local-packageslists/eeepc.list
+++ b/config/chroot_local-packageslists/eeepc.list
@@ -1,17 +1,18 @@
 # eeepc hardware:
-eeepc-acpi-scripts aosd-cat firmware-ralink xserver-xorg-video-nouveau xserver-xorg-video-intel xserver-xorg-video-vesa
+eeepc-acpi-scripts libnotify-bin notification-daemon firmware-ralink firmware-brcm80211 xserver-xorg-video-nouveau xserver-xorg-video-intel xserver-xorg-video-vesa
 
-# lxde desktop: tasksel --task-packages lxde-desktop
-lxde openoffice.org-gtk gdm lxde-core xsane foomatic-gui
+# lxde desktop: tasksel --task-packages lxde-desktop (modified)
+lxde gdm lxde-core xsane foomatic-gui
 
-# standard desktop: tasksel --task-packages desktop
-eject openoffice.org cups-client openoffice.org-help-en-us hp-ppd avahi-daemon openoffice.org-thesaurus-en-us cpufrequtils myspell-en-us vbetool xdg-utils pm-utils cups cups-bsd xorg iceweasel xserver-xorg-input-all hplip desktop-base alsa-base libnss-mdns xterm anacron alsa-utils cups-driver-gutenprint foo2zjs printconf hpijs menu gimp kerneloops openoffice.org-gcj libgl1-mesa-dri
+# standard desktop: tasksel --task-packages desktop (modified)
+eject cups-client hp-ppd avahi-daemon cpufrequtils myspell-en-us vbetool xdg-utils pm-utils cups cups-bsd xorg iceweasel xserver-xorg-input-all hplip desktop-base alsa-base libnss-mdns xterm anacron alsa-utils cups-driver-gutenprint foo2zjs printconf hpijs menu gimp kerneloops libgl1-mesa-dri
 
-# laptop: tasksel --task-packages laptop
-wireless-tools acpi powertop
+# laptop: tasksel --task-packages laptop (modified)
+wireless-tools acpi acpi-support powertop
 
 # enhanced lxde desktop:
-network-manager-gnome gnome-power-manager irssi mplayer gksu synaptic gpe-screenshot gpointing-device-settings briquolo zenity
+network-manager-gnome gnome-power-manager irssi mplayer-gui gksu synaptic gpe-screenshot briquolo zenity vim
+abiword
 
 # enhanced live:
 smbfs httpfs2 debian-installer-launcher gparted

-- 
A live-helper based Debian live & installer image for the Eee PC.