Changeset 1e69324

Timestamp:

08/05/2006 11:37:27 AM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

28f4756

Parents:

33c7b13

Message:

HLFS fixes: remove existing toolchain dirs due failed builds and fix the wrt_test_log2 test.

File:

• HLFS/master.sh (modified) (2 diffs)

HLFS/master.sh

@@ -69 +69 @@
   echo "${tab_}${tab_}${GREEN}toolchain ${L_arrow}${toolchain}${R_arrow}"
 
+  #
+  # Safe method to remove existing toolchain dirs
+  pkg_tarball=$(get_package_tarball_name "binutils")
+  wrt_remove_existing_dirs  "$pkg_tarball"
+  pkg_tarball=$(get_package_tarball_name "gcc-core")
+  wrt_remove_existing_dirs  "$pkg_tarball"
+  #
+  # Manually remove the toolchain directories..
+  tc_phase=`echo $toolchain | sed -e 's@[0-9]\{3\}-@@' -e 's@-toolchain@@'`
+(
+cat << EOF
+        @rm -rf \$(MOUNT_PT)\$(SRC)/${tc_phase}-toolchain && \\
+        rm  -rf \$(MOUNT_PT)\$(SRC)/${tc_phase}-build
+EOF
+) >> $MKFILE.tmp
+
   case ${toolchain} in
     *butterfly*)
+(
+cat << EOF
+        @echo "export PKGDIR=\$(SRC)" > envars
+EOF
+) >> $MKFILE.tmp
       [[ "$TEST" != "0" ]] && wrt_test_log2 "${this_script}"
-(
-cat << EOF
-        @echo "export PKGDIR=\$(SRC)" > envars
-EOF
-) >> $MKFILE.tmp
       wrt_run_as_chroot1 "$toolchain" "$this_script"
       ;;
@@ -370 +386 @@
         glibc ) [[ "$TEST" != "0" ]] && wrt_test_log2 "${this_script}"
           ;;
-            * ) [[ "$TEST"  = "2" ]] && [[ "$TEST"  = "3" ]] && wrt_test_log2 "${this_script}"
+            * ) [[ "$TEST" > "1" ]] && wrt_test_log2 "${this_script}"
           ;;
       esac