/ fixing log

RomainClaret · Mar 6, 2016 · 32bd1cf · 32bd1cf
1 parent ccb1450
commit 32bd1cf
Show file tree

Hide file tree

Showing 31 changed files with 62 additions and 93 deletions.
diff --git a/5.10-lfs_gcc-5.2.0-pass-2.sh b/5.10-lfs_gcc-5.2.0-pass-2.sh
@@ -11,9 +11,6 @@ echo "### GCC-5.2.0 - Pass 2"
 echo "### Must be run as \"lfs\" user"
 echo "### ---------------------------"
 
-BUILD_DIRECTORY=$INSTALL_NAME-build
-LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
-
 echo ""
 echo "... Loading commun functions and variables"
 if [ ! -f ./script-all_commun-functions.sh ]
@@ -38,6 +35,8 @@ check_tools
 
 echo ""
 echo "... Setup building environment"
+BUILD_DIRECTORY=$INSTALL_NAME-build
+LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
 cd $LFS_MOUNT_SOURCES
 check_tarball_uniqueness
 init_tarball

diff --git a/5.11-lfs_tcl-core-8.6.4.sh b/5.11-lfs_tcl-core-8.6.4.sh
@@ -11,9 +11,6 @@ echo "### Tcl-core-8.6.4"
 echo "### Must be run as \"lfs\" user"
 echo "### ---------------------------"
 
-BUILD_DIRECTORY=$INSTALL_NAME-build
-LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
-
 echo ""
 echo "... Loading commun functions and variables"
 if [ ! -f ./script-all_commun-functions.sh ]
@@ -38,6 +35,8 @@ check_tools
 
 echo ""
 echo "... Setup building environment"
+BUILD_DIRECTORY=$INSTALL_NAME-build
+LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
 cd $LFS_MOUNT_SOURCES
 check_tarball_uniqueness
 init_tarball

diff --git a/5.12-lfs_expect-5.45.sh b/5.12-lfs_expect-5.45.sh
@@ -11,9 +11,6 @@ echo "### Expect-5.45"
 echo "### Must be run as \"lfs\" user"
 echo "### ---------------------------"
 
-BUILD_DIRECTORY=$INSTALL_NAME-build
-LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
-
 echo ""
 echo "... Loading commun functions and variables"
 if [ ! -f ./script-all_commun-functions.sh ]
@@ -38,6 +35,8 @@ check_tools
 
 echo ""
 echo "... Setup building environment"
+BUILD_DIRECTORY=$INSTALL_NAME-build
+LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
 cd $LFS_MOUNT_SOURCES
 check_tarball_uniqueness
 init_tarball

diff --git a/5.13-lfs_dejagnu-1.5.3.sh b/5.13-lfs_dejagnu-1.5.3.sh
@@ -11,9 +11,6 @@ echo "### DejaGNU-1.5.3"
 echo "### Must be run as \"lfs\" user"
 echo "### ---------------------------"
 
-BUILD_DIRECTORY=$INSTALL_NAME-build
-LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
-
 echo ""
 echo "... Loading commun functions and variables"
 if [ ! -f ./script-all_commun-functions.sh ]
@@ -38,6 +35,8 @@ check_tools
 
 echo ""
 echo "... Setup building environment"
+BUILD_DIRECTORY=$INSTALL_NAME-build
+LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
 cd $LFS_MOUNT_SOURCES
 check_tarball_uniqueness
 init_tarball

diff --git a/5.14-lfs_check-0.10.0.sh b/5.14-lfs_check-0.10.0.sh
@@ -11,9 +11,6 @@ echo "### Check-0.10.0"
 echo "### Must be run as \"lfs\" user"
 echo "### ---------------------------"
 
-BUILD_DIRECTORY=$INSTALL_NAME-build
-LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
-
 echo ""
 echo "... Loading commun functions and variables"
 if [ ! -f ./script-all_commun-functions.sh ]
@@ -38,6 +35,8 @@ check_tools
 
 echo ""
 echo "... Setup building environment"
+BUILD_DIRECTORY=$INSTALL_NAME-build
+LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
 cd $LFS_MOUNT_SOURCES
 check_tarball_uniqueness
 init_tarball

diff --git a/5.15-lfs_ncurses-6.0.sh b/5.15-lfs_ncurses-6.0.sh
@@ -11,9 +11,6 @@ echo "### Ncurses-6.0"
 echo "### Must be run as \"lfs\" user"
 echo "### ---------------------------"
 
-BUILD_DIRECTORY=$INSTALL_NAME-build
-LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
-
 echo ""
 echo "... Loading commun functions and variables"
 if [ ! -f ./script-all_commun-functions.sh ]
@@ -38,6 +35,8 @@ check_tools
 
 echo ""
 echo "... Setup building environment"
+BUILD_DIRECTORY=$INSTALL_NAME-build
+LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
 cd $LFS_MOUNT_SOURCES
 check_tarball_uniqueness
 init_tarball

diff --git a/5.16-lfs_bash-4.3.30.sh b/5.16-lfs_bash-4.3.30.sh
@@ -11,9 +11,6 @@ echo "### Bash-4.3.30"
 echo "### Must be run as \"lfs\" user"
 echo "### ---------------------------"
 
-BUILD_DIRECTORY=$INSTALL_NAME-build
-LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
-
 echo ""
 echo "... Loading commun functions and variables"
 if [ ! -f ./script-all_commun-functions.sh ]
@@ -38,6 +35,8 @@ check_tools
 
 echo ""
 echo "... Setup building environment"
+BUILD_DIRECTORY=$INSTALL_NAME-build
+LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
 cd $LFS_MOUNT_SOURCES
 check_tarball_uniqueness
 init_tarball

diff --git a/5.17-lfs_bzip2-1.0.6.sh b/5.17-lfs_bzip2-1.0.6.sh
@@ -11,9 +11,6 @@ echo "### Bzip2-1.0.6"
 echo "### Must be run as \"lfs\" user"
 echo "### ---------------------------"
 
-BUILD_DIRECTORY=$INSTALL_NAME-build
-LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
-
 echo ""
 echo "... Loading commun functions and variables"
 if [ ! -f ./script-all_commun-functions.sh ]
@@ -38,6 +35,8 @@ check_tools
 
 echo ""
 echo "... Setup building environment"
+BUILD_DIRECTORY=$INSTALL_NAME-build
+LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
 cd $LFS_MOUNT_SOURCES
 check_tarball_uniqueness
 init_tarball

diff --git a/5.18-lfs_coreutils-8.24.sh b/5.18-lfs_coreutils-8.24.sh
@@ -11,9 +11,6 @@ echo "### Coreutils-8.24"
 echo "### Must be run as \"lfs\" user"
 echo "### ---------------------------"
 
-BUILD_DIRECTORY=$INSTALL_NAME-build
-LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
-
 echo ""
 echo "... Loading commun functions and variables"
 if [ ! -f ./script-all_commun-functions.sh ]
@@ -38,6 +35,8 @@ check_tools
 
 echo ""
 echo "... Setup building environment"
+BUILD_DIRECTORY=$INSTALL_NAME-build
+LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
 cd $LFS_MOUNT_SOURCES
 check_tarball_uniqueness
 init_tarball

diff --git a/5.19-lfs_diffutils-3.3.sh b/5.19-lfs_diffutils-3.3.sh
@@ -11,9 +11,6 @@ echo "### Diffutils-3.3"
 echo "### Must be run as \"lfs\" user"
 echo "### ---------------------------"
 
-BUILD_DIRECTORY=$INSTALL_NAME-build
-LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
-
 echo ""
 echo "... Loading commun functions and variables"
 if [ ! -f ./script-all_commun-functions.sh ]
@@ -38,6 +35,8 @@ check_tools
 
 echo ""
 echo "... Setup building environment"
+BUILD_DIRECTORY=$INSTALL_NAME-build
+LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
 cd $LFS_MOUNT_SOURCES
 check_tarball_uniqueness
 init_tarball

diff --git a/5.20-lfs_file-5.24.sh b/5.20-lfs_file-5.24.sh
@@ -11,9 +11,6 @@ echo "### File-5.24"
 echo "### Must be run as \"lfs\" user"
 echo "### ---------------------------"
 
-BUILD_DIRECTORY=$INSTALL_NAME-build
-LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
-
 echo ""
 echo "... Loading commun functions and variables"
 if [ ! -f ./script-all_commun-functions.sh ]
@@ -38,6 +35,8 @@ check_tools
 
 echo ""
 echo "... Setup building environment"
+BUILD_DIRECTORY=$INSTALL_NAME-build
+LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
 cd $LFS_MOUNT_SOURCES
 check_tarball_uniqueness
 init_tarball

diff --git a/5.21-lfs_findutils-4.4.2.sh b/5.21-lfs_findutils-4.4.2.sh
@@ -11,9 +11,6 @@ echo "### Findutils-4.4.2"
 echo "### Must be run as \"lfs\" user"
 echo "### ---------------------------"
 
-BUILD_DIRECTORY=$INSTALL_NAME-build
-LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
-
 echo ""
 echo "... Loading commun functions and variables"
 if [ ! -f ./script-all_commun-functions.sh ]
@@ -38,6 +35,8 @@ check_tools
 
 echo ""
 echo "... Setup building environment"
+BUILD_DIRECTORY=$INSTALL_NAME-build
+LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
 cd $LFS_MOUNT_SOURCES
 check_tarball_uniqueness
 init_tarball

diff --git a/5.22-lfs_gawk-4.1.3.sh b/5.22-lfs_gawk-4.1.3.sh
@@ -11,9 +11,6 @@ echo "### Gawk-4.1.3"
 echo "### Must be run as \"lfs\" user"
 echo "### ---------------------------"
 
-BUILD_DIRECTORY=$INSTALL_NAME-build
-LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
-
 echo ""
 echo "... Loading commun functions and variables"
 if [ ! -f ./script-all_commun-functions.sh ]
@@ -38,6 +35,8 @@ check_tools
 
 echo ""
 echo "... Setup building environment"
+BUILD_DIRECTORY=$INSTALL_NAME-build
+LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
 cd $LFS_MOUNT_SOURCES
 check_tarball_uniqueness
 init_tarball

diff --git a/5.23-lfs_gettext-0.19.5.1.sh b/5.23-lfs_gettext-0.19.5.1.sh
@@ -11,9 +11,6 @@ echo "### Gettext-0.19.5.1"
 echo "### Must be run as \"lfs\" user"
 echo "### ---------------------------"
 
-BUILD_DIRECTORY=$INSTALL_NAME-build
-LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
-
 echo ""
 echo "... Loading commun functions and variables"
 if [ ! -f ./script-all_commun-functions.sh ]
@@ -38,6 +35,8 @@ check_tools
 
 echo ""
 echo "... Setup building environment"
+BUILD_DIRECTORY=$INSTALL_NAME-build
+LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
 cd $LFS_MOUNT_SOURCES
 check_tarball_uniqueness
 init_tarball

diff --git a/5.24-lfs_grep-2.21.sh b/5.24-lfs_grep-2.21.sh
@@ -11,9 +11,6 @@ echo "### Grep-2.21"
 echo "### Must be run as \"lfs\" user"
 echo "### ---------------------------"
 
-BUILD_DIRECTORY=$INSTALL_NAME-build
-LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
-
 echo ""
 echo "... Loading commun functions and variables"
 if [ ! -f ./script-all_commun-functions.sh ]
@@ -38,6 +35,8 @@ check_tools
 
 echo ""
 echo "... Setup building environment"
+BUILD_DIRECTORY=$INSTALL_NAME-build
+LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
 cd $LFS_MOUNT_SOURCES
 check_tarball_uniqueness
 init_tarball

diff --git a/5.25-lfs_gzip-1.6.sh b/5.25-lfs_gzip-1.6.sh
@@ -11,9 +11,6 @@ echo "### Gzip-1.6"
 echo "### Must be run as \"lfs\" user"
 echo "### ---------------------------"
 
-BUILD_DIRECTORY=$INSTALL_NAME-build
-LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
-
 echo ""
 echo "... Loading commun functions and variables"
 if [ ! -f ./script-all_commun-functions.sh ]
@@ -38,6 +35,8 @@ check_tools
 
 echo ""
 echo "... Setup building environment"
+BUILD_DIRECTORY=$INSTALL_NAME-build
+LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
 cd $LFS_MOUNT_SOURCES
 check_tarball_uniqueness
 init_tarball

diff --git a/5.26-lfs_m4-1.4.17.sh b/5.26-lfs_m4-1.4.17.sh
@@ -11,9 +11,6 @@ echo "### M4-1.4.17"
 echo "### Must be run as \"lfs\" user"
 echo "### ---------------------------"
 
-BUILD_DIRECTORY=$INSTALL_NAME-build
-LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
-
 echo ""
 echo "... Loading commun functions and variables"
 if [ ! -f ./script-all_commun-functions.sh ]
@@ -38,6 +35,8 @@ check_tools
 
 echo ""
 echo "... Setup building environment"
+BUILD_DIRECTORY=$INSTALL_NAME-build
+LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
 cd $LFS_MOUNT_SOURCES
 check_tarball_uniqueness
 init_tarball

diff --git a/5.27-lfs_make-4.1.sh b/5.27-lfs_make-4.1.sh
@@ -11,9 +11,6 @@ echo "### Make-4.1"
 echo "### Must be run as \"lfs\" user"
 echo "### ---------------------------"
 
-BUILD_DIRECTORY=$INSTALL_NAME-build
-LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
-
 echo ""
 echo "... Loading commun functions and variables"
 if [ ! -f ./script-all_commun-functions.sh ]
@@ -38,6 +35,8 @@ check_tools
 
 echo ""
 echo "... Setup building environment"
+BUILD_DIRECTORY=$INSTALL_NAME-build
+LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
 cd $LFS_MOUNT_SOURCES
 check_tarball_uniqueness
 init_tarball

diff --git a/5.28-lfs_patch-2.7.5.sh b/5.28-lfs_patch-2.7.5.sh
@@ -11,9 +11,6 @@ echo "### Patch-2.7.5"
 echo "### Must be run as \"lfs\" user"
 echo "### ---------------------------"
 
-BUILD_DIRECTORY=$INSTALL_NAME-build
-LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
-
 echo ""
 echo "... Loading commun functions and variables"
 if [ ! -f ./script-all_commun-functions.sh ]
@@ -38,6 +35,8 @@ check_tools
 
 echo ""
 echo "... Setup building environment"
+BUILD_DIRECTORY=$INSTALL_NAME-build
+LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
 cd $LFS_MOUNT_SOURCES
 check_tarball_uniqueness
 init_tarball

diff --git a/5.29-lfs_perl-5.22.0.sh b/5.29-lfs_perl-5.22.0.sh
@@ -11,9 +11,6 @@ echo "### Perl-5.22.0"
 echo "### Must be run as \"lfs\" user"
 echo "### ---------------------------"
 
-BUILD_DIRECTORY=$INSTALL_NAME-build
-LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
-
 echo ""
 echo "... Loading commun functions and variables"
 if [ ! -f ./script-all_commun-functions.sh ]
@@ -38,6 +35,8 @@ check_tools
 
 echo ""
 echo "... Setup building environment"
+BUILD_DIRECTORY=$INSTALL_NAME-build
+LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
 cd $LFS_MOUNT_SOURCES
 check_tarball_uniqueness
 init_tarball

diff --git a/5.30-lfs_sed-4.2.2.sh b/5.30-lfs_sed-4.2.2.sh
@@ -11,9 +11,6 @@ echo "### Sed-4.2.2"
 echo "### Must be run as \"lfs\" user"
 echo "### ---------------------------"
 
-BUILD_DIRECTORY=$INSTALL_NAME-build
-LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
-
 echo ""
 echo "... Loading commun functions and variables"
 if [ ! -f ./script-all_commun-functions.sh ]
@@ -38,6 +35,8 @@ check_tools
 
 echo ""
 echo "... Setup building environment"
+BUILD_DIRECTORY=$INSTALL_NAME-build
+LOG_FILE=$LFS_BUILD_LOGS_5$CHAPTER_SECTION-$INSTALL_NAME
 cd $LFS_MOUNT_SOURCES
 check_tarball_uniqueness
 init_tarball