Le 22/09/2013 07:27, William Harrington a écrit :
> When using a branch which is already checked out, need to move to master,
> pull, and then checkout the branch again
>
> So on the first time downloaded, create the branch and checkout that branch
> On every pull since then, move to the master branch, pull, then checkout
> the branch. I think that is the correct way to do it:
>
> Index: func_book_parser
> ===================================================================
> --- func_book_parser (revision 3725)
> +++ func_book_parser (working copy)
> @@ -31,12 +31,17 @@
> if [ ! $TREE == "development" ]; then
> cd ${PROGNAME}-$LFSVRS
> echo "Checking out $LFSVRS at $PWD in $TREE"
> - git checkout ${TREE} >>$LOGDIR/$LOG 2>&1
> + git checkout -b ${TREE} ${TREE} >>$LOGDIR/$LOG 2>&1
> fi
> else
> cd ${PROGNAME}-$LFSVRS
> case $PROGNAME in
> - clfs*) git pull >>$LOGDIR/$LOG 2>&1 ;;
> + clfs*) git checkout master >> $LOGDIR/$LOG 2>&1
> + git pull >>$LOGDIR/$LOG 2>&1
> + if [ ! ${TREE} == "development" ]; then
> + git checkout ${TREE} >>$LOGDIR/$LOG 2>&1
> + fi
> + ;;
> lfs | hlfs) svn up >>$LOGDIR/$LOG 2>&1 ;;
> *) ;;
> esac
>
> Sincerely,
>
> William Harrington
>
Seems todo the job.
Committed at rev 3726.
BTW, some patch locations seem to be wrong for that version (2.0.0)
I guess 'dev' should be replaced with '2.0.0' in
http://patches.cross-lfs.org/dev/eglibc-2.15-fixes-1.patch
and
http://patches.cross-lfs.org/dev/iputils-s20101006-doc-1.patch
Also the md5sum for iana-etc-2.30-get_fix-1.patch seems to be wrong.
Regards
Pierre
--
http://linuxfromscratch.org/mailman/listinfo/alfs-discuss
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
