On Sep 24, 2013, at 1:41 PM, William Harrington wrote:
> I looked more into this and starting with 1.2 we do have a clfs-1.2
> branch with all of the right info.
>
> It looks like I need to create a 2.0 branch and push my xml changes to
> it.
>
> So then when someone wants to use the 1.2 or 2.0 branch they can use
> clfs-2.0 or clfs-1.2 for the branch number.
>
> I'll need to update our book download commands to reflect the changes.
>
> The command will still be the same. git checkout clfs-1.2 for
> example.
>
> I'm going to add the 2.0 branch today.
Greetings Pierre,
We no longer are going to use the tags. We are going to use the branch.
The following changes should fix this: I've tested with the clfs-2.0
branch and the clfs-1.2 branch.
Index: common/libs/func_book_parser
===================================================================
--- common/libs/func_book_parser (revision 3727)
+++ common/libs/func_book_parser (working copy)
@@ -31,13 +31,12 @@
if [ ! $TREE == "development" ]; then
cd ${PROGNAME}-$LFSVRS
echo "Checking out $LFSVRS at $PWD in $TREE"
- git checkout -b ${TREE} ${TREE} >>$LOGDIR/$LOG 2>&1
+ git checkout ${TREE} >>$LOGDIR/$LOG 2>&1
fi
else
cd ${PROGNAME}-$LFSVRS
case $PROGNAME in
- clfs*) git checkout master >>$LOGDIR/$LOG 2>&1
- git pull >>$LOGDIR/$LOG 2>&1
+ clfs*) git pull >>$LOGDIR/$LOG 2>&1
if [ ! $TREE == "development" ]; then
git checkout ${TREE} >>$LOGDIR/$LOG 2>&1
fi
Index: jhalfs
===================================================================
--- jhalfs (revision 3727)
+++ jhalfs (working copy)
@@ -179,7 +179,7 @@
;;
clfs* )
LFSVRS=${BRANCH_ID}
- TREE=tags/clfs-${BRANCH_ID}
+ TREE=clfs-${BRANCH_ID}
;;
* )
esac
Sincerely,
William Harrington
--
http://linuxfromscratch.org/mailman/listinfo/alfs-discuss
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
