Changeset 25b52e2 for common

Timestamp:

05/18/2006 06:44:10 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

f8615e5

Parents:

3a27393

Message:

Merged r2698 and r2699 from trunk.

Location:

common

Files:

• common-functions (modified) (8 diffs)
• config (modified) (2 diffs)
• func_validate_configs.sh (modified) (3 diffs)

common/common-functions

@@ -54 +54 @@
         use VER version of the book as the system to build.
         Supported versions are: dev*, trunk, SVN
-        These are aliases for the Development version of {C,H,B}LFS
+        These are aliases for the Development version of {C,H}LFS
 
 ${BOLD}  -D  --directory DIR${OFF}
@@ -69 +69 @@
         Optimize [0-2]
           0 = no optimization
-          1 = optimize chapter06 only
-          2 = optimize both chapter05 and chapter06
+          1 = optimize final system only
+          2 = optimize both temporary tools and final system
         Edit common/opt_config{,.d/*} and common/opt_override as desired.
 
@@ -80 +80 @@
           3 = all temporary tools and final system testsuites
         In CLFS, 3 is an alias to 2
-        In BLFS, 1, 2, and 3 are equivalents and means that the testsuites
-        will be run.
 
 ${BOLD}  -W, --working-copy DIR${OFF}
         use the local working copy placed in DIR as the $(echo $PROGNAME | tr [a-z] [A-Z]) book
--EOF-
-
-[[ ${PROGNAME} != "blfs" ]] &&
-cat <<- -EOF-
 
 ${BOLD}  -C, --comparasion TYPE${OFF}
@@ -142 +136 @@
 -EOF-
 
-[[ ${PROGNAME} = "blfs" ]] &&
-cat <<- -EOF-
-
-${BOLD}  --dependencies  0/1/2${OFF}
-        add dependencies of type TYPE to the build tree.
-        If not set, both required and recommended are used.
-
-                  Possible values are:
-        0 - required        only required dependecies are used
-        1 - recommended     both required a recommended dependencies are used
-        2 - optional        all dependencies are used
--EOF-
-
 cat <<- -EOF-
 ${DD_BORDER}
@@ -195 +176 @@
 help="${nl_}Try '$0 --help' for more information."
 
-
 exit_missing_arg="\
 echo \"Option '\$1' requires an argument\" >&2
 echo \"\$help\" >&2
 exit 1"
-
-no_dl_client="\
-echo \"Could not find a way to download the ${BOLD}$(echo $PROGNAME | tr [a-z] [A-Z])${OFF} sources.\" >&2
-echo \"Attempting to continue.\" >&2"
 
 HEADER="# This file is automatically generated by jhalfs-X
@@ -494 +470 @@
       hlfs) svn_root="HLFS" ;;
       clfs) svn_root="cross-lfs" ;;
-      blfs) svn_root="BLFS" ;;
       *) echo "BOOK not defined in function <get_book>"
           exit 1 ;;
@@ -595 +570 @@
                  -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
       ;;
-    blfs)
-        echo -n " ${L_arrow}${BOLD}BLFS${R_arrow} build"
-        xsltproc --nonet \
-                 --xinclude \
-                 --stringparam testsuite $TEST \
-                 --stringparam server $SERVER \
-                 -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
-      ;;
     *) exit 1 ;;
   esac
@@ -613 +580 @@
   # Create the packages file. We need it for proper Makefile creation
   rm -f packages
-  if [[ "${PROGNAME}" != "blfs" ]] ; then
-    echo -n "Creating <${PROGNAME}> specific packages file"
-    grep "\-version " $BOOK/packages.ent | sed -e 's@<!ENTITY @@' \
-                                                -e 's@">@"@' > packages
-    echo " ...OK"
-  fi
+  echo -n "Creating <${PROGNAME}> specific packages file"
+  grep "\-version " $BOOK/packages.ent | sed -e 's@<!ENTITY @@' \
+                                             -e 's@">@"@' > packages
+  echo " ...OK"
 
   # Done. Moving on...

common/config

@@ -32 +32 @@
 #=== Build options ===
 #--- Run the makefile at the end  0(no)/1(yes)
-#    In BLFS the Makefile can't be run automatically
 RUNMAKE=0
 
@@ -46 +45 @@
 #  0 = none
 #  1 = only chapter06 Glibc, GCC and Binutils testsuites
-#      (in BLFS, run the package testsuite, if any)
 #  2 = all chapter06 testsuites
-#      (in BLFS, alias to 1)
 #  3 = all chapter05 and chapter06 testsuites
-#      (in BLFS, alias to 1)
 #      (in CLFS, alias to 2)
 TEST=1

common/func_validate_configs.sh

@@ -77 +77 @@
     input vars: none
     externals:  color constants
-                PROGNAME (lfs,clfs,hlfs,blfs)
+                PROGNAME (lfs,clfs,hlfs)
     modifies:   none
     returns:    nothing
@@ -85 +85 @@
 
   # First internal variables, then the ones that change the book's flavour, and lastly system configuration variables
-  local -r blfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG         DEPEND                TEST OPTIMIZE"
   local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG KEYMAP         PAGE TIMEZONE LANG LC_ALL"
   local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE METHOD  ARCH  TARGET  TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG"
@@ -204 +203 @@
       STRIP)      validate_against_str "x0x x1x" ;;
       VIMLANG)    validate_against_str "x0x x1x" ;;
-      DEPEND)     validate_against_str "x0x x1x x2x" ;;
       MODEL)      validate_against_str "xglibcx xuclibcx" ;;
       PAGE)       validate_against_str "xletterx xA4x" ;;