Changeset 12a5707 for LFS

Timestamp:

03/10/2006 01:44:55 AM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

experimental

Children:

4845f38

Parents:

6db1464

Message:

Adjusting scripts to new structure. Added jhalfs trunk changes. Will now create a lfs makefile.

Location:

LFS

Files:

• config (modified) (2 diffs)
• master.sh (modified) (7 diffs)

LFS/config

@@ -6 +6 @@
 #
 #####
-declare -r HTTP=http://ftp.lfs-matrix.net/pub/lfs/conglomeration
+declare -r FTP=ftp://ftp.linuxfromscratch.org/pub/lfs/conglomeration
 
 #--- Location of fstab file (if empty, a template is created)
-FSTAB=$BUILDDIR/sources/fstab
+FSTAB=
 
 #--- Location of kernel config file (if the kernel is to be compiled)
-CONFIG=$PWD/config_files/linux-2.6.15.1-LFS.config
+CONFIG=
 
 #--- Book's sources directory
@@ -25 +25 @@
 
 #--- Default stylesheet
-XSL=dump-lfs-scripts.xsl
+XSL=lfs.xsl
 
 #--- Book version

LFS/master.sh

@@ -12 +12 @@
 chapter4_Makefiles() {
 #----------------------------#
+  echo -e "\n${tab_}${GREEN}Processing... ${L_arrow}Chapter4${R_arrow}"
 
 # If /home/lfs is already present in the host, we asume that the
@@ -62 +63 @@
 chapter5_Makefiles() {
 #----------------------------#
+  echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter5${R_arrow}"
+
   for file in chapter05/* ; do
     # Keep the script file name
@@ -67 +70 @@
 
     # If no testsuites will be run, then TCL, Expect and DejaGNU aren't needed
-    if [ "$TOOLCHAINTEST" = "0" ]; then
+    if [ "$TEST" = "0" ]; then
       if [[ `_IS_ ${this_script} tcl` ]] || [[ `_IS_ ${this_script} expect` ]] || [[ `_IS_ ${this_script} dejagnu` ]] ; then
         continue
@@ -76 +79 @@
     if [ "$STRIP" = "0" ] && [[ `_IS_ ${this_script} stripping` ]] ; then
       continue
-    fi
-
-# NOTE Replace with xsl work...
-    if [[ `_IS_ $this_script adjusting` ]]; then
-      sed '/cd $PKGDIR/d' -i chapter05/$this_script
     fi
 
@@ -138 +136 @@
 chapter6_Makefiles() {
 #----------------------------#
+  echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter6${R_arrow}"
   for file in chapter06/* ; do
     # Keep the script file name
@@ -151 +150 @@
     if [ "$STRIP" = "0" ] && [[ `_IS_ ${this_script} stripping` ]] ; then
       continue
-    fi
-
-# NOTE Replace with xsl work...
-    if [[ `_IS_ $this_script adjusting` ]]; then
-      sed '/cd $PKGDIR/d' -i chapter06/$this_script
     fi
 
@@ -211 +205 @@
 chapter789_Makefiles() {
 #----------------------------#
+  echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter6/7/8${R_arrow}"
   for file in chapter0{7,8,9}/* ; do
     # Keep the script file name