Author: pierre
Date: Sat Apr 1 04:05:15 2017
New Revision: 3949
Log:
Fix issue with clfs, when using
a tag in git, and not checking "Rebuild files": git pull fails because
the local repo is in "detached head" state.
- fix an issue with iputils patch in clfs-3.0.0
Modified:
jhalfs/trunk/common/libs/func_book_parser
jhalfs/trunk/common/urls.xsl
Modified: jhalfs/trunk/common/libs/func_book_parser
==============================================================================
--- jhalfs/trunk/common/libs/func_book_parser Tue Mar 28 13:13:06 2017
(r3948)
+++ jhalfs/trunk/common/libs/func_book_parser Sat Apr 1 04:05:15 2017
(r3949)
@@ -8,9 +8,18 @@
cd $JHALFSDIR
if [ -z $WORKING_COPY ] ; then
-# Check for Subversion instead of just letting the script hit 'svn' and fail.
- test `type -p svn` || eval "echo \"This feature requires Subversion.\"
- exit 1"
+# Check for Subversion or git instead of just letting the script fail.
+ case $PROGNAME in
+ lfs | hlfs)
+ test `type -p svn` || eval "echo \"This feature requires Subversion.\"
+ exit 1"
+ ;;
+ clfs*)
+ test `type -p git` || eval "echo \"This feature requires Git.\"
+ exit 1"
+ ;;
+ esac
+
echo -n "Downloading the $PROGNAME document, $LFSVRS version... "
case $PROGNAME in
@@ -31,17 +40,22 @@
echo $TREE
git clone $GIT ${PROGNAME}-$LFSVRS >>$LOGDIR/$LOG 2>&1
if [ ! $TREE == "development" ]; then
- cd ${PROGNAME}-$LFSVRS
+ pushd ${PROGNAME}-$LFSVRS > /dev/null
echo "Checking out $LFSVRS at $PWD in $TREE"
git checkout ${TREE} >>$LOGDIR/$LOG 2>&1
+ popd > /dev/null
fi
else
cd ${PROGNAME}-$LFSVRS
case $PROGNAME in
- clfs*) git pull >>$LOGDIR/$LOG 2>&1
- if [ ! $TREE == "development" ]; then
- git checkout ${TREE} >>$LOGDIR/$LOG 2>&1
- fi
+ clfs*)
+ # If the repo is in "detached head" state, git pull fails, so get
+ # back first to master:
+ 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 ;;
*) ;;
@@ -49,7 +63,7 @@
fi
echo -ne "done\n"
- else
+ else # Working copy
echo -ne "Using $BOOK as book's sources ...\n"
fi
}
Modified: jhalfs/trunk/common/urls.xsl
==============================================================================
--- jhalfs/trunk/common/urls.xsl Tue Mar 28 13:13:06 2017 (r3948)
+++ jhalfs/trunk/common/urls.xsl Sat Apr 1 04:05:15 2017 (r3949)
@@ -105,6 +105,9 @@
<xsl:when test="contains($dirname, 'udev')">
<xsl:text>udev/</xsl:text>
</xsl:when>
+ <xsl:when test="contains($dirname, 'iputils')">
+ <xsl:text>iputils/</xsl:text>
+ </xsl:when>
<xsl:otherwise>
<xsl:value-of select="$dirname"/>
<xsl:text>/</xsl:text>
--
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page
