r2700 - in jhalfs/branches/experimental: . common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Thu May 18 11:44:13 PDT 2006


Author: manuel
Date: 2006-05-18 12:44:10 -0600 (Thu, 18 May 2006)
New Revision: 2700

Added:
   jhalfs/branches/experimental/blfs
Removed:
   jhalfs/branches/experimental/blfs
Modified:
   jhalfs/branches/experimental/common/common-functions
   jhalfs/branches/experimental/common/config
   jhalfs/branches/experimental/common/func_validate_configs.sh
   jhalfs/branches/experimental/master.sh
Log:
Merged r2698 and r2699 from trunk.

Deleted: jhalfs/branches/experimental/blfs
===================================================================
--- jhalfs/branches/experimental/blfs	2006-05-18 18:41:43 UTC (rev 2699)
+++ jhalfs/branches/experimental/blfs	2006-05-18 18:44:10 UTC (rev 2700)
@@ -1 +0,0 @@
-link master.sh
\ No newline at end of file

Copied: jhalfs/branches/experimental/blfs (from rev 2699, jhalfs/trunk/blfs)
===================================================================
--- jhalfs/branches/experimental/blfs	                        (rev 0)
+++ jhalfs/branches/experimental/blfs	2006-05-18 18:44:10 UTC (rev 2700)
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+echo -e "\n  BLFS support has been dissabled for now.\n"
+
+exit 0


Property changes on: jhalfs/branches/experimental/blfs
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Revision Id

Modified: jhalfs/branches/experimental/common/common-functions
===================================================================
--- jhalfs/branches/experimental/common/common-functions	2006-05-18 18:41:43 UTC (rev 2699)
+++ jhalfs/branches/experimental/common/common-functions	2006-05-18 18:44:10 UTC (rev 2700)
@@ -53,7 +53,7 @@
 ${BOLD}  -B, --book VER${OFF}
         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}
         use DIR directory for building ${BOLD}$(echo $PROGNAME | tr [a-z] [A-Z])${OFF}; all files jhalfs-X produces
@@ -68,8 +68,8 @@
 ${BOLD}  -O, --optimize${OFF}
         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.
 
 ${BOLD}  -T, --testsuites N ${OFF}
@@ -79,16 +79,10 @@
           2 = all final system testsuites
           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}
          do iterative comparison analysis. This extends the total build time
          considerably because the entire final system will rebuild itself
@@ -141,20 +135,7 @@
         Valid choices are: glibc or uclibc
 -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}
 -EOF-
   exit
@@ -194,16 +175,11 @@
 
 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
 # DO NOT EDIT THIS FILE MANUALLY
 #
@@ -493,7 +469,6 @@
       lfs) svn_root="LFS" ;;
       hlfs) svn_root="HLFS" ;;
       clfs) svn_root="cross-lfs" ;;
-      blfs) svn_root="BLFS" ;;
       *) echo "BOOK not defined in function <get_book>"
           exit 1 ;;
     esac
@@ -594,14 +569,6 @@
                  --stringparam lang $LANG \
                  -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
 
@@ -612,12 +579,10 @@
 
   # 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...
   get_sources

Modified: jhalfs/branches/experimental/common/config
===================================================================
--- jhalfs/branches/experimental/common/config	2006-05-18 18:41:43 UTC (rev 2699)
+++ jhalfs/branches/experimental/common/config	2006-05-18 18:44:10 UTC (rev 2700)
@@ -31,7 +31,6 @@
 
 #=== Build options ===
 #--- Run the makefile at the end  0(no)/1(yes)
-#    In BLFS the Makefile can't be run automatically
 RUNMAKE=0
 
 #--- Optimize the build  [0-2]
@@ -45,11 +44,8 @@
 #--- Run test suites  [0-3]
 #  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
 

Modified: jhalfs/branches/experimental/common/func_validate_configs.sh
===================================================================
--- jhalfs/branches/experimental/common/func_validate_configs.sh	2006-05-18 18:41:43 UTC (rev 2699)
+++ jhalfs/branches/experimental/common/func_validate_configs.sh	2006-05-18 18:44:10 UTC (rev 2700)
@@ -76,7 +76,7 @@
 
     input vars: none
     externals:  color constants
-                PROGNAME (lfs,clfs,hlfs,blfs)
+                PROGNAME (lfs,clfs,hlfs)
     modifies:   none
     returns:    nothing
     on error:   write text to console and dies
@@ -84,7 +84,6 @@
 inline_doc
 
   # 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"
   local -r  lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE                       TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG        VIMLANG PAGE TIMEZONE LANG"
@@ -203,7 +202,6 @@
       OPTIMIZE)   validate_against_str "x0x x1x x2x" ;;
       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" ;;
       METHOD)     validate_against_str "xchrootx xbootx" ;;

Modified: jhalfs/branches/experimental/master.sh
===================================================================
--- jhalfs/branches/experimental/master.sh	2006-05-18 18:41:43 UTC (rev 2699)
+++ jhalfs/branches/experimental/master.sh	2006-05-18 18:44:10 UTC (rev 2700)
@@ -98,7 +98,7 @@
 
 while test $# -gt 0 ; do
   case $1 in
-  # Common options for all books
+  # Common options for {C,H}LFS books
     --book | -B )
       test $# = 1 && eval "$exit_missing_arg"
       shift
@@ -225,7 +225,6 @@
       esac
       ;;
 
-    # Common options for LFS, CLFS and HLFS
     --comparasion | -C )
       test $# = 1 && eval "$exit_missing_arg"
       shift
@@ -400,21 +399,6 @@
       esac
       ;;
 
-    # BLFS options
-    --dependencies )
-      test $# = 1 && eval "$exit_missing_arg"
-      shift
-      case $1 in
-        0 | 1 | 2 )
-          DEPEND=$1
-          ;;
-        * )
-          echo -e "\n$1 isn't a valid dependencies level."
-          exit 1
-          ;;
-      esac
-      ;;
-
     # Unknown options
     * )   usage   ;;
   esac
@@ -520,27 +504,23 @@
     popd 1> /dev/null
   fi
   #
-  if [[ "$PROGNAME" != "blfs" ]]; then
-    if [[ "$REPORT" = "1" ]]; then
-      cp $COMMON_DIR/create-sbu_du-report.sh  $JHALFSDIR/
-      # After be sure that all look sane and if REPORT=1, dump the settings to a file
-      # This file will be used to create the REPORT header
-      validate_config > $JHALFSDIR/jhalfs.config
-    fi     
-    [[ "$GETPKG" = "1" ]] && cp $COMMON_DIR/urls.xsl  $JHALFSDIR/
+  if [[ "$REPORT" = "1" ]]; then
+    cp $COMMON_DIR/create-sbu_du-report.sh  $JHALFSDIR/
+    # After be sure that all look sane, dump the settings to a file
+    # This file will be used to create the REPORT header
+    validate_config > $JHALFSDIR/jhalfs.config
   fi
   #
+  [[ "$GETPKG" = "1" ]] && cp $COMMON_DIR/urls.xsl  $JHALFSDIR/
+  #
   sed 's,FAKEDIR,'$BOOK',' $PACKAGE_DIR/$XSL > $JHALFSDIR/${XSL}
   export XSL=$JHALFSDIR/${XSL}
 fi
 
-
 get_book
 echo "${SD_BORDER}${nl_}"
 
-
 build_Makefile
 echo "${SD_BORDER}${nl_}"
 
 run_make
-




More information about the alfs-log mailing list