Fix old Debian scripts and all Ubuntu scripts cope with Anthony's change

in 1.0.8 to make --second-stage not bother recalculating required and
base.

r57240

1 files changed, 7 insertions, 5 deletions

diff --git a/scripts/ubuntu/edgy b/scripts/ubuntu/edgy
index 0e8cd5d..5b18575 100644
--- a/scripts/ubuntu/edgy
+++ b/scripts/ubuntu/edgy
@@ -15,10 +15,12 @@ if doing_variant fakechroot; then
     test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
 fi
 
-work_out_debs () {
-    LIBC6=libc6
-    if [ "$ARCH" = "alpha" ] || [ "$ARCH" = "ia64" ]; then LIBC6="libc6.1"; fi
+LIBC=libc6
+if [ "$ARCH" = "alpha" ] || [ "$ARCH" = "ia64" ]; then
+  LIBC="libc6.1"
+fi
 
+work_out_debs () {
     required="$(get_debs Priority: required)"
 
     if doing_variant -; then 
@@ -31,7 +33,7 @@ work_out_debs () {
 
       add () { if [ "$ARCH" = "$1" ]; then eval "$2=\"\$$2 $3\""; fi; }
 
-      base="apt binutils cpio cpp cpp-4.1 dpkg-dev g++ g++-4.1 gcc gcc-4.1 ${LIBC6}-dev libdb4.4 libgdbm3 libstdc++6 libstdc++6-4.1-dev linux-libc-dev make patch perl perl-modules"
+      base="apt binutils cpio cpp cpp-4.1 dpkg-dev g++ g++-4.1 gcc gcc-4.1 ${LIBC}-dev libdb4.4 libgdbm3 libstdc++6 libstdc++6-4.1-dev linux-libc-dev make patch perl perl-modules"
 
       add ia64 base "libunwind7-dev"
       add sparc base "lib64gcc1"
@@ -124,7 +126,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