diff options
| author | Otavio Salvador <otavio@debian.org> | 2009-03-16 12:04:36 +0000 |
|---|---|---|
| committer | Otavio Salvador <otavio@debian.org> | 2009-03-16 12:04:36 +0000 |
| commit | 878326114c65f92aded31856c7eb74d83bc01ad7 (patch) | |
| tree | 36ec439bbe5bde727dd4cc15139fe1b1ba2bff51 | |
| parent | ff30ed72b482b015f6ec726e2f39f204df5eb057 (diff) | |
| download | debootstrap-878326114c65f92aded31856c7eb74d83bc01ad7.tar.gz | |
Improve code to choose between libc packages. Thanks to Luca Favatella
<slackydeb@gmail.com> for the patch.
r57839
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | scripts/debian/sid | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 4cc1fcd..eae750f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +debootstrap (1.0.12) UNRELEASED; urgency=low + + * Improve code to choose between libc packages. Thanks to Luca Favatella + <slackydeb@gmail.com> for the patch. + + -- Otavio Salvador <otavio@ossystems.com.br> Mon, 16 Mar 2009 09:02:49 -0300 + debootstrap (1.0.11) unstable; urgency=low * Add (Ubuntu) jaunty as a symlink to gutsy. diff --git a/scripts/debian/sid b/scripts/debian/sid index e1ee2e6..7d68d4f 100644 --- a/scripts/debian/sid +++ b/scripts/debian/sid @@ -8,11 +8,11 @@ if doing_variant fakechroot; then fi LIBC=libc6 -if [ "$ARCH" = "alpha" ] || [ "$ARCH" = "ia64" ]; then - LIBC="libc6.1" -elif [ "$ARCH" = "hurd-i386" ]; then - LIBC="libc0.3" -fi +case $ARCH in + alpha|ia64) LIBC6="libc6.1" ;; + kfreebsd-*) LIBC6="libc0.1" ;; + hurd-*) LIBC6="libc0.3" ;; +esac work_out_debs () { required="$(get_debs Priority: required)" |