--- Begin Message ---
Package: live-build
Version: 3.0~a16-1
Severity: wishlist
Tags: patch
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch oneiric
apt-get has had the ability to install tasks itself for a few years now.
We use this in Ubuntu since it means we only need aptitude or tasksel if
we need more interactivity; for simply installing packages that contain
a given entry in their Task field, apt-get is more lightweight. The
attached patch adds support for this to live-build, and makes it the
default for Ubuntu.
Thanks,
--
Colin Watson [cjwatson@ubuntu.com]
>From 04a63bfd70861dc6399a93a6b2f5c9c72729561c Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Mon, 16 May 2011 15:03:56 +0100
Subject: [PATCH] Allow installing tasks using apt-get, and do so by default for Ubuntu.
---
functions/defaults.sh | 10 +++++++++-
manpages/en/lb_config.1 | 4 ++--
scripts/build/lb_chroot_tasks | 13 +++++++++++++
scripts/build/lb_config | 2 +-
4 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 4c0518a..cbdf1af 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -214,7 +214,15 @@ Set_defaults ()
fi
# Setting tasksel
- LB_TASKSEL="${LB_TASKSEL:-tasksel}"
+ case "${LB_MODE}" in
+ ubuntu)
+ LB_TASKSEL="${LB_TASKSEL:-apt}"
+ ;;
+
+ *)
+ LB_TASKSEL="${LB_TASKSEL:-tasksel}"
+ ;;
+ esac
# Setting root directory
case "${LB_MODE}" in
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index 8e82782..07d7ab6 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -223,7 +223,7 @@
.br
[\fB\-\-syslinux\-menu\fR true|false]
.br
- [\fB\-\-tasksel\fR aptitude|tasksel]
+ [\fB\-\-tasksel\fR apt|aptitude|tasksel]
.br
[\fB\-\-tasks\fR \fITASK\fR|"\fITASKS\fR"]
.br
@@ -476,7 +476,7 @@ defines the file of the syslinux splash graphic that should be used instead of t
defines the timeout the syslinux bootloader should wait for input from the user at the bootprompt prior booting the default kernel. This defaults to 0 which means it will wait forever.
.IP "\fB\-\-syslinux\-menu\fR true|false" 4
defines if syslinux should be make use of the vgamenu capabilities or not.
-.IP "\fB\-\-tasksel\fR aptitude|tasksel" 4
+.IP "\fB\-\-tasksel\fR apt|aptitude|tasksel" 4
selects which program is used to install tasks. By default, this is set to tasksel.
.IP "\fB\-\-tasks\fR \fITASK\fR|""\fITASKS\fR""" 4
defines one or more package tasks to be installed in the live system. This is a quick and convenient way to get a reasonable default selection of packages suitable for most users when building an image, but it results in quite big images. If you want to have finer grained package selections, local package lists should be used instead.
diff --git a/scripts/build/lb_chroot_tasks b/scripts/build/lb_chroot_tasks
index 72db9f6..477d755 100755
--- a/scripts/build/lb_chroot_tasks
+++ b/scripts/build/lb_chroot_tasks
@@ -45,6 +45,10 @@ then
# Checking depends
case "${LB_TASKSEL}" in
+ apt)
+ Check_package chroot/usr/bin/apt-get apt
+ ;;
+
aptitude)
Check_package chroot/usr/bin/aptitude aptitude
;;
@@ -59,6 +63,15 @@ then
# Installing tasks
case "${LB_TASKSEL}" in
+ apt)
+ APT_TASKS=
+ for TASK in ${LB_TASKS}
+ do
+ APT_TASKS="${APT_TASKS:+$APT_TASKS }$TASK^"
+ done
+ Chroot chroot "apt-get ${APT_OPTIONS} install ${APT_TASKS}"
+ ;;
+
aptitude)
Chroot chroot "aptitude ${APTITUDE_OPTIONS} install ${LB_TASKS}"
;;
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index c3ae0eb..0e36240 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -135,7 +135,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--source true|false]\n\
\t [-s|--source-images iso|net|tar|usb-hdd]\n\
\t [--syslinux-theme THEME_SUFFIX]\n\
-\t [--tasksel aptitude|tasksel]\n\
+\t [--tasksel apt|aptitude|tasksel]\n\
\t [--tasks TASK|\"TASKS\"]\n\
\t [--templates PATH]\n\
\t [--virtual-root-size MB]\n\
--
1.7.4.1
--- End Message ---
--- Begin Message ---
Source: live-build
Source-Version: 3.0~a17-1
We believe that the bug you reported is fixed in the latest version of
live-build, which is due to be installed in the Debian FTP archive:
live-build-cgi_3.0~a17-1_all.deb
to main/l/live-build/live-build-cgi_3.0~a17-1_all.deb
live-build_3.0~a17-1.debian.tar.gz
to main/l/live-build/live-build_3.0~a17-1.debian.tar.gz
live-build_3.0~a17-1.dsc
to main/l/live-build/live-build_3.0~a17-1.dsc
live-build_3.0~a17-1_all.deb
to main/l/live-build/live-build_3.0~a17-1_all.deb
live-build_3.0~a17.orig.tar.gz
to main/l/live-build/live-build_3.0~a17.orig.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 626940@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Daniel Baumann <daniel@debian.org> (supplier of updated live-build package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Wed, 18 May 2011 19:49:53 +0200
Source: live-build
Binary: live-build live-build-cgi
Architecture: source all
Version: 3.0~a17-1
Distribution: unstable
Urgency: low
Maintainer: Debian Live Project <debian-live@lists.debian.org>
Changed-By: Daniel Baumann <daniel@debian.org>
Description:
live-build - Debian Live - System Build Scripts
live-build-cgi - Debian Live - System Build Scripts (cgi frontend)
Closes: 623356 626367 626905 626940
Changes:
live-build (3.0~a17-1) unstable; urgency=low
.
[ Daniel Baumann ]
* Updating squeeze point release number.
* Updating ubuntu releases.
* Enabling xz compression by default for artax-backports.
* Updating url for debian-installer daily-images.
.
[ Ben Armstrong ]
* Using gdm3 for wheezy instead of gdm.
.
[ Daniel Baumann ]
* Don't add security repository for wheezy.
* Avoid wrong security mirrors when building for artax-backports.
* Correct derivative main sources.list entries.
* Correcting wrongly attributed -m switch to --mirror-bootstrap,
thanks to Colin Watson <cjwatson@ubuntu.com> (Closes: #626905).
* Correcting comments about which ubuntu release is LTS and which not
in releases list.
* Removing defaults for the alpha architecture, not supported by
debian anymore.
.
[ Colin Watson ]
* Allow installing tasks using apt-get, and do so by default for
Ubuntu (Closes: #626940).
.
[ Daniel Baumann ]
* Switching to apt as tasksel for all distributions, except Debian
squeeze.
* Updating to standards version 3.9.2.
* Completing files section in live-build manpage (Closes: #626367).
* Correcting top-level makefile to automatically get all the supported
languages, rather than defining a static list.
.
[ liandro sg ]
* Be more careful with subshells (Closes: #623356).
Checksums-Sha1:
ee45f7b79603206e5744df3a7bf6c3bd71646b17 1282 live-build_3.0~a17-1.dsc
0392c689a61cbf932bd67faf0213512d25df975a 1944214 live-build_3.0~a17.orig.tar.gz
87f662cdf151e7fc01d98a5a2bc218def45d4d52 40605 live-build_3.0~a17-1.debian.tar.gz
44a656f090907b2c11f2434a2b9ea88ea9b9f30d 1176488 live-build_3.0~a17-1_all.deb
c3047616a07d218e52328612165867e8789b8454 56786 live-build-cgi_3.0~a17-1_all.deb
Checksums-Sha256:
e196e0e5bc3783824be0539ad505a5fa08daa73524d48ceb80b2dac3880e64a0 1282 live-build_3.0~a17-1.dsc
e64b6aa9b9d9f7f543f5323df764adcb4e15df3a73988153bb5d43315510d77c 1944214 live-build_3.0~a17.orig.tar.gz
5fb5062ca620b0d177b56885d7c51ac6ef28f75a95b33b0fc7ece51b2a1ffcfc 40605 live-build_3.0~a17-1.debian.tar.gz
f4e83a0ec933abf081748bc6517eb16fb7184f947463d78328ab48e9f8712cc0 1176488 live-build_3.0~a17-1_all.deb
0f9c47d178b30fd35264fb91f64a0ab5de7cbd526ca345502374561c7085b809 56786 live-build-cgi_3.0~a17-1_all.deb
Files:
a1942df815147dad7548df7c555da587 1282 misc optional live-build_3.0~a17-1.dsc
fb3cf9000f93b4a98d688191437bea2b 1944214 misc optional live-build_3.0~a17.orig.tar.gz
0b56c1427e8d8af7b7bbabcbebe373d8 40605 misc optional live-build_3.0~a17-1.debian.tar.gz
b3baf253f5cbab76db0d00060d7fc3bf 1176488 misc optional live-build_3.0~a17-1_all.deb
a0f5d053bcf05bd788a327d8ad3ba503 56786 misc optional live-build-cgi_3.0~a17-1_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEARECAAYFAk3UCIQACgkQ+C5cwEsrK56udQCg4pn0fryC43dJ8DmuTIp05bhJ
LtYAn1uHrYAnDIcqcyUlBAETzXpB6GoY
=rf7f
-----END PGP SIGNATURE-----
--- End Message ---