Author: pierre
Date: Wed Aug  9 07:06:53 2017
New Revision: 3991

Log:
Merge  trunk r3990

Modified:
   jhalfs/branches/2.4/install-blfs-tools.sh
   jhalfs/branches/2.4/jhalfs

Modified: jhalfs/branches/2.4/install-blfs-tools.sh
==============================================================================
--- jhalfs/branches/2.4/install-blfs-tools.sh   Wed Aug  9 07:00:58 2017        
(r3990)
+++ jhalfs/branches/2.4/install-blfs-tools.sh   Wed Aug  9 07:06:53 2017        
(r3991)
@@ -116,9 +116,11 @@
 [[ $VERBOSITY > 0 ]] && echo "${SD_BORDER}${nl_}"
 
 case $BLFS_BRANCH_ID in
-  development )  BLFS_TREE=trunk/BOOK ;;
-     branch-* )  BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-} ;;
-            * )  BLFS_TREE=tags/${BLFS_BRANCH_ID} ;;
+     development )  BLFS_TREE=trunk/BOOK ;;
+      branch-6.* )  BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-}/BOOK ;;
+        branch-* )  BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-} ;;
+6.2* | 7.* | 8.* )  BLFS_TREE=tags/${BLFS_BRANCH_ID} ;;
+               * )  BLFS_TREE=tags/${BLFS_BRANCH_ID}/BOOK ;;
 esac
 
 # Check for build prerequisites.

Modified: jhalfs/branches/2.4/jhalfs
==============================================================================
--- jhalfs/branches/2.4/jhalfs  Wed Aug  9 07:00:58 2017        (r3990)
+++ jhalfs/branches/2.4/jhalfs  Wed Aug  9 07:06:53 2017        (r3991)
@@ -173,7 +173,7 @@
       lfs )
         LFSVRS=${BRANCH_ID}
         TREE=branches/${BRANCH_ID#branch-}
-        if [ ${BRANCH_ID#branch-} = 6 ]; then
+        if [ ${BRANCH_ID:7:1} = 6 ]; then
             TREE=${TREE}/BOOK
         fi
         ;;
@@ -292,9 +292,9 @@
            *EDIT* )  echo " You forgot to set the BLFS branch or stable book 
version."
                      echo " Please rerun make and fix the configuration."
                      exit 2 ;;
-   branch-systemd )  BLFS_TREE=branches/systemd ;;
-         branch-* )  BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-}/BOOK ;;
-       6.2* | 7.* )  BLFS_TREE=tags/${BLFS_BRANCH_ID} ;;
+       branch-6.* )  BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-}/BOOK ;;
+         branch-* )  BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-} ;;
+  6.2* | 7.* | 8.*)  BLFS_TREE=tags/${BLFS_BRANCH_ID} ;;
                 * )  BLFS_TREE=tags/${BLFS_BRANCH_ID}/BOOK ;;
     esac
   fi
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

Reply via email to