Changeset 60b56fd

Timestamp:

03/28/2006 08:11:42 PM (19 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

64cc345

Parents:

2db0869

Message:

Some text output and inline comments fixes.
Deleting temporal files used to create the packages and patches files.

File:

• common/common-functions (modified) (20 diffs)

common/common-functions

@@ -164 +164 @@
 
     Please format the partition mounted on \$BUILDDIR or set
-    a different build directory before running jhahlfs.
+    a different build directory before running jhalfs-X.
 ${OFF}
 ${DD_BORDER}
@@ -184 +184 @@
 echo \"Attempting to continue.\" >&2"
 
-HEADER="# This file is automatically generated by jhalfs
+HEADER="# This file is automatically generated by jhalfs-X
 # DO NOT EDIT THIS FILE MANUALLY
 #
@@ -209 +209 @@
 
 #----------------------------------#
-wrt_unpack() {                     #
+wrt_unpack() {                     # Unpack and set 'ROOT' var
 #----------------------------------#
   local FILE=$1
@@ -238 +238 @@
 
 #=============================#
-wrt_unpack3() {               # Unpack and set 'ROOT' var
+wrt_unpack3() {               #
 #=============================#
   local FILE=$1
@@ -266 +266 @@
 
 #----------------------------------#
-wrt_run_as_su() {                  #
+wrt_run_as_su() {                  # header to log file, execute script, footer to log file
 #----------------------------------#
   local this_script=$1
@@ -281 +281 @@
 
 #==================================#
-wrt_run_as_lfs() {                 # header to log file, execute script, footer to log file
+wrt_run_as_lfs() {                 #
 #==================================#
   local this_script=$1
@@ -311 +311 @@
 
 #=============================#
-wrt_run_as_root2() {   # Some scripts must be run as root..
+wrt_run_as_root2() {          # Some scripts must be run as root..
 #=============================#
   local this_script=$1
@@ -433 +433 @@
     # Test to make sure we're running the build as root
     if [ "$UID" != "0" ] ; then
-      echo "You must be logged in as root to successfully build LFS."
+      echo "You must be logged in as root to successfully build the system."
       exit 1
     fi
     # Build the system
     if [ -e $MKFILE ] ; then
-      echo -ne "Building the LFS system...\n"
+      echo -ne "Building the system...\n"
       cd $JHALFSDIR && make -f ${PROGNAME}-Makefile
       echo -ne "done\n"
@@ -458 +458 @@
     # Test to make sure that the build directory was populated by jhalfs
     if [ ! -d $JHALFSDIR ] || [ ! -d $BUILDDIR/sources ] ; then
-      echo "Looks like $BUILDDIR was not populated by a previous jhalfs run."
+      echo "Looks like $BUILDDIR was not populated by a previous jhalfs-X run."
       exit 1
     else
@@ -492 +492 @@
           exit 1 ;;
     esac
-    # Grab a fresh LFS book if it's missing, otherwise, update it from the
+    # Grab a fresh book if it's missing, otherwise, update it from the
     # repo. If we've already extracted the commands, move on to getting the
     # sources.
@@ -513 +513 @@
     else
       case $LFSVRS in
-        development)
+        development)
            svn co $SVN/${svn_root}/trunk/BOOK ${PROGNAME}-$LFSVRS >>$LOGDIR/$LOG 2>&1 ;;
-        alphabetical)
+        alphabetical)
            svn co $SVN/${svn_root}/branches/$LFSVRS/BOOK ${PROGNAME}-$LFSVRS >>$LOGDIR/$LOG 2>&1 ;;
-        udev_update)
+        udev_update)
            svn co $SVN/LFS/branches/$LFSVRS/BOOK lfs-$LFSVRS >>$LOGDIR/$LOG 2>&1 ;;
       esac
@@ -552 +552 @@
   case ${PROGNAME} in
     hlfs)
-         echo -n "Creating the ${L_arrow}${BOLD}HLFS${R_arrow} specific patcheslist_.wget file"
+         echo -n "Creating the HLFS ${L_arrow}${BOLD}$MODEL${R_arrow} specific patches file"
          xsltproc --nonet \
                   --xinclude \
@@ -568 +568 @@
 
     clfs)  # Pull out a list of arch specific patches
-         echo -n "Creating CLFS ${L_arrow}${BOLD}$ARCH${R_arrow} specific patcheslist_.wget file"
+         echo -n "Creating CLFS ${L_arrow}${BOLD}$ARCH${R_arrow} specific patches file"
          xsltproc -xinclude  \
                   -o patcheslist_.wget \
@@ -587 +587 @@
                    -e 's/uclibc/uClibc/'`
   done
+
+  rm -f patcheslist_.wget
 
   echo " ...OK"
@@ -627 +629 @@
       ;;
     hlfs)
-        echo -n " ${L_arrow}${BOLD}$MODEL${R_arrow} HLFS architecture"
+        echo -n " ${L_arrow}${BOLD}$MODEL${R_arrow} HLFS libc implementation"
         xsltproc --nonet \
                  --xinclude \
@@ -699 +701 @@
       # We only want a list arch specific files..
       # Unfortunately this script produces URL's which must be converted to a std format
-      echo -n "Creating CLFS ${L_arrow}${BOLD}${ARCH}${R_arrow} specific packageslist_.wget file"
+      echo -n "Creating CLFS ${L_arrow}${BOLD}${ARCH}${R_arrow} specific packages file"
       xsltproc -xinclude  \
                -o packageslist_.wget \
@@ -720 +722 @@
                        -e 's/"//g'`
      done
+
+     rm -f packageslist_.wget packages.tmp
+
      echo " ...OK"
      ;;
 
     hlfs)
-      echo -n "Creating <${PROGNAME}> specific packageslist_.wget file"
+      echo -n "Creating <${PROGNAME}> specific packages file"
       grep "\-version" $BOOK/general.ent | sed -e 's@<!ENTITY @@' \
                                                -e 's@">@"@' \
@@ -732 +737 @@
 
     lfs)
-      echo -n "Creating <${PROGNAME}> specific packageslist_.wget file"
+      echo -n "Creating <${PROGNAME}> specific packages file"
       grep "\-version" $BOOK/general.ent | sed -e 's@<!ENTITY @@' \
                                                -e 's@">@"@' \
@@ -747 +752 @@
   fi
 
-  # There is no useful patches.ent file so we will create one.
+  # Create the patches file
   case "${PROGNAME}" in
     hlfs)
@@ -862 +867 @@
       VRS=`echo $i | sed -e 's/.* //' -e 's/"//g'`
       case $PKG in
-        tcl)         FILE="$PKG$VRS-src.tar.bz2"  ;;
+        tcl)         FILE="$PKG$VRS-src.tar.bz2"  ;;
         vim-lang)    PKG="vim"
                      FILE="vim-$VRS-lang.tar.bz2" ;;
-        udev-config) PKG="udev"
+        udev-config) PKG="udev"
                      FILE="$VRS"                  ;;
-        *)           FILE="$PKG-$VRS.tar.bz2"     ;;
+        *)           FILE="$PKG-$VRS.tar.bz2"     ;;
       esac
       download $PKG $FILE