Changeset 00f4966

Timestamp:

08/13/2006 06:24:16 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

2fedf49

Parents:

d0d9e90

Message:

Merged r2936:2940 from trunk

Files:

• BLFS/blfs-parser.sh (modified) (2 diffs)
• BLFS/libs/book.xsl (modified) (1 diff)
• BLFS/libs/func_parser (modified) (2 diffs)
• BLFS/libs/scripts.xsl (modified) (2 diffs)
• BLFS/packages.sh (deleted)
• BLFS/update_book.sh (added)
• Config.in (modified) (6 diffs)
• README.BLFS (added)
• blfs (modified) (1 diff)

BLFS/blfs-parser.sh

@@ -11 +11 @@
 
 # Grab and name the command line options
-    optTARGET=$1
-optDEPENDENCY=$2
+    optTARGET=$1  # Package target
+optDEPENDENCY=$2  # Dependencies level, 1/2/3
+         SUDO=$3  # Build as user (y) or as root (n)
+
+[[ -z $SUDO ]] && SUDO=y
 
 
@@ -114 +117 @@
 generate_TARGET_xml
 generate_target_book
-create_build_scripts
+create_build_scripts "${SUDO}"

BLFS/libs/book.xsl

@@ -7 +7 @@
 <!-- $Id$ -->
 
-  <!-- NOTE: the base dir (blfs-xml) must be changed to FAKEDIR on the
-  final version and set it to the proper dir via a sed in ./blfs -->
+  <!-- NOTE: the base dir (blfs-xml) is set to the proper dir
+  via a sed in ./blfs -->
   <xsl:import href="../blfs-xml/stylesheets/blfs-chunked.xsl"/>
 

BLFS/libs/func_parser

@@ -127 +127 @@
 : <<inline_doc
     function:   Create shell scripts of the requested TARGET.
-    input vars: nothing
+    input vars: $1 use sudo n/y
     externals:  TARGET
     modifies:   nothing
@@ -141 +141 @@
   echo -en "\n\tGenerating the build scripts ..."
   xsltproc --xinclude --nonet \
+           --stringparam sudo $SUDO \
            -o ./scripts/ ../libs/scripts.xsl \
            $TARGET-index.xml >> xsltproc.log 2>&1

BLFS/libs/scripts.xsl

@@ -9 +9 @@
 
 <!-- XSLT stylesheet to create shell scripts from "linear build" BLFS books. -->
+
+  <!-- Build as user (y) or as root (n)? -->
+  <xsl:param name="sudo" select="y"/>
 
   <xsl:template match="/">
@@ -345 +348 @@
   <xsl:template match="screen">
     <xsl:if test="child::* = userinput and not(@role = 'nodump')">
-      <xsl:if test="@role = 'root'">
+      <xsl:if test="@role = 'root' and $sudo = 'y'">
         <xsl:text>sudo sh -c "</xsl:text>
       </xsl:if>
       <xsl:apply-templates select="userinput"/>
-      <xsl:if test="@role = 'root'">
+      <xsl:if test="@role = 'root' and $sudo = 'y'">
         <xsl:text>"</xsl:text>
       </xsl:if>

Config.in

@@ -23 +23 @@
                         bool "Hardened Linux From Scratch"
 
-#               config  BOOK_BLFS
-#                       bool "Beyond Linux From Scratch"
+                config  BOOK_BLFS
+                        bool "Beyond Linux From Scratch"
         endchoice
 
@@ -34 +34 @@
 #               default "./clfs3"       if BOOK_CLFS3
                 default "./hlfs"        if BOOK_HLFS
-#               default "./blfs"        if BOOK_BLFS
+                default "./blfs"        if BOOK_BLFS
         #--- End BOOK/script
 
@@ -48 +48 @@
                 config  WORKING_COPY
                         bool    "Working Copy"
+                        depends on !BOOK_BLFS
                         help
                                 #-- A local working copy
@@ -278 +279 @@
         #--- End HLFS specific params
 
+        #--- BLFS specific params
+        config  BLFS_ROOT
+                string "Directory root"
+                default "$HOME/blfs_root"
+                depends on BOOK_BLFS
+                help
+                        #-- Full path to the directory where all required
+                        #   files and scripts will be stored.
+
+        config  BLFS_XML
+                string "BLFS sources directory"
+                default "blfs-xml"
+                depends on BOOK_BLFS
+                help
+                        #-- The directory name where BLFS book sources
+                        #   will be checkout.
+        #--- End BLFS specific params
+
 #--- End BOOK Settings
 endmenu
 
 menu "--- General Settings"
+        depends on !BOOK_BLFS
 
         #--- Set User Account
@@ -384 +404 @@
 
 menu "--- Build Settings"
+        depends on !BOOK_BLFS
 
         #--- Test Suites
@@ -550 +571 @@
 
 menu "--- Advanced Features"
+        depends on !BOOK_BLFS
 
         config  REPORT

blfs

@@ -1 +1 @@
 #!/bin/bash
+# $Id$
+
 set -e
 
-echo -e "\n  BLFS support has been dissabled for now.\n"
 
-exit 0
+#>>>>>>>>>>>>>>>ERROR TRAPPING >>>>>>>>>>>>>>>>>>>>
+#-----------------------#
+simple_error() {        # Basic error trap.... JUST DIE
+#-----------------------#
+  # If +e then disable text output
+  if [[ "$-" =~ "e" ]]; then
+    echo -e "\n${RED}ERROR:${GREEN} basic error trapped!${OFF}\n" >&2
+  fi
+}
+
+see_ya() {
+    echo -e "\n\t${BOLD}Goodbye and thank you for choosing ${L_arrow}jhalfs${R_arrow}\n"
+}
+##### Simple error TRAPS
+# ctrl-c   SIGINT
+# ctrl-y
+# ctrl-z   SIGTSTP
+# SIGHUP   1 HANGUP
+# SIGINT   2 INTRERRUPT FROM KEYBOARD Ctrl-C
+# SIGQUIT  3
+# SIGKILL  9 KILL
+# SIGTERM 15 TERMINATION
+# SIGSTOP 17,18,23 STOP THE PROCESS
+#####
+set -e
+trap see_ya 0
+trap simple_error ERR
+trap 'echo -e "\n\n${RED}INTERRUPT${OFF} trapped\n" &&  exit 2'  1 2 3 15 17 18 23
+#>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+
+VERBOSITY=1
+
+[[ $VERBOSITY > 0 ]] && echo -n "Loading config params from <configuration>..."
+source configuration
+[[ $? > 0 ]] && echo "file:configuration did not load.." && exit 1
+[[ $VERBOSITY > 0 ]] && echo "OK"
+
+[[ -z $BOOK_BLFS ]] && echo -e "\nNo BLFS configuration found. Please configure it." && exit 1
+
+TREE=trunk/BOOK
+
+if [[ ! -z ${BRANCH_ID} ]]; then
+  case $BRANCH_ID in
+    dev* | SVN | trunk )  TREE=trunk/BOOK ;;
+              branch-* )  TREE=branches/${BRANCH_ID#branch-}/BOOK ;;
+                     * )  TREE=tags/${BRANCH_ID}/BOOK ;;
+  esac
+fi
+
+[[ ! -d $BLFS_ROOT ]] && mkdir -p $BLFS_ROOT
+
+cp -r BLFS/* $BLFS_ROOT
+cp common/progress_bar.sh $BLFS_ROOT
+# cp -r menu $BLFS_ROOT
+
+cd $BLFS_ROOT
+
+sed -i 's,blfs-xml,'$BLFS_XML',' update_book.sh
+sed -i 's,blfs-xml,'$BLFS_XML',' libs/book.xsl
+
+./update_book.sh $BLFS_XML get $TREE
+# make
+