Author: pierre
Date: Thu May 8 09:05:31 2014
New Revision: 3794
Log:
Make the use of branches clearer, and allow branches to be used
for CLFS
Modified:
jhalfs/trunk/Config.in
jhalfs/trunk/jhalfs
Modified: jhalfs/trunk/Config.in
==============================================================================
--- jhalfs/trunk/Config.in Thu May 8 08:51:53 2014 (r3793)
+++ jhalfs/trunk/Config.in Thu May 8 09:05:31 2014 (r3794)
@@ -65,12 +65,14 @@
endchoice
config BRANCH_ID
- string "Book Version (mandatory)"
+ string "Stable Version or branch (preceded by branch-)"
default "**EDIT ME**"
depends BRANCH
help
- #-- A list of valid branches and stable book IDs is
available here.
+ #-- A list of valid branches and stable book IDs is
available here:
#
http://wiki.linuxfromscratch.org/alfs/wiki/SupportedBooks
+ # Enter branch-XXX for branch XXX, and just YYY for
tag YYY or
+ # stable YYY version
config BOOK
string "Loc of working copy (mandatory)"
Modified: jhalfs/trunk/jhalfs
==============================================================================
--- jhalfs/trunk/jhalfs Thu May 8 08:51:53 2014 (r3793)
+++ jhalfs/trunk/jhalfs Thu May 8 09:05:31 2014 (r3794)
@@ -161,7 +161,7 @@
development )
case $PROGNAME in
clfs* ) TREE="" ;;
- *) TREE=trunk/BOOK ;;
+ * ) TREE=trunk/BOOK ;;
esac
LFSVRS=development
;;
@@ -169,8 +169,16 @@
echo " Please rerun make and fix the configuration."
exit 2 ;;
branch-* )
- LFSVRS=${BRANCH_ID}
- TREE=branches/${BRANCH_ID#branch-}/BOOK
+ case $PROGNAME in
+ lfs )
+ LFSVRS=${BRANCH_ID}
+ TREE=branches/${BRANCH_ID#branch-}/BOOK
+ ;;
+ clfs* )
+ LFSVRS=${BRANCH_ID}
+ TREE=${BRANCH_ID#branch-}
+ ;;
+ esac
;;
* )
case $PROGNAME in
--
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page
