Adding live-package 0.99.19-1.
This commit is contained in:
Daniel Baumann
parent
b995c6b293
commit
9a5955a79f
10
ChangeLog
10
ChangeLog
|
|
@ -1,3 +1,13 @@
|
|||
2007-02-01 Daniel Baumann <daniel@debian.org>
|
||||
|
||||
* Added "--tasks".
|
||||
* Added desktop base to all desktop package lists.
|
||||
|
||||
2007-01-31 Daniel Baumann <daniel@debian.org>
|
||||
|
||||
* Changed vars in autobuilding script to be able to source
|
||||
make-live.conf.
|
||||
|
||||
2007-01-30 Daniel Baumann <daniel@debian.org>
|
||||
|
||||
* Added cron job for autobuilding images.
|
||||
|
|
|
|||
|
|
@ -1,3 +1,9 @@
|
|||
live-package (0.99.19-1) unstable; urgency=low
|
||||
|
||||
* New upstream release.
|
||||
|
||||
-- Daniel Baumann <daniel@debian.org> Wed, 31 Jan 2007 12:38:00 +0100
|
||||
|
||||
live-package (0.99.18-1) unstable; urgency=low
|
||||
|
||||
* New upstream release.
|
||||
|
|
|
|||
|
|
@ -22,40 +22,42 @@ then
|
|||
fi
|
||||
|
||||
# Check for build directory
|
||||
if [ ! -d "${DIRECTORY}" ]
|
||||
if [ ! -d "${AUTOBUILD_DIRECTORY}" ]
|
||||
then
|
||||
mkdir -p "${DIRECTORY}"
|
||||
mkdir -p "${AUTOBUILD_DIRECTORY}"
|
||||
else
|
||||
# FIXME: maybe we should just remove the left overs.
|
||||
echo "E: ${DIRECTORY} needs cleanup."
|
||||
echo "E: ${AUTOBUILD_DIRECTORY} needs cleanup."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Process image autobuilding
|
||||
cd "${DIRECTORY}"
|
||||
cd "${AUTOBUILD_DIRECTORY}"
|
||||
|
||||
for DISTRIBUTION in ${DISTRIBUTIONS}
|
||||
for DISTRIBUTION in ${AUTOBUILD_DISTRIBUTIONS}
|
||||
do
|
||||
for FLAVOUR in ${FLAVOURS}
|
||||
for FLAVOUR in ${AUTOBUILD_FLAVOURS}
|
||||
do
|
||||
if [ ! -f "${SERVER}"/daily-release/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}_${DATE}.txt ]
|
||||
if [ ! -f "${AUTOBUILD_SERVER}"/daily-release/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_FLAVOUR}_${AUTOBUILD_DATE}.txt ]
|
||||
then
|
||||
# Generating images
|
||||
mkdir debian-live
|
||||
make-live -d ${DISTRIBUTION} -p ${FLAVOUR} -m ${MIRROR} ${OPTIONS} > debian-live/log.txt 2>&1
|
||||
make-live -d ${AUTOBUILD_DISTRIBUTION} -p ${AUTOBUILD_FLAVOUR} -m ${LIVE_MIRROR} ${AUTOBUILD_OPTIONS} > debian-live/log.txt 2>&1
|
||||
fi
|
||||
|
||||
if [ -f debian-live/binary.iso ] && [ -f debian-live/source.iso ]
|
||||
then
|
||||
# Moving logs
|
||||
mkdir -p "${AUTOBUILD_SERVER}"/daily-release/${AUTOBUILD_DATE}/log
|
||||
mv debian-live/log.txt "${AUTOBUILD_SERVER}"/daily-release/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_FLAVOUR}_${AUTOBUILD_DATE}-log.txt
|
||||
mv debian-live/packages.txt "${AUTOBUILD_SERVER}"/daily-release/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_FLAVOUR}_${AUTOBUILD_DATE}-packages.txt
|
||||
|
||||
# Moving images
|
||||
mkdir -p "${SERVER}"/daily-release/${DATE}/log
|
||||
mv debian-live/log.txt "${SERVER}"/daily-release/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}_${DATE}.txt
|
||||
mkdir -p "${AUTOBUILD_SERVER}"/daily-release/${AUTOBUILD_DATE}/${AUTOBUILD_ARCHITECTURE}
|
||||
mv debian-live/binary.iso "${AUTOBUILD_SERVER}"/daily-release/${AUTOBUILD_DATE}/${AUTOBUILD_ARCHITECTURE}/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_FLAVOUR}.iso
|
||||
|
||||
mkdir -p "${SERVER}"/daily-release/${DATE}/${ARCHITECTURE}
|
||||
mv debian-live/binary.iso "${SERVER}"/daily-release/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso
|
||||
|
||||
mkdir -p "${SERVER}"/daily-release/${DATE}/source
|
||||
mv debian-live/source.iso "${SERVER}"/daily-release/${DATE}/source/debian-live-${DISTRIBUTION}-source-${FLAVOUR}.iso
|
||||
mkdir -p "${AUTOBUILD_SERVER}"/daily-release/${AUTOBUILD_DATE}/source
|
||||
mv debian-live/source.iso "${AUTOBUILD_SERVER}"/daily-release/${AUTOBUILD_DATE}/source/debian-live-${AUTOBUILD_DISTRIBUTION}-source-${AUTOBUILD_FLAVOUR}.iso
|
||||
fi
|
||||
|
||||
rm -rf debian-live
|
||||
|
|
@ -63,5 +65,5 @@ do
|
|||
done
|
||||
|
||||
# Cleanup
|
||||
umount -f "${DIRECTORY}"/debian-live/chroot/proc > /dev/null 2>&1
|
||||
rm -rf "${DIRECTORY}"
|
||||
umount -f "${AUTOBUILD_DIRECTORY}"/debian-live/chroot/proc > /dev/null 2>&1
|
||||
rm -rf "${AUTOBUILD_DIRECTORY}"
|
||||
|
|
|
|||
|
|
@ -2,12 +2,16 @@
|
|||
|
||||
AUTOBUILD="false"
|
||||
|
||||
DISTRIBUTIONS="etch sid"
|
||||
FLAVOURS="minimal standard kde gnome xfce"
|
||||
MIRROR="http://ftp.debian.org/debian/"
|
||||
OPTIONS="--with-source"
|
||||
AUTOBUILD_DISTRIBUTIONS="etch sid"
|
||||
AUTOBUILD_FLAVOURS="minimal standard kde-desktop gnome-desktop xfce-desktop"
|
||||
AUTOBUILD_OPTIONS="--tasks laptop --with-source"
|
||||
|
||||
DIRECTORY="/srv/tmp/make-live"
|
||||
SERVER="/srv/debian-live"
|
||||
ARCHITECTURE="`dpkg --print-architecture`"
|
||||
DATE="`date +%Y%m%d`"
|
||||
AUTOBUILD_DIRECTORY="/srv/tmp/make-live"
|
||||
AUTOBUILD_SERVER="/srv/debian-live"
|
||||
AUTOBUILD_ARCHITECTURE="`dpkg --print-architecture`"
|
||||
AUTOBUILD_DATE="`date +%Y%m%d`"
|
||||
|
||||
LIVE_MIRROR="http://ftp.debian.org/debian/"
|
||||
|
||||
# Source /etc/make-live.conf
|
||||
# . /etc/make-live.conf
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ console-common locales
|
|||
# GNOME
|
||||
gdm gdm-themes gnome-desktop-environment gnome-cups-manager gnome-screensaver
|
||||
gnome-themes-extras
|
||||
desktop-base
|
||||
|
||||
rhythmbox synaptic
|
||||
|
||||
|
|
|
|||
|
|
@ -8,5 +8,6 @@ console-common locales
|
|||
|
||||
# GNOME Core
|
||||
gdm gnome-core
|
||||
desktop-base
|
||||
|
||||
x-window-system-core
|
||||
|
|
|
|||
|
|
@ -8,5 +8,6 @@ console-common locales
|
|||
|
||||
# GNOME Full
|
||||
gdm gnome
|
||||
desktop-base
|
||||
|
||||
x-window-system-core
|
||||
|
|
|
|||
|
|
@ -8,5 +8,6 @@ console-common locales
|
|||
|
||||
# KDE
|
||||
kde kdm
|
||||
desktop-base
|
||||
|
||||
x-window-system-core
|
||||
|
|
|
|||
|
|
@ -8,5 +8,6 @@ console-common locales
|
|||
|
||||
# KDE Core
|
||||
kde-core kdm
|
||||
desktop-base
|
||||
|
||||
x-window-system-core
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ manpages-pl-dev manpages-pt manpages-pt-dev manpages-ru manpages-tr manpages-zh
|
|||
|
||||
# KDE Core
|
||||
kde-core kdm
|
||||
desktop-base
|
||||
|
||||
x-window-system-core
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ console-common locales
|
|||
|
||||
# KDE
|
||||
kde kdm
|
||||
desktop-base
|
||||
|
||||
x-window-system-core
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ manpages-pl-dev manpages-pt manpages-pt-dev manpages-ru manpages-tr manpages-zh
|
|||
|
||||
# KDE
|
||||
kde kdm
|
||||
desktop-base
|
||||
|
||||
x-window-system-core
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ console-common locales
|
|||
|
||||
# KDE
|
||||
kde kdm
|
||||
desktop-base
|
||||
|
||||
x-window-system-core
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ manpages-pl-dev manpages-pt manpages-pt-dev manpages-ru manpages-tr manpages-zh
|
|||
|
||||
# KDE
|
||||
kde kdm
|
||||
desktop-base
|
||||
|
||||
x-window-system-core
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ manpages-pl-dev manpages-pt manpages-pt-dev manpages-ru manpages-tr manpages-zh
|
|||
|
||||
# KDE
|
||||
kde kdm
|
||||
desktop-base
|
||||
|
||||
x-window-system-core
|
||||
|
||||
|
|
|
|||
|
|
@ -8,5 +8,6 @@ console-common locales
|
|||
|
||||
# Xfce
|
||||
gdm xfce4
|
||||
desktop-base
|
||||
|
||||
x-window-system-core
|
||||
|
|
|
|||
21
src/main.sh
21
src/main.sh
|
|
@ -28,7 +28,7 @@ set -e
|
|||
BASE=${LIVE_BASE:-"/usr/share/make-live"}
|
||||
CONFIG="/etc/make-live.conf"
|
||||
PROGRAM="`basename ${0}`"
|
||||
VERSION="0.99.18"
|
||||
VERSION="0.99.19"
|
||||
|
||||
CODENAME_OLDSTABLE="woody"
|
||||
CODENAME_STABLE="sarge"
|
||||
|
|
@ -41,7 +41,7 @@ do
|
|||
. "${SCRIPT}"
|
||||
done
|
||||
|
||||
USAGE="Usage: ${PROGRAM} [-a|--architecture ARCHITECTURE] [-b|--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [--clone DIRECTORY] [--config FILE] [-c|--chroot DIRECTORY] [-d|--distribution DISTRIBUTION] [--with-generic-indices] [--without-generic-indices] [--with-recommends] [--without-recommends] [--filesystem FILESYSTEM] [-f|--flavour BOOTSTRAP_FLAVOUR] [--hook COMMAND|\"COMMANDS\"] [--include-chroot FILE|DIRECTORY] [--include-image FILE|DIRECTORY] [-k|--kernel KERNEL_FLAVOUR] [--manifest PACKAGE] [-m|--mirror URL] [-k|--keyring] [--mirror-security URL] [--packages PACKAGE|\"PACKAGES\"] [-p|--package-list LIST|FILE] [--preseed FILE] [--proxy-ftp URL] [--proxy-http URL] [--repositories NAME] [-r|--root DIRECTORY] [-s|--section SECTION|\"SECTIONS\"] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--templates DIRECTORY] [-t|--type TYPE]"
|
||||
USAGE="Usage: ${PROGRAM} [-a|--architecture ARCHITECTURE] [-b|--bootappend KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [--clone DIRECTORY] [--config FILE] [-c|--chroot DIRECTORY] [-d|--distribution DISTRIBUTION] [--with-generic-indices] [--without-generic-indices] [--with-recommends] [--without-recommends] [--filesystem FILESYSTEM] [-f|--flavour BOOTSTRAP_FLAVOUR] [--hook COMMAND|\"COMMANDS\"] [--include-chroot FILE|DIRECTORY] [--include-image FILE|DIRECTORY] [-k|--kernel KERNEL_FLAVOUR] [--manifest PACKAGE] [-m|--mirror URL] [-k|--keyring] [--mirror-security URL] [--packages PACKAGE|\"PACKAGES\"] [-p|--package-list LIST|FILE] [--preseed FILE] [--proxy-ftp URL] [--proxy-http URL] [--repositories NAME] [-r|--root DIRECTORY] [-s|--section SECTION|\"SECTIONS\"] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--templates DIRECTORY] [-t|--type TYPE] [--tasks TASK]"
|
||||
|
||||
Help ()
|
||||
{
|
||||
|
|
@ -92,6 +92,7 @@ Help ()
|
|||
echo " --server-path: specifies the netboot server path for chroot."
|
||||
echo " --templates: specifies location of the templates."
|
||||
echo " -t, --type: specifies live system type."
|
||||
echo " --tasks: specifies one or more aptitude tasks."
|
||||
echo " --with-generic-indices: enables generic debian package indices (default)."
|
||||
echo " --without-generic-indices: disables generic debian package indices."
|
||||
echo " --with-recommends: installes recommended packages too."
|
||||
|
|
@ -165,7 +166,7 @@ Configuration ()
|
|||
|
||||
Main ()
|
||||
{
|
||||
ARGUMENTS="`getopt --longoptions root:,type:,architecture:,bootappend:,clone:,config:,chroot:,distribution:,filesystem:,flavour:,bootstrap-config:,hook:,include-chroot:,include-image:,kernel:,manifest:,mirror:,keyring:,mirror-security:,output:,packages:,package-list:,proxy-ftp:,preseed:,proxy-http:,repositories:,section:,server-address:,server-path:,templates:,with-generic-indices,without-generic-indices,with-recommends,without-recommends,with-source,without-source,help,usage,version --name=${PROGRAM} --options r:t:a:b:c:d:f:k:m:o:p:s:huv --shell sh -- "${@}"`"
|
||||
ARGUMENTS="`getopt --longoptions root:,tasks:,type:,architecture:,bootappend:,clone:,config:,chroot:,distribution:,filesystem:,flavour:,bootstrap-config:,hook:,include-chroot:,include-image:,kernel:,manifest:,mirror:,keyring:,mirror-security:,output:,packages:,package-list:,proxy-ftp:,preseed:,proxy-http:,repositories:,section:,server-address:,server-path:,templates:,with-generic-indices,without-generic-indices,with-recommends,without-recommends,with-source,without-source,help,usage,version --name=${PROGRAM} --options r:t:a:b:c:d:f:k:m:o:p:s:huv --shell sh -- "${@}"`"
|
||||
|
||||
if [ "${?}" != "0" ]
|
||||
then
|
||||
|
|
@ -186,6 +187,10 @@ Main ()
|
|||
LIVE_TYPE="${2}"; shift 2
|
||||
;;
|
||||
|
||||
--tasks)
|
||||
LIVE_TASKS="${2}"; shift 2
|
||||
;;
|
||||
|
||||
-a|--architecture)
|
||||
LIVE_ARCHITECTURE="${2}"; shift 2
|
||||
;;
|
||||
|
|
@ -348,16 +353,6 @@ Main ()
|
|||
Configuration
|
||||
Defaults
|
||||
|
||||
# Distribution
|
||||
if [ "${1}" = "dist" ]
|
||||
then
|
||||
for FLAVOUR in minimal standard gnome kde xfce
|
||||
do
|
||||
( make-live -d testing -o "debian-live-${CODENAME_TESTING}-`dpkg --print-architecture`-${FLAVOUR}-" -p ${FLAVOUR} --with-source && cd "${LIVE_ROOT}" && cd .. && mv "${LIVE_ROOT}"/*.iso ./ && rm -rf "${LIVE_ROOT}" ) || rm -rf "${LIVE_ROOT}"
|
||||
( make-live -d unstable -o "debian-live-${CODENAME_UNSTABLE}-`dpkg --print-architecture`-${FLAVOUR}-" -p ${FLAVOUR} --with-source && cd "${LIVE_ROOT}" && cd .. && mv "${LIVE_ROOT}"/*.iso ./ && rm -rf "${LIVE_ROOT}" ) || rm -rf "${LIVE_ROOT}"
|
||||
done
|
||||
fi
|
||||
|
||||
# Building live system
|
||||
Bootstrap
|
||||
Chroot
|
||||
|
|
|
|||
|
|
@ -86,13 +86,7 @@ Defaults ()
|
|||
;;
|
||||
|
||||
amd64)
|
||||
if [ "${LIVE_DISTRIBUTION}" = "unstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_UNSTABLE}" ] || \
|
||||
[ "${LIVE_DISTRIBUTION}" = "testing" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_TESTING}" ]
|
||||
then
|
||||
LIVE_KERNEL="amd64"
|
||||
else
|
||||
LIVE_KERNEL="amd64-generic"
|
||||
fi
|
||||
LIVE_KERNEL="amd64"
|
||||
;;
|
||||
|
||||
arm)
|
||||
|
|
@ -166,6 +160,21 @@ Defaults ()
|
|||
LIVE_MIRROR_SECURITY="http://security.debian.org/"
|
||||
fi
|
||||
|
||||
# Set default aptitude tasks
|
||||
if [ "${LIVE_PACKAGE_LIST}" = "gnome-desktop" ]
|
||||
then
|
||||
LIVE_PACKAGE_LIST="gnome"
|
||||
LIVE_TASKS="${LIVE_TASKS} gnome-desktop"
|
||||
elif [ "${LIVE_PACKAGE_LIST}" = "kde-desktop" ]
|
||||
then
|
||||
LIVE_PACKAGE_LIST="kde"
|
||||
LIVE_TASKS="${LIVE_TASKS} kde-desktop"
|
||||
elif [ "${LIVE_PACKAGE_LIST}" = "xfce-desktop" ]
|
||||
then
|
||||
LIVE_PACKAGE_LIST="xfce"
|
||||
LIVE_TASKS="${LIVE_TASKS} xfce-desktop"
|
||||
fi
|
||||
|
||||
# Check for package lists
|
||||
if [ -z "${LIVE_PACKAGE_LIST}" ]
|
||||
then
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ EOF
|
|||
fi
|
||||
|
||||
# Restore cloned package selection
|
||||
if [ -f "${LIVE_PACAKGE_LIST_CLONED}" ]
|
||||
if [ -f "${LIVE_PACKAGE_LIST_CLONED}" ]
|
||||
then
|
||||
Chroot_exec "xargs --arg-file=/root/`basename ${LIVE_PACKAGE_LIST_CLONED}` aptitude install --assume-yes"
|
||||
fi
|
||||
|
|
@ -140,6 +140,15 @@ EOF
|
|||
Chroot_exec "aptitude install --assume-yes ${LIVE_PACKAGES}"
|
||||
fi
|
||||
|
||||
# Install aptitude tasks
|
||||
if [ -n "${LIVE_TASKS}" ]
|
||||
then
|
||||
for TASK in ${LIVE_TASKS}
|
||||
do
|
||||
Chroot_exec "aptitude install --assume-yes ${TASK}"
|
||||
done
|
||||
fi
|
||||
|
||||
# Copy external directory into the chroot
|
||||
if [ -d "${LIVE_INCLUDE_CHROOT}" ]
|
||||
then
|
||||
|
|
@ -166,8 +175,8 @@ EOF
|
|||
LIVE_DEBCONF_FRONTEND="readline" LIVE_DEBCONF_PRIORITY="low" Chroot_exec "${LIVE_HOOK}"
|
||||
fi
|
||||
|
||||
# Temporary hacks for broken packages
|
||||
Hack_xorg
|
||||
# Save package list
|
||||
Chroot_exec "dpkg --get-selections" > "${LIVE_ROOT}"/packages.txt
|
||||
|
||||
# Add filesystem.manifest
|
||||
Chroot_exec "dpkg-query -W \*" | awk '$2 ~ /./ {print $1 " " $2 }' > "${LIVE_ROOT}"/filesystem.manifest
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
# make-live - utility to build Debian Live systems
|
||||
#
|
||||
# Copyright (C) 2006 Daniel Baumann <daniel@debian.org>
|
||||
# Copyright (C) 2006 Marco Amadori <marco.amadori@gmail.com>
|
||||
#
|
||||
# make-live comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
|
||||
# This is free software, and you are welcome to redistribute it
|
||||
# under certain conditions; see COPYING for details.
|
||||
|
||||
Hack_xorg ()
|
||||
{
|
||||
# xserver-xorg << 7.1
|
||||
if [ -f "${LIVE_CHROOT}/etc/X11/xorg.conf" ]
|
||||
then
|
||||
if [ "${LIVE_DISTRIBUTION}" = "testing" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_TESTING}" ]
|
||||
then
|
||||
# Comment "BusID" line and set driver to "vesa"
|
||||
sed -i -e 's/\(^.*BusID.*\)/#\1/g' -e '/Section "Device"/,/EndSection/ s/\(.*Driver.*"\).*\(".*\)/\1vesa\2/g' "${LIVE_CHROOT}"/etc/X11/xorg.conf
|
||||
fi
|
||||
fi
|
||||
}
|
||||
Loading…
Reference in New Issue