diff options
| author | Colin Watson <cjwatson@debian.org> | 2007-07-29 21:27:07 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2007-07-29 21:27:07 +0000 |
| commit | 5d11a87539d25cbb1a1a90e763b4745e51a88077 (patch) | |
| tree | cbbba80fab5d4b718785c45d32a6abd119a1fac7 | |
| parent | 95410c63e17d8bf64181a8556368a7e1997d437c (diff) | |
| download | debootstrap-5d11a87539d25cbb1a1a90e763b4745e51a88077.tar.gz | |
* scripts/debian/sid: Handle libc0.3 on hurd-i386 (thanks, Michael Banck;
closes: #314304).
r48807
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | scripts/debian/sid | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 6e684b9..e83e95f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ debootstrap (1.0.2) UNRELEASED; urgency=low + [ Joey Hess ] * Document --components in man page. * Update man page, as packages listed in --include should now be auto dep-resolved by default. + [ Colin Watson ] + * scripts/debian/sid: Handle libc0.3 on hurd-i386 (thanks, Michael Banck; + closes: #314304). + -- Joey Hess <joeyh@debian.org> Fri, 20 Jul 2007 16:57:37 -0400 debootstrap (1.0.1) unstable; urgency=low diff --git a/scripts/debian/sid b/scripts/debian/sid index 480a74d..1ffa4f1 100644 --- a/scripts/debian/sid +++ b/scripts/debian/sid @@ -16,8 +16,12 @@ if doing_variant fakechroot; then fi work_out_debs () { - LIBC6=libc6 - if [ "$ARCH" = "alpha" -o "$ARCH" = "ia64" ]; then LIBC6="libc6.1"; fi + LIBC=libc6 + if [ "$ARCH" = "alpha" -o "$ARCH" = "ia64" ]; then + LIBC="libc6.1" + elif [ "$ARCH" = "hurd-i386" ]; then + LIBC="libc0.3" + fi required="$(get_debs Priority: required)" @@ -121,7 +125,7 @@ second_stage_install () { fi p; progress $baseprog $bases INSTCORE "Installing core packages" #4 - x_core_install $LIBC6 + x_core_install $LIBC p; progress $baseprog $bases INSTCORE "Installing core packages" #5 x_core_install perl-base |