Changeset 0fa52f2 for jhalfs

Timestamp:

03/01/2022 08:09:30 PM (2 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, trunk

Children:

9a86aa58

Parents:

4c36783

Message:

Remove legacy: Remove almost all occurrences of CLFS/clfs

File:

• jhalfs (modified) (5 diffs)

jhalfs

@@ -198 +198 @@
 case $BRANCH_ID in
   development )
-    case $PROGNAME in
-      clfs* ) TREE="" ;;
-          * ) TREE=trunk ;;
-    esac
+    TREE=trunk
     LFSVRS=development
     ;;
@@ -208 +205 @@
             exit 2 ;;
   branch-* )
-    case $PROGNAME in
-      lfs )
-        LFSVRS=${BRANCH_ID}
-        TREE=${BRANCH_ID#branch-}
-        ;;
-      clfs* )
-        LFSVRS=${BRANCH_ID}
-        TREE=${BRANCH_ID#branch-}
-        ;;
-    esac
+    LFSVRS=${BRANCH_ID}
+    TREE=${BRANCH_ID#branch-}
     ;;
   * )
-    case $PROGNAME in
-      lfs )
-        LFSVRS=${BRANCH_ID}
-        TREE=${BRANCH_ID}
-        ;;
-      clfs* )
-        LFSVRS=${BRANCH_ID}
-        TREE=clfs-${BRANCH_ID}
-        ;;
-      * )
-    esac
+    LFSVRS=${BRANCH_ID}
+    TREE=${BRANCH_ID}
     ;;
 esac
@@ -240 +220 @@
 #--- Envars not sourced from configuration
 # shellcheck disable=SC2034
-case $PROGNAME in
-  clfs ) declare -r GIT="git://git.clfs.org/cross-lfs" ;;
-  clfs2 ) declare -r GIT="git://git.clfs.org/clfs-sysroot" ;;
-  clfs3 ) declare -r GIT="git://git.clfs.org/clfs-embedded" ;;
-  *) declare -r GIT="git://git.linuxfromscratch.org" ;;
-esac
-
+declare -r GIT="git://git.linuxfromscratch.org"
 declare -r LOG=000-masterscript.log
 
@@ -385 +359 @@
   cp "$COMMON_DIR"/{packages.xsl,chroot.xsl,kernfs.xsl} "$JHALFSDIR/"
 
-# Fix the XSL book parser
-  case $PROGNAME in
-    clfs* ) sed 's,FAKEDIR,'"${BOOK}/BOOK"',' "${PACKAGE_DIR}/${XSL}" > "${JHALFSDIR}/${XSL}" ;;
-    * ) ;;
-  esac
   export XSL=$JHALFSDIR/${XSL}
 
@@ -460 +429 @@
 # When regenerating the Makefile, we need to know also the
 # canonical book version
-  case $PROGNAME in
-    clfs* )
-      VERSION=$(xmllint --noent "$BOOK/prologue/$ARCH/bookinfo.xml" 2>/dev/null | grep subtitle | sed -e 's/^.*ion //'  -e 's/<\/.*//') ;;
-    lfs)
-      VERSION=$(grep 'echo.*lfs-release' "$JHALFSDIR/prbook.xml" | sed 's/.*echo[ ]*\([^ ]*\).*/\1/')
-      ;;
-    *)
-      VERSION=$(xmllint --noent "$BOOK/prologue/bookinfo.xml" 2>/dev/null | grep subtitle | sed -e 's/^.*ion //'  -e 's/<\/.*//') ;;
-  esac
+VERSION=$(grep 'echo.*lfs-release' "$JHALFSDIR/prbook.xml" | sed 's/.*echo[ ]*\([^ ]*\).*/\1/')
 fi