Make the use of branches clearer, and allow branches to be used
for CLFS
This commit is contained in:
parent
c6ee8eacba
commit
c4ad7bfd4e
2 changed files with 15 additions and 5 deletions
|
@ -65,12 +65,14 @@ menu "--- BOOK Settings"
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
config BRANCH_ID
|
config BRANCH_ID
|
||||||
string "Book Version (mandatory)"
|
string "Stable Version or branch (preceded by branch-)"
|
||||||
default "**EDIT ME**"
|
default "**EDIT ME**"
|
||||||
depends BRANCH
|
depends BRANCH
|
||||||
help
|
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
|
# 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
|
config BOOK
|
||||||
string "Loc of working copy (mandatory)"
|
string "Loc of working copy (mandatory)"
|
||||||
|
|
8
jhalfs
8
jhalfs
|
@ -169,9 +169,17 @@ case $BRANCH_ID in
|
||||||
echo " Please rerun make and fix the configuration."
|
echo " Please rerun make and fix the configuration."
|
||||||
exit 2 ;;
|
exit 2 ;;
|
||||||
branch-* )
|
branch-* )
|
||||||
|
case $PROGNAME in
|
||||||
|
lfs )
|
||||||
LFSVRS=${BRANCH_ID}
|
LFSVRS=${BRANCH_ID}
|
||||||
TREE=branches/${BRANCH_ID#branch-}/BOOK
|
TREE=branches/${BRANCH_ID#branch-}/BOOK
|
||||||
;;
|
;;
|
||||||
|
clfs* )
|
||||||
|
LFSVRS=${BRANCH_ID}
|
||||||
|
TREE=${BRANCH_ID#branch-}
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
* )
|
* )
|
||||||
case $PROGNAME in
|
case $PROGNAME in
|
||||||
lfs )
|
lfs )
|
||||||
|
|
Reference in a new issue