Commit 9e367bef authored by Anthony Towns's avatar Anthony Towns

* Add minbase variant for the sid script that only install apt (and

  its dependencies) instead of all of base. (Closes: Bug#351912,
  Bug#452654)
* Make --second-stage not bother recalculating required and base when
  it's not needed.

r50373
parent 9fb668b4
......@@ -9,7 +9,14 @@ debootstrap (1.0.8) UNRELEASED; urgency=low
directories in the Makefile rather than relying on dh_installdirs to do
it (LP: #172645).
-- Frans Pop <fjp@debian.org> Thu, 15 Nov 2007 10:04:33 +0100
[ Anthony Towns ]
* Add minbase variant for the sid script that only install apt (and
its dependencies) instead of all of base. (Closes: Bug#351912,
Bug#452654)
* Make --second-stage not bother recalculating required and base when
it's not needed.
-- Anthony Towns <ajt@debian.org> Fri, 07 Dec 2007 18:57:24 +1000
debootstrap (1.0.7) unstable; urgency=low
......
......@@ -141,7 +141,7 @@ if [ $# != 0 ] ; then
shift
;;
--second-stage)
WHAT_TO_DO="finddebs second_stage"
WHAT_TO_DO="second_stage"
SECOND_STAGE_ONLY=true
shift
;;
......
......@@ -61,9 +61,10 @@ dependency resolve in the sense of dpkg or apt, and that it is far better
to specify the entire base system than rely on this option. With this
option set, this behaviour is disabled.
.IP
.IP "\fB\-\-variant=buildd|fakechroot\fP"
.IP "\fB\-\-variant=minbase|buildd|fakechroot\fP"
Name of the bootstrap script variant to use. Currently, the variant
supported are buildd, which installs the build-essential packages into
supported are minbase, which only includes essential packages and apt;
buildd, which installs the build-essential packages into
.IR TARGET
and fakechroot, which installs the packages without root privileges.
The default, with no \fB\-\-variant=X\fP argument, is to create a base
......
......@@ -9,20 +9,20 @@ esac
mirror_style release
download_style apt
finddebs_style from-indices
variants - buildd fakechroot
variants - buildd fakechroot minbase
if doing_variant fakechroot; then
test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
fi
work_out_debs () {
LIBC=libc6
if [ "$ARCH" = "alpha" ] || [ "$ARCH" = "ia64" ]; then
LIBC="libc6.1"
elif [ "$ARCH" = "hurd-i386" ]; then
LIBC="libc0.3"
fi
LIBC=libc6
if [ "$ARCH" = "alpha" ] || [ "$ARCH" = "ia64" ]; then
LIBC="libc6.1"
elif [ "$ARCH" = "hurd-i386" ]; then
LIBC="libc0.3"
fi
work_out_debs () {
required="$(get_debs Priority: required)"
if doing_variant - || doing_variant fakechroot; then
......@@ -31,6 +31,8 @@ work_out_debs () {
base="$(get_debs Priority: important)"
elif doing_variant buildd; then
base="$(get_debs Build-Essential: yes)"
elif doing_variant minbase; then
base="apt"
fi
if doing_variant fakechroot; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment