From b7faa5a0228db7b19b66edacf920943a47c0f2f4 Mon Sep 17 00:00:00 2001 From: Jeremy Huntwork Date: Sat, 27 May 2006 22:51:06 +0000 Subject: [PATCH] Reverting r2729 until a better solution is found --- CLFS/master.sh | 28 +++++++++++++--------------- HLFS/master.sh | 9 --------- LFS/master.sh | 10 +--------- common/common-functions | 17 ++++++----------- 4 files changed, 20 insertions(+), 44 deletions(-) diff --git a/CLFS/master.sh b/CLFS/master.sh index 3d77245..4e5a258 100755 --- a/CLFS/master.sh +++ b/CLFS/master.sh @@ -131,7 +131,7 @@ cross_tools_Makefiles() { # # # If $vrs isn't empty, we've got a package... # - [[ "$vrs" != "" ]] && wrt_remove_build_dirs "${name}" && wrt_unpack "$name-$vrs.tar.*" + [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*" # wrt_run_as_su "${this_script}" "${file}" # @@ -183,7 +183,7 @@ temptools_Makefiles() { # # If $vrs isn't empty, we've got a package... # Insert instructions for unpacking the package and to set the PKGDIR variable. # - [[ "$vrs" != "" ]] && wrt_remove_build_dirs "${name}" && wrt_unpack "$name-$vrs.tar.*" + [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*" [[ "$vrs" != "" ]] && [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name" # wrt_run_as_su "${this_script}" "${file}" @@ -255,7 +255,7 @@ boot_Makefiles() { # # If $vrs isn't empty, we've got a package... # Insert instructions for unpacking the package and changing directories # - [[ "$vrs" != "" ]] && wrt_remove_build_dirs "${name}" && wrt_unpack "$name-$vrs.tar.*" + [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*" [[ "$vrs" != "" ]] && [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name" # # Select a script execution method @@ -324,8 +324,8 @@ chroot_Makefiles() { # # if [ "$vrs" != "" ] ; then case $this_script in - *util-linux) wrt_remove_build_dirs "${name}" && wrt_unpack "$name-$vrs.tar.*" ;; - *) wrt_remove_build_dirs "${name}" && wrt_unpack2 "$name-$vrs.tar.*" ;; + *util-linux) wrt_unpack "$name-$vrs.tar.*" ;; + *) wrt_unpack2 "$name-$vrs.tar.*" ;; esac [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name" fi @@ -385,8 +385,8 @@ testsuite_tools_Makefiles() { # wrt_target "${this_script}" "$PREV" # case $name in - tcl) wrt_remove_build_dirs "${name}" && wrt_unpack2 "$name$vrs-src.tar.*" ;; - *) wrt_remove_build_dirs "${name}" && wrt_unpack2 "$name-$vrs.tar.*" ;; + tcl) wrt_unpack2 "$name$vrs-src.tar.*" ;; + *) wrt_unpack2 "$name-$vrs.tar.*" ;; esac [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name" # @@ -440,8 +440,8 @@ bm_testsuite_tools_Makefiles() { # wrt_target "${this_script}" "$PREV" # case $name in - tcl) wrt_remove_build_dirs2 "${name}" && wrt_unpack3 "$name$vrs-src.tar.*" ;; - *) wrt_remove_build_dirs2 "${name}" && wrt_unpack3 "$name-$vrs.tar.*" ;; + tcl) wrt_unpack3 "$name$vrs-src.tar.*" ;; + *) wrt_unpack3 "$name-$vrs.tar.*" ;; esac [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name" # @@ -541,7 +541,6 @@ final_system_Makefiles() { # # If $vrs isn't empty, we've got a package... if [ "$vrs" != "" ] ; then FILE="$name-$vrs.tar.*" - wrt_remove_build_dirs "${name}" wrt_unpack2 "$FILE" [[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name" fi @@ -645,7 +644,6 @@ bm_final_system_Makefiles() { # # If $vrs isn't empty, we've got a package... if [ "$vrs" != "" ] ; then FILE="$name-$vrs.tar.*" - wrt_remove_build_dirs2 "${name}" wrt_unpack3 "$FILE" [[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name" fi @@ -710,7 +708,7 @@ bootscripts_Makefiles() { # # # If $vrs isn't empty, we've got a package... # - [[ "$vrs" != "" ]] && wrt_remove_build_dirs "${name}" && wrt_unpack2 "$name-$vrs.tar.*" + [[ "$vrs" != "" ]] && wrt_unpack2 "$name-$vrs.tar.*" # wrt_run_as_chroot1 "${this_script}" "${file}" # @@ -771,7 +769,7 @@ bm_bootscripts_Makefiles() { # # # If $vrs isn't empty, we've got a package... # - [[ "$vrs" != "" ]] && wrt_remove_build_dirs2 "${name}" && wrt_unpack3 "$name-$vrs.tar.*" + [[ "$vrs" != "" ]] && wrt_unpack3 "$name-$vrs.tar.*" # wrt_run_as_root2 "${this_script}" "${file}" # @@ -835,7 +833,7 @@ bootable_Makefiles() { # # If $vrs isn't empty, we've got a package... # Insert instructions for unpacking the package and changing directories # - [[ "$vrs" != "" ]] && wrt_remove_build_dirs "${name}" && wrt_unpack2 "$name-$vrs.tar.*" + [[ "$vrs" != "" ]] && wrt_unpack2 "$name-$vrs.tar.*" # # Select a script execution method case $this_script in @@ -913,7 +911,7 @@ bm_bootable_Makefiles() { # # If $vrs isn't empty, we've got a package... # Insert instructions for unpacking the package and changing directories # - [[ "$vrs" != "" ]] && wrt_remove_build_dirs2 "${name}" && wrt_unpack3 "$name-$vrs.tar.*" + [[ "$vrs" != "" ]] && wrt_unpack3 "$name-$vrs.tar.*" # # Select a script execution method case $this_script in diff --git a/HLFS/master.sh b/HLFS/master.sh index 6e94d18..55021fb 100755 --- a/HLFS/master.sh +++ b/HLFS/master.sh @@ -140,10 +140,6 @@ chapter5_Makefiles() { # Bootstrap or temptools phase gcc) FILE="gcc-core-$vrs.tar.*" ;; *) FILE="$name-$vrs.tar.*" ;; esac - # Always remove possibly exiting unpacked source directories before beginning - # to build. This prevent build failures from fogetting to manually remove - # directories from previous runs of jhalfs. - wrt_remove_build_dirs "$name" # Insert instructions for unpacking the package and to set the PKGDIR variable. wrt_unpack "$FILE" [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name" @@ -311,10 +307,6 @@ chapter6_Makefiles() { # sysroot or chroot build phase gcc) FILE="gcc-core-$vrs.tar.*" ;; *) FILE="$name-$vrs.tar.*" ;; esac - # Always remove possibly exiting unpacked source directories before beginning - # to build. This prevent build failures from fogetting to manually remove - # directories from previous runs of jhalfs. - wrt_remove_build_dirs "$name" wrt_unpack2 "$FILE" wrt_target_vars [[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name" @@ -579,7 +571,6 @@ do-housekeeping: userdel lfs; \\ rm -rf /home/lfs; \\ fi; - -rm -f /tmp/unpacked EOF ) >> $MKFILE diff --git a/LFS/master.sh b/LFS/master.sh index aee347e..f41c0fc 100755 --- a/LFS/master.sh +++ b/LFS/master.sh @@ -109,10 +109,7 @@ chapter5_Makefiles() { else FILE="$name-$vrs.tar.*" fi - # Always remove possibly exiting unpacked source directories before beginning - # to build. This prevent build failures from fogetting to manually remove - # directories from previous runs of jhalfs. - wrt_remove_build_dirs "$name" + # Insert instructions for unpacking the package and to set the PKGDIR variable. wrt_unpack "$FILE" [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name" @@ -218,10 +215,6 @@ chapter6_Makefiles() { # Insert instructions for unpacking the package and changing directories if [ "$vrs" != "" ] ; then FILE="$name-$vrs.tar.*" - # Always remove possibly exiting unpacked source directories before beginning - # to build. This prevent build failures from fogetting to manually remove - # directories from previous runs of jhalfs. - wrt_remove_build_dirs "$name" wrt_unpack2 "$FILE" [[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name" fi @@ -449,7 +442,6 @@ do_housekeeping: userdel lfs; \\ rm -rf /home/lfs; \\ fi; - -rm -f /tmp/unpacked EOF ) >> $MKFILE diff --git a/common/common-functions b/common/common-functions index 52029a0..9680b00 100644 --- a/common/common-functions +++ b/common/common-functions @@ -211,7 +211,6 @@ EOF wrt_unpack() { # Unpack and set 'ROOT' var #----------------------------------# local FILE=$1 - local file=$2 ( cat << EOF @\$(call unpack,$FILE) @@ -364,11 +363,9 @@ wrt_remove_build_dirs() { # local name=$1 ( cat << EOF - @if [ -f /tmp/unpacked ] ; then \\ - ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\ - if [ "x" != "x\$\$ROOT" ] ; then rm -r \$(MOUNT_PT)\$(SRC)/\$\$ROOT; fi; \\ - fi; - @if [ -e \$(MOUNT_PT)\$(SRC)/$name-build ]; then \\ + @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\ + rm -r \$(MOUNT_PT)\$(SRC)/\$\$ROOT && \\ + if [ -e \$(MOUNT_PT)\$(SRC)/$name-build ]; then \\ rm -r \$(MOUNT_PT)\$(SRC)/$name-build; \\ fi; EOF @@ -382,11 +379,9 @@ wrt_remove_build_dirs2() { # local name=$1 ( cat << EOF - @if [ -f /tmp/unpacked ] ; then \\ - ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\ - if [ "x" != "x\$\$ROOT" ] ; then rm -r \$(SRC)/\$\$ROOT; fi; \\ - fi; - @if [ -e \$(SRC)/$name-build ]; then \\ + @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\ + rm -r \$(SRC)/\$\$ROOT && \\ + if [ -e \$(SRC)/$name-build ]; then \\ rm -r \$(SRC)/$name-build; \\ fi; EOF