r3679 - in jhalfs/branches/ablfs: . common common/libs

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Sat Mar 23 06:51:58 PDT 2013


Author: pierre
Date: Sat Mar 23 06:51:58 2013
New Revision: 3679

Log:
Merge trunk r3603, 3648, 3673, 3677

Modified:
   jhalfs/branches/ablfs/README
   jhalfs/branches/ablfs/common/common-functions
   jhalfs/branches/ablfs/common/libs/func_check_version.sh
   jhalfs/branches/ablfs/common/makefile-functions

Modified: jhalfs/branches/ablfs/README
==============================================================================
--- jhalfs/branches/ablfs/README	Thu Mar 21 04:27:50 2013	(r3678)
+++ jhalfs/branches/ablfs/README	Sat Mar 23 06:51:58 2013	(r3679)
@@ -105,9 +105,6 @@
        - Give the user read and write privileges over the $TRACKING_DIR
          directory and the files that it contains.
 
-       - If you think that you may need the libxml2/libxslt Python modules,
-         remove the libxml2 and libxslt entries found in $TRACKING_FILE.
-
        - Configure sudo, adding the needed privileges for the user. For
          newer sudo version, do not forget to add a line Defaults secure_path=
          containing /sbin and /usr/sbin (in /etc/sudoers), otherwise some

Modified: jhalfs/branches/ablfs/common/common-functions
==============================================================================
--- jhalfs/branches/ablfs/common/common-functions	Thu Mar 21 04:27:50 2013	(r3678)
+++ jhalfs/branches/ablfs/common/common-functions	Sat Mar 23 06:51:58 2013	(r3679)
@@ -71,7 +71,7 @@
       if [ -d $BUILDDIR/sys ] ; then
         sudo rmdir $BUILDDIR/sys || exit 1
       fi
-      sudo rm -rf $BUILDDIR/{bin,boot,dev,etc,home,lib{,64},media,mnt}
+      sudo rm -rf $BUILDDIR/{bin,boot,dev,etc,home,lib{,64},media,mnt,run}
       sudo rm -rf $BUILDDIR/{opt,root,sbin,srv,tmp,tools,cross-tools,usr,var}
       if [[ "${BLFS_TOOL}" = "y" ]] ; then 
         sudo rm -rf $BUILDDIR/$BLFS_ROOT

Modified: jhalfs/branches/ablfs/common/libs/func_check_version.sh
==============================================================================
--- jhalfs/branches/ablfs/common/libs/func_check_version.sh	Thu Mar 21 04:27:50 2013	(r3678)
+++ jhalfs/branches/ablfs/common/libs/func_check_version.sh	Sat Mar 23 06:51:58 2013	(r3679)
@@ -61,7 +61,7 @@
   set -- $tst_version # Set positional parameters to test version values
   # Values beginning with zero are taken as octal, so that for example
   # 2.07.08 gives an error because 08 cannot be octal. The ## stuff supresses
-  # leading sero's
+  # leading zero's
   major=${1##*(0)}; minor=${2##*(0)}; revision=${3##*(0)}
   #
   # Compare against minimum acceptable version..

Modified: jhalfs/branches/ablfs/common/makefile-functions
==============================================================================
--- jhalfs/branches/ablfs/common/makefile-functions	Thu Mar 21 04:27:50 2013	(r3678)
+++ jhalfs/branches/ablfs/common/makefile-functions	Sat Mar 23 06:51:58 2013	(r3679)
@@ -33,9 +33,8 @@
 define echo_SU_request
   @echo $(BOLD)--------------------------------------------------------------------------------
   @echo $(BLUE)$@
-  @echo $(WHITE)ROOT privilege is required to perform a number commands
-  @echo sudo will request a password to all high privilege cmds to execute correctly
-endef
+  @echo $(WHITE)ROOT privilege is required to perform a number of commands
+  @echo sudo will request a password in order to execute all high privilege commands
 
 define echo_SULUSER_request
   @echo $(BOLD)--------------------------------------------------------------------------------



More information about the alfs-log mailing list