zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make the use of branches clearer, and allow branches to be used

Browse source 
for CLFS
This commit is contained in:
Pierre Labastie 2014-05-08 16:05:31 +00:00
parent c6ee8eacba
commit c4ad7bfd4e
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Config.in
View file

@ -65,12 +65,14 @@ menu "--- BOOK Settings"
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)"

14
jhalfs
View file

@ -161,7 +161,7 @@ case $BRANCH_ID in
development )
case $PROGNAME in
clfs* ) TREE="" ;;
*) TREE=trunk/BOOK ;;
* ) TREE=trunk/BOOK ;;
esac
LFSVRS=development
;;
@ -169,8 +169,16 @@ case $BRANCH_ID in
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