[Debian-eeepc-commits] [SCM] A live-helper based Debian live & installer image for the Eee PC. branch, master, updated. 1.0b1-10-g06a7eda
Ben Armstrong
synrg at sanctuary.nslug.ns.ca
Sun May 31 21:06:24 UTC 2009
The following commit has been merged in the master branch:
commit 46cda58122093b00b193689163c079d81fdb35cd
Author: Ben Armstrong <synrg at sanctuary.nslug.ns.ca>
Date: Sun May 31 16:57:15 2009 -0300
Size rebalancing, enable mplayer screenshots, updated UsersGuide
diff --git a/Changelog b/Changelog
index 1832a6a..c2c570c 100644
--- a/Changelog
+++ b/Changelog
@@ -1,10 +1,21 @@
+1.0~b3
+------
+ * Remove some things to accommodate for actual size of some SD
+ media being as small as 241M instead of the reported 256M
+ and to reserve 35M of space for future addition of installer.
+ * Removed packages: amsn, evdev, smplayer, tunapie,
+ streamripper, audacious, pidgin.
+ * Add ayttm as a much smaller alternative to pidgin.
+ * Bring acpid up to date with sid: 1.0.10-2.
+ * Turn on screenshots in mplayer.
+ * Include images in UsersGuide for offine viewing.
+
1.0~b2
------
* Add acpi, cpufrequtils, libgl1-mesa-dri.
* Add misc useful utilities & apps: gparted, netcat,
iputils-ping, less, ssh-client, amsn, pidgin,
- clive, rsync, nano, vim-tiny, bash-completion,
- rsync, vim-tiny.
+ clive, rsync, nano, bash-completion, rsync.
* Add a smallish but fun game: briquolo.
* Ensure synaptic and wget don't get removed by the
minimal hook.
diff --git a/config/binary b/config/binary
index a23cbc1..a1a2777 100644
--- a/config/binary
+++ b/config/binary
@@ -9,7 +9,7 @@ LH_BINARY_FILESYSTEM="fat16"
LH_BINARY_IMAGES="usb-hdd"
# $LH_BINARY_INDICES: set apt/aptitude generic indices
-# (Default: enabled)
+# (Default: none)
LH_BINARY_INDICES="none"
# $LH_BOOTAPPEND_LIVE: set boot parameters
@@ -18,7 +18,7 @@ LH_BOOTAPPEND_LIVE="noautologin"
# $LH_BOOTAPPEND_INSTALL: set boot parameters
# (Default: empty)
-LH_BOOTAPPEND_INSTALL=" -- "
+LH_BOOTAPPEND_INSTALL=" -- ${LH_BOOTAPPEND_LIVE}"
# $LH_BOOTLOADER: set bootloader
# (Default: syslinux)
@@ -62,16 +62,16 @@ LH_HOSTNAME="debian"
LH_ISO_APPLICATION="Debian Live"
# $LH_ISO_PREPARER: set iso preparer
-# (Default: live-helper 1.0~a43; http://packages.qa.debian.org/live-helper)
-LH_ISO_PREPARER="live-helper 1.0~a43; http://packages.qa.debian.org/live-helper"
+# (Default: live-helper $VERSION; http://packages.qa.debian.org/live-helper)
+LH_ISO_PREPARER="live-helper $VERSION; http://packages.qa.debian.org/live-helper"
# $LH_ISO_PUBLISHER: set iso publisher
-# (Default: Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org)
-LH_ISO_PUBLISHER="Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org"
+# (Default: Debian Live project; http://debian-live.alioth.debian.org/; debian-live at lists.debian.org)
+LH_ISO_PUBLISHER="Debian Live project; http://debian-live.alioth.debian.org/; debian-live at lists.debian.org"
# $LH_ISO_VOLUME: set iso volume (max 32 chars)
-# (Default: Debian Live 20080410-09:12)
-LH_ISO_VOLUME="Debian Live 20080410-09:12"
+# (Default: Debian Live lenny $(date +%Y%m%d-%H:%M))
+LH_ISO_VOLUME="Debian Live lenny $(date +%Y%m%d-%H:%M)"
# $LH_JFFS2_ERASEBLOCK: set jffs2 eraseblock size
# (Default: unset)
@@ -82,8 +82,8 @@ LH_JFFS2_ERASEBLOCK=""
LH_MEMTEST="memtest86+"
# $LH_WIN32_LOADER: set win32-loader
-# (Default: enabled)
-LH_WIN32_LOADER="enabled"
+# (Default: disabled)
+LH_WIN32_LOADER="disabled"
# $LH_NET_ROOT_FILESYSTEM: set netboot filesystem
# (Default: nfs)
@@ -138,8 +138,8 @@ LH_SYSLINUX_CFG=""
LH_SYSLINUX_MENU="enabled"
# $LH_SYSLINUX_MENU_LIVE_ENTRY: set text to be used on the menu for live entries
-# (Default: Start Debian Live)
-LH_SYSLINUX_MENU_LIVE_ENTRY="Start Debian Live"
+# (Default: Live)
+LH_SYSLINUX_MENU_LIVE_ENTRY="Live"
# $LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY: set text to be used on the menu for live entries (failsafe ones)
# (Default: )
diff --git a/config/bootstrap b/config/bootstrap
index 61126bc..142a102 100644
--- a/config/bootstrap
+++ b/config/bootstrap
@@ -18,7 +18,7 @@ LH_BOOTSTRAP_EXCLUDE=""
# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
# (Default: empty)
-LH_BOOTSTRAP_FLAVOUR="minimal"
+LH_BOOTSTRAP_FLAVOUR=""
# $LH_BOOTSTRAP_KEYRING: set distribution keyring
# (Default: empty)
@@ -30,11 +30,11 @@ LH_DISTRIBUTION="lenny"
# $LH_MIRROR_BOOTSTRAP: set mirror to bootstrap from
# (Default: http://ftp.us.debian.org/debian/)
-LH_MIRROR_BOOTSTRAP="http://ftp.us.debian.org/debian/"
+LH_MIRROR_BOOTSTRAP="http://debian.mirror.rafal.ca/debian/"
# $LH_MIRROR_CHROOT: set mirror to fetch packages from
# (Default: http://ftp.us.debian.org/debian/)
-LH_MIRROR_CHROOT="http://ftp.us.debian.org/debian/"
+LH_MIRROR_CHROOT="http://debian.mirror.rafal.ca/debian/"
# $LH_MIRROR_CHROOT_SECURITY: set security mirror to fetch packages from
# (Default: http://security.debian.org/)
@@ -49,5 +49,5 @@ LH_MIRROR_BINARY="http://ftp.us.debian.org/debian/"
LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
# $LH_CATEGORIES: select categories to use
-# (Default: main contrib)
+# (Default: main)
LH_CATEGORIES="main"
diff --git a/config/chroot_local-hooks/eeepc.sh b/config/chroot_local-hooks/eeepc.sh
index 1409379..7e9ac87 100755
--- a/config/chroot_local-hooks/eeepc.sh
+++ b/config/chroot_local-hooks/eeepc.sh
@@ -7,7 +7,10 @@ echo "HWCLOCKPARS=--directisa" >> /etc/default/rcS
SCRIPTS_DEFAULTS=/etc/default/eeepc-acpi-scripts
sed -i "s/ENABLE_OSD='no'/ENABLE_OSD='yes'/" $SCRIPTS_DEFAULTS
sed -i "s/LOCK_SCREEN_ON_SUSPEND='yes'/LOCK_SCREEN_ON_SUSPEND='no'/" $SCRIPTS_DEFAULTS
+echo "vf=screenshot" >> /etc/mplayer/mplayer.conf
+
+# Include some doc (iceweasel home page)
mkdir -p /usr/local/share/eeepc-live
(cd /usr/local/share/eeepc-live ;
- wget -E -H -k -K -p http://wiki.debian.org/DebianEeePC/Live/UsersGuide ;
- ln -s wiki.debian.org/DebianEeePC/Live/UsersGuide.html)
+ wget -E -H -k -K -p -e robots=off http://wiki.debian.org/DebianEeePC/Live/UsersGuide)
+
diff --git a/config/chroot_local-includes/etc/iceweasel/profile/prefs.js b/config/chroot_local-includes/etc/iceweasel/profile/prefs.js
index a459395..c402f0a 100644
--- a/config/chroot_local-includes/etc/iceweasel/profile/prefs.js
+++ b/config/chroot_local-includes/etc/iceweasel/profile/prefs.js
@@ -8,4 +8,4 @@
* To make a manual change to preferences, you can visit the URL about:config
* For more information, see http://www.mozilla.org/unix/customizing.html#prefs
*/
-user_pref("browser.startup.homepage", "file:///usr/local/share/eeepc-live/UsersGuide.html");
+user_pref("browser.startup.homepage", "file:///usr/local/share/eeepc-live/wiki.debian.org/DebianEeePC/Live/UsersGuide.html");
diff --git a/config/chroot_local-packageslists/eeepc b/config/chroot_local-packageslists/eeepc
index b5679ce..f81d4bd 100644
--- a/config/chroot_local-packageslists/eeepc
+++ b/config/chroot_local-packageslists/eeepc
@@ -1,8 +1,8 @@
locales
eeepc-acpi-scripts
-xserver-xorg-video-intel xserver-xorg-video-vesa xserver-xorg-input-synaptics xserver-xorg-input-kbd xserver-xorg-input-mouse xserver-xorg-input-evdev xorg xserver-xorg-input-all- xserver-xorg-video-all-
+xserver-xorg-video-intel xserver-xorg-video-vesa xserver-xorg-input-synaptics xserver-xorg-input-kbd xserver-xorg-input-mouse xorg xserver-xorg-input-all- xserver-xorg-video-all-
menu nano libgl1-mesa-dri bash-completion
lxde dhcp3-client wicd aosd-cat hal iceweasel alsa-base alsa-utils
-tunapie streamripper audacious smplayer amsn pidgin
-gksu synaptic cpufrequtils acpi gparted netcat wget apt-utils aptitude
+ayttm mplayer
+gksu synaptic cpufrequtils acpi gparted netcat wget aptitude
iputils-ping less ssh-client clive briquolo
diff --git a/config/common b/config/common
index 578e983..88797ee 100644
--- a/config/common
+++ b/config/common
@@ -1,8 +1,8 @@
# config/common - common options for live-helper(7)
# $LH_APT: set package manager
-# (Default: apt-get)
-LH_APT="apt-get"
+# (Default: apt)
+LH_APT="apt"
# $LH_APT_FTP_PROXY: set apt/aptitude ftp proxy
# (Default: autodetected or empty)
@@ -21,7 +21,7 @@ LH_APT_PDIFFS="disabled"
LH_APT_PIPELINE=""
# $LH_APT_RECOMMENDS: set apt/aptitude recommends
-# (Default: enabled)
+# (Default: disabled)
LH_APT_RECOMMENDS="disabled"
# $LH_APT_SECURE: set apt/aptitude security
@@ -85,8 +85,8 @@ LH_MODE="debian"
LH_USE_FAKEROOT="disabled"
# $LH_TASKSEL: set tasksel program
-# (Default: aptitude)
-LH_TASKSEL="aptitude"
+# (Default: tasksel)
+LH_TASKSEL="tasksel"
# $LH_INCLUDES: set includes
# (Default: /usr/share/live-helper/includes)
--
A live-helper based Debian live & installer image for the Eee PC.
More information about the Debian-eeepc-commits
mailing list