[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 debian.org
Sun May 31 21:06:25 UTC 2009
The following commit has been merged in the master branch:
commit 06a7edac3aef36450b94415af75e54f4bbabc8c1
Author: Ben Armstrong <synrg at debian.org>
Date: Sun May 31 18:06:07 2009 -0300
Use scripts instead of config in git
diff --git a/Changelog b/Changelog
index c2c570c..9c54c37 100644
--- a/Changelog
+++ b/Changelog
@@ -9,6 +9,8 @@
* Bring acpid up to date with sid: 1.0.10-2.
* Turn on screenshots in mplayer.
* Include images in UsersGuide for offine viewing.
+ * Use scripts (from config-webc) instead of including config/*
+ in git.
1.0~b2
------
diff --git a/config/binary b/config/binary
deleted file mode 100644
index a1a2777..0000000
--- a/config/binary
+++ /dev/null
@@ -1,154 +0,0 @@
-# config/binary - options for live-helper(7), binary stage
-
-# $LH_BINARY_FILESYSTEM: set image filesystem
-# (Default: fat16)
-LH_BINARY_FILESYSTEM="fat16"
-
-# $LH_BINARY_IMAGES: set image type
-# (Default: usb-hdd)
-LH_BINARY_IMAGES="usb-hdd"
-
-# $LH_BINARY_INDICES: set apt/aptitude generic indices
-# (Default: none)
-LH_BINARY_INDICES="none"
-
-# $LH_BOOTAPPEND_LIVE: set boot parameters
-# (Default: empty)
-LH_BOOTAPPEND_LIVE="noautologin"
-
-# $LH_BOOTAPPEND_INSTALL: set boot parameters
-# (Default: empty)
-LH_BOOTAPPEND_INSTALL=" -- ${LH_BOOTAPPEND_LIVE}"
-
-# $LH_BOOTLOADER: set bootloader
-# (Default: syslinux)
-LH_BOOTLOADER="syslinux"
-
-# $LH_CHECKSUMS: set checksums
-# (Default: enabled)
-LH_CHECKSUMS="enabled"
-
-# ${LH_CHROOT_BUILD: control if we build binary images chrooted
-# (Default: enabled)
-# DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-LH_CHROOT_BUILD="enabled"
-
-# $LH_DEBIAN_INSTALLER: set debian-installer
-# (Default: disabled)
-LH_DEBIAN_INSTALLER="disabled"
-
-# $LH_DEBIAN_INSTALLER_DISTRIBUTION: set debian-installer suite
-# (Default: empty)
-LH_DEBIAN_INSTALLER_DISTRIBUTION="lenny"
-
-# $LH_DEBIAN_INSTALLER_PRESEEDFILE: set debian-installer preseed filename/url
-# (Default: )
-LH_DEBIAN_INSTALLER_PRESEEDFILE=""
-
-# $LH_ENCRYPTION: set encryption
-# (Default: disabled)
-LH_ENCRYPTION="disabled"
-
-# $LH_GRUB_SPLASH: set custom grub splash
-# (Default: empty)
-LH_GRUB_SPLASH=""
-
-# $LH_HOSTNAME: set hostname
-# (Default: debian)
-LH_HOSTNAME="debian"
-
-# $LH_ISO_APPLICATION: set iso author
-# (Default: Debian Live)
-LH_ISO_APPLICATION="Debian Live"
-
-# $LH_ISO_PREPARER: set iso preparer
-# (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 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 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)
-LH_JFFS2_ERASEBLOCK=""
-
-# $LH_MEMTEST: set memtest
-# (Default: memtest86+)
-LH_MEMTEST="memtest86+"
-
-# $LH_WIN32_LOADER: set win32-loader
-# (Default: disabled)
-LH_WIN32_LOADER="disabled"
-
-# $LH_NET_ROOT_FILESYSTEM: set netboot filesystem
-# (Default: nfs)
-LH_NET_ROOT_FILESYSTEM="nfs"
-
-# $LH_NET_ROOT_MOUNTOPTIONS: set nfsopts
-# (Default: empty)
-LH_NET_ROOT_MOUNTOPTIONS=""
-
-# $LH_NET_ROOT_PATH: set netboot server directory
-# (Default: /srv/debian-live)
-LH_NET_ROOT_PATH="/srv/debian-live"
-
-# $LH_NET_ROOT_SERVER: set netboot server address
-# (Default: 192.168.1.1)
-LH_NET_ROOT_SERVER="192.168.1.1"
-
-# $LH_NET_COW_FILESYSTEM: set net client cow filesystem
-# (Default: nfs)
-LH_NET_COW_FILESYSTEM="nfs"
-
-# $LH_NET_COW_MOUNTOPTIONS: set cow mount options
-# (Default: empty)
-LH_NET_COW_MOUNTOPTIONS=""
-
-# $LH_NET_COW_PATH: set cow directory
-# (Default: )
-LH_NET_COW_PATH=""
-
-# $LH_NET_COW_SERVER: set cow server
-# (Default: )
-LH_NET_COW_SERVER=""
-
-# $LH_NET_TARBALL: set net tarball
-# (Default: gzip)
-LH_NET_TARBALL="gzip"
-
-# $LH_SYSLINUX_SPLASH: set custom syslinux splash
-# (Default: empty)
-LH_SYSLINUX_SPLASH=""
-
-# $LH_SYSLINUX_TIMEOUT: set custom syslinux timeout in seconds
-# (Default: 0)
-LH_SYSLINUX_TIMEOUT="0"
-
-# $LH_SYSLINUX_CFG: set custom syslinux configuration file
-# (Default: empty)
-LH_SYSLINUX_CFG=""
-
-# $LH_SYSLINUX_MENU: set syslinux menu
-# (Default: enabled)
-LH_SYSLINUX_MENU="enabled"
-
-# $LH_SYSLINUX_MENU_LIVE_ENTRY: set text to be used on the menu for live entries
-# (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: )
-LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY=""
-
-# $LH_SYSLINUX_MENU_MEMTEST_ENTRY: set text to be used on the menu for memtest entry
-# (Default: Memory test)
-LH_SYSLINUX_MENU_MEMTEST_ENTRY="Memory test"
-
-# $LH_USERNAME: set username
-# (Default: user)
-LH_USERNAME="user"
diff --git a/config/bootstrap b/config/bootstrap
deleted file mode 100644
index 142a102..0000000
--- a/config/bootstrap
+++ /dev/null
@@ -1,53 +0,0 @@
-# config/bootstrap - options for live-helper(7), bootstrap stage
-
-# $LH_ARCHITECTURE: select chroot architecture
-# (Default: autodetected)
-LH_ARCHITECTURE="i386"
-
-# $LH_BOOTSTRAP_CONFIG: set distribution config directory
-# (Default: empty)
-LH_BOOTSTRAP_CONFIG=""
-
-# $LH_BOOTSTRAP_INCLUDE: include packages on base
-# (Default: empty)
-LH_BOOTSTRAP_INCLUDE=""
-
-# $LH_BOOTSTRAP_EXCLUDE: exclude packages on base
-# (Default: empty)
-LH_BOOTSTRAP_EXCLUDE=""
-
-# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
-# (Default: empty)
-LH_BOOTSTRAP_FLAVOUR=""
-
-# $LH_BOOTSTRAP_KEYRING: set distribution keyring
-# (Default: empty)
-LH_BOOTSTRAP_KEYRING=""
-
-# $LH_DISTRIBUTION: select distribution to use
-# (Default: lenny)
-LH_DISTRIBUTION="lenny"
-
-# $LH_MIRROR_BOOTSTRAP: set mirror to bootstrap from
-# (Default: 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://debian.mirror.rafal.ca/debian/"
-
-# $LH_MIRROR_CHROOT_SECURITY: set security mirror to fetch packages from
-# (Default: http://security.debian.org/)
-LH_MIRROR_CHROOT_SECURITY="http://security.debian.org/"
-
-# $LH_MIRROR_BINARY: set mirror which ends up in the image
-# (Default: http://ftp.us.debian.org/debian/)
-LH_MIRROR_BINARY="http://ftp.us.debian.org/debian/"
-
-# $LH_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
-# (Default: http://security.debian.org/)
-LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
-
-# $LH_CATEGORIES: select categories to use
-# (Default: main)
-LH_CATEGORIES="main"
diff --git a/config/chroot b/config/chroot
deleted file mode 100644
index 519d644..0000000
--- a/config/chroot
+++ /dev/null
@@ -1,61 +0,0 @@
-# config/chroot - options for live-helper(7), chroot stage
-
-# $LH_CHROOT_FILESYSTEM: set chroot filesystem
-# (Default: squashfs)
-LH_CHROOT_FILESYSTEM="squashfs"
-
-# $LH_UNION_FILESYSTEM: set union filesystem
-# (Default: aufs)
-LH_UNION_FILESYSTEM="aufs"
-
-# $LH_EXPOSED_ROOT: expose root as read only
-# (Default: disabled)
-LH_EXPOSED_ROOT="disabled"
-
-# $LH_HOOKS: set hook commands
-# (Default: empty)
-LH_HOOKS=""
-
-# $LH_INTERACTIVE: set interactive build
-# (Default: disabled)
-LH_INTERACTIVE="disabled"
-
-# $LH_KEYRING_PACKAGES: set keyring packages
-# (Default: empty)
-LH_KEYRING_PACKAGES="debian-archive-keyring"
-
-# $LH_LANGUAGE: set language to use
-# (Default: empty)
-LH_LANGUAGE="en"
-
-# $LH_LINUX_FLAVOURS: set kernel flavour to use
-# (Default: autodetected)
-LH_LINUX_FLAVOURS="686"
-
-# $LH_LINUX_PACKAGES: set kernel packages to use
-# (Default: autodetected)
-LH_LINUX_PACKAGES="linux-image-2.6 aufs-modules-2.6"
-
-# $LH_PACKAGES: set packages to install
-# (Default: empty)
-LH_PACKAGES=""
-
-# $LH_PACKAGES_LISTS: set package list to install
-# (Default: minimal eeepc)
-LH_PACKAGES_LISTS="minimal eeepc"
-
-# $LH_TASKS: set tasks to install
-# (Default: empty)
-LH_TASKS=""
-
-# $LH_SECURITY: enable security updates
-# (Default: enabled)
-LH_SECURITY="enabled"
-
-# $LH_SYMLINKS: enable symlink convertion
-# (Default: disabled)
-LH_SYMLINKS="disabled"
-
-# $LH_SYSVINIT: enable sysvinit
-# (Default: disabled)
-LH_SYSVINIT="disabled"
diff --git a/config/common b/config/common
deleted file mode 100644
index 88797ee..0000000
--- a/config/common
+++ /dev/null
@@ -1,127 +0,0 @@
-# config/common - common options for live-helper(7)
-
-# $LH_APT: set package manager
-# (Default: apt)
-LH_APT="apt"
-
-# $LH_APT_FTP_PROXY: set apt/aptitude ftp proxy
-# (Default: autodetected or empty)
-LH_APT_FTP_PROXY=""
-
-# $LH_APT_HTTP_PROXY: set apt/aptitude http proxy
-# (Default: autodetected or empty)
-LH_APT_HTTP_PROXY=""
-
-# $LH_APT_PDIFFS: set apt/aptitude pdiff indices
-# (Default: disabled)
-LH_APT_PDIFFS="disabled"
-
-# $LH_APT_PIPELINE: set apt/aptitude pipeline depth
-# (Default: )
-LH_APT_PIPELINE=""
-
-# $LH_APT_RECOMMENDS: set apt/aptitude recommends
-# (Default: disabled)
-LH_APT_RECOMMENDS="disabled"
-
-# $LH_APT_SECURE: set apt/aptitude security
-# (Default: enabled)
-LH_APT_SECURE="enabled"
-
-# $LH_BOOTSTRAP: set bootstrap program
-# (Default: debootstrap)
-LH_BOOTSTRAP="debootstrap"
-
-# $LH_CACHE: control cache
-# (Default: enabled)
-LH_CACHE="enabled"
-
-# $LH_CACHE_INDICES: control if downloaded package indices should be cached
-# (Default: disabled)
-LH_CACHE_INDICES="disabled"
-
-# $LH_CACHE_PACKAGES: control if downloaded packages files should be cached
-# (Default: enabled)
-LH_CACHE_PACKAGES="enabled"
-
-# $LH_CACHE_STAGES: control if completed stages should be cached
-# (Default: bootstrap)
-LH_CACHE_STAGES="bootstrap"
-
-# $LH_DEBCONF_FRONTEND: set debconf(1) frontend to use
-# (Default: noninteractive)
-LH_DEBCONF_FRONTEND="noninteractive"
-
-# $LH_DEBCONF_NOWARNINGS: set debconf(1) warnings
-# (Default: yes)
-LH_DEBCONF_NOWARNINGS="yes"
-
-# $LH_DEBCONF_PRIORITY: set debconf(1) priority to use
-# (Default: critical)
-LH_DEBCONF_PRIORITY="critical"
-
-# $LH_INITRAMFS: set initramfs hook
-# (Default: live-initramfs)
-LH_INITRAMFS="live-initramfs"
-
-# $LH_FDISK: set fdisk program
-# (Default: autodetected)
-LH_FDISK="fdisk"
-
-# $LH_LOSETUP: set losetup program
-# (Default: autodetected)
-LH_LOSETUP="losetup.orig"
-
-# $LH_MODE: set distribution mode
-# (Default: debian)
-LH_MODE="debian"
-
-# $LH_ROOT_COMMAND: use sudo or equivalent
-# (Default: empty)
-#LH_ROOT_COMMAND="sudo"
-
-# $LH_USE_FAKEROOT: use fakeroot/fakechroot
-# (Default: disabled)
-LH_USE_FAKEROOT="disabled"
-
-# $LH_TASKSEL: set tasksel program
-# (Default: tasksel)
-LH_TASKSEL="tasksel"
-
-# $LH_INCLUDES: set includes
-# (Default: /usr/share/live-helper/includes)
-LH_INCLUDES="/usr/share/live-helper/includes"
-
-# $LH_TEMPLATES: set templates
-# (Default: /usr/share/live-helper/templates)
-LH_TEMPLATES="/usr/share/live-helper/templates"
-
-# Live-helper options
-
-# $_BREAKPOINTS: enable breakpoints
-# (Default: disabled)
-#_BREAKPOINTS="disabled"
-
-# $_DEBUG: enable debug
-# (Default: disabled)
-#_DEBUG="disabled"
-
-# $_COLOR: enable color
-# (Default: false)
-#_COLOR="false"
-
-# $_FORCE: enable force
-# (Default: disabled)
-#_FORCE="disabled"
-
-# $_QUIET: enable quiet
-# (Default: disabled)
-_QUIET="disabled"
-
-# $_VERBOSE: enable verbose
-# (Default: disabled)
-#_VERBOSE="disabled"
-
-# Internal stuff (FIXME)
-APT_OPTIONS="--yes"
-APTITUDE_OPTIONS="--assume-yes"
diff --git a/config/source b/config/source
deleted file mode 100644
index 6747186..0000000
--- a/config/source
+++ /dev/null
@@ -1,9 +0,0 @@
-# config/source - options for live-helper(7), source stage
-
-# $LH_SOURCE: set source option
-# (Default: enabled)
-LH_SOURCE="enabled"
-
-# $LH_SOURCE_IMAGES: set image type
-# (Default: tar)
-LH_SOURCE_IMAGES="tar"
diff --git a/scripts/build b/scripts/build
new file mode 100755
index 0000000..558cf91
--- /dev/null
+++ b/scripts/build
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+lh_build noautoconfig ${@} 2>&1 | tee binary.log
diff --git a/scripts/clean b/scripts/clean
new file mode 100755
index 0000000..90634ac
--- /dev/null
+++ b/scripts/clean
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+rm -f build.log
+
+# Remove generated files
+rm -f config/binary config/bootstrap config/chroot config/common config/source
+
+# Remove empty directories in config tree
+if ls config/*/ > /dev/null 2>&1
+then
+ rmdir --ignore-fail-on-non-empty config/*/
+fi
+
+if [ -d config ]
+then
+ rmdir --ignore-fail-on-non-empty config
+fi
diff --git a/scripts/config b/scripts/config
new file mode 100755
index 0000000..9cc3024
--- /dev/null
+++ b/scripts/config
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+MIRROR_DEBIAN="http://debian.mirror.rafal.ca/debian/"
+MIRROR_SECURITY="http://debian.mirror.rafal.ca/debian-security/"
+
+lh_config noautoconfig \
+ --apt-recommends disabled \
+ --bootappend-live "noautologin" \
+ -k 686 \
+ -b usb-hdd \
+ --distribution lenny \
+ --linux-packages "linux-image-2.6 aufs-modules-2.6" \
+ --memtest none \
+ --mirror-bootstrap ${MIRROR_DEBIAN} \
+ --mirror-chroot ${MIRROR_DEBIAN} \
+ --mirror-chroot-security ${MIRROR_SECURITY} \
+ --binary-indices none \
+ --packages-lists "minimal eeepc" \
+ ${@}
--
A live-helper based Debian live & installer image for the Eee PC.
More information about the Debian-eeepc-commits
mailing list