Changeset 92b7cb8 for jhalfs

Timestamp:

09/14/2013 10:13:04 AM (11 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, new_features, trunk

Children:

038678f

Parents:

4b1dd33

Message:

Allows to use git for downloading the CLFS book
Adds .lzma as a possible extension for a tarball in urls.xsl

File:

• jhalfs (modified) (5 diffs)

jhalfs

@@ -153 +153 @@
   development )
     case $PROGNAME in
-      clfs2 ) TREE=branches/clfs-sysroot/BOOK ;;
-      clfs3 ) TREE=branches/clfs-embedded/BOOK ;;
+      clfs* ) TREE="" ;;
            *) TREE=trunk/BOOK ;;
     esac
@@ -179 +178 @@
         TREE=tags/${BRANCH_ID}/BOOK
         ;;
-      clfs | clfs2 | clfs3)
+      clfs* )
         LFSVRS=${BRANCH_ID}
-        TREE=tags/${BRANCH_ID}
+        TREE=tags/clfs-${BRANCH_ID}
         ;;
+      * )
     esac
     ;;
@@ -273 +273 @@
 case $PROGNAME in
 # TODO: clfs is now on git
-#  clfs* ) declare -r SVN="http://svn.cross-lfs.org/svn/repos" ;;
-      * ) declare -r SVN="svn://svn.linuxfromscratch.org" ;;
+      clfs ) declare -r GIT="git://git.cross-lfs.org/cross-lfs" ;;
+      clfs2 ) declare -r GIT="git://git.cross-lfs.org/clfs-sysroot" ;;
+      clfs3 ) declare -r GIT="git://git.cross-lfs.org/clfs-embedded" ;;
+      *) declare -r SVN="svn://svn.linuxfromscratch.org" ;;
 esac
 declare -r LOG=000-masterscript.log
@@ -390 +392 @@
   #
   # Fix the XSL book parser
-  sed 's,FAKEDIR,'$BOOK',' $PACKAGE_DIR/$XSL > $JHALFSDIR/${XSL}
+  case $PROGNAME in
+    clfs* ) sed 's,FAKEDIR,'${BOOK}/BOOK',' ${PACKAGE_DIR}/${XSL} > $JHALFSDIR/${XSL} ;;
+    lfs | hlfs ) sed 's,FAKEDIR,'$BOOK',' $PACKAGE_DIR/$XSL > $JHALFSDIR/${XSL} ;;
+    * ) ;;
+  esac
   export XSL=$JHALFSDIR/${XSL}
   #
@@ -483 +489 @@
 if [[ "$REBUILD_MAKEFILE" = "y" ]] ; then
   case $PROGNAME in
-    clfs | clfs2 | clfs3 )
+    clfs* )
       VERSION=$(xmllint --noent $JHALFSDIR/$BOOK/prologue/$ARCH/bookinfo.xml 2>/dev/null | grep subtitle | sed -e 's/^.*ion //'  -e 's/<\/.*//') ;;
     *)