Changeset 978286a

Timestamp:

02/28/2022 12:30:53 PM (2 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, trunk

Children:

16cef03

Parents:

3faf067

Message:

Remove legacy: remove everything about HLFS

Files:

• Config.in (modified) (2 diffs)
• FUNCTION_LIST (modified) (1 diff)
• HLFS/hlfs.xsl (deleted)
• HLFS/master.sh (deleted)
• README (modified) (3 diffs)
• README.HLFS (deleted)
• common/libs/func_book_parser (modified) (4 diffs)
• common/libs/func_check_version.sh (modified) (1 diff)
• common/libs/func_download_pkgs (modified) (1 diff)
• common/libs/func_validate_configs.sh (modified) (4 diffs)
• common/libs/func_wrt_Makefile (modified) (2 diffs)
• common/packages.xsl (modified) (2 diffs)
• common/urls.xsl (modified) (2 diffs)
• jhalfs (modified) (2 diffs)

Config.in

@@ -663 +663 @@
         default    "lfs"    if BOOK_LFS || BOOK_LFS_SYSD
         default    "clfs"    if BOOK_CLFS || BOOK_CLFS2 || BOOK_CLFS3
-        default "hlfs"    if BOOK_HLFS
 
     config    LGROUP
@@ -777 +776 @@
             #  out. If you select 'n' here, the commented test instructions
             #  do not stop on test suite failures.
-            #
-            #  HLFS and CLFS have no testsuites available in the
-            #  temporary tools phase
 
     menu "Test settings"

FUNCTION_LIST

@@ -241 +241 @@
 Description:
 --------------------------------------------------------------------------
-process_toolchain():
-From HLFS/master.sh.
-Description:  embryo,cocoon and butterfly need special handling
---------------------------------------------------------------------------
-chapter3_Makefiles():
-From HLFS/master.sh.
-Description:  Initialization of the system
---------------------------------------------------------------------------
-chapter5_Makefiles():
-From HLFS/master.sh.
-Description:  Bootstrap or temptools phase
---------------------------------------------------------------------------
-chapter6_Makefiles():
-From HLFS/master.sh.
-Description:  sysroot or chroot build phase
---------------------------------------------------------------------------
-chapter7_Makefiles():
-From HLFS/master.sh.
-Description:  Create a bootable system.. kernel, bootscripts..etc
---------------------------------------------------------------------------
-build_Makefile():
-From HLFS/master.sh.
-Description:  Construct a Makefile from the book scripts
---------------------------------------------------------------------------
 simple_error():
 From jhalfs.

README

@@ -27 +27 @@
     - README.PACKAGE_MANAGEMENT: instructions to use package management during
       the build (only for LFS, patches welcome for CLFS...)
-    - README.HLFS: very short file explaining why you cannot use HLFS with the
-      present tool version.
 
      Other sources of information are the context help in the menu interface,
@@ -182 +180 @@
               /clfs3.xsl
 
-        /HLFS/master.sh
-             /hlfs.xsl
-
         /LFS/master.sh
             /lfs.xsl
@@ -220 +215 @@
         README.BLFS
         README.CLFS
-        README.HLFS
         README.CUSTOM
         TODO

common/libs/func_book_parser

@@ -101 +101 @@
       ;;
 
-    hlfs)
-        echo -n " ${L_arrow}${BOLD}$MODEL + $KERNEL${R_arrow} HLFS flavour... "
-        xsltproc --nonet                                                \
-                 --xinclude                                             \
-                 --stringparam model "$MODEL"                           \
-                 --stringparam kernel "$KERNEL"                         \
-                 --stringparam testsuite "$TEST"                        \
-                 --stringparam bomb-testsuite "$BOMB_TEST"              \
-                 --stringparam features                                 \
-                     x$SSP$ASLR$PAX$HARDENED_TMP$WARNINGS$MISC$BLOWFISH \
-                 --stringparam timezone "$TIMEZONE"                     \
-                 --stringparam page "$PAGE"                             \
-                 --stringparam lang "$LANG"                             \
-                 --stringparam grsecurity_host "$GRSECURITY_HOST"       \
-                 --output ./${PROGNAME}-commands/                       \
-                 $XSL                                                   \
-                 $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
-      ;;
     lfs)
         echo -n " ${L_arrow}${BOLD}LFS${R_arrow} build... "
@@ -232 +214 @@
                  $BOOK/BOOK/materials/${ARCH}-chapter.xml >>$LOGDIR/$LOG 2>&1
       ;;
-    hlfs)
-        xsltproc --nonet --xinclude             \
-                 --stringparam model "$MODEL"   \
-                 --stringparam kernel "$KERNEL" \
-                 --output pkg_tarball_list      \
-                 packages.xsl                   \
-                 $BOOK/chapter04/chapter04.xml >>$LOGDIR/$LOG 2>&1
-      ;;
     lfs)
         # lfs does not use the package list anymore
@@ -263 +237 @@
                -o chroot-scripts/ chroot.xsl \
                $BOOK/BOOK/${ARCH}-index.xml >> $LOGDIR/$LOG 2>&1
-      ;;
-    hlfs)
-      xsltproc --nonet --xinclude \
-               -o chroot-scripts/ chroot.xsl \
-               $BOOK/index.xml >> $LOGDIR/$LOG 2>&1
       ;;
     lfs)
@@ -294 +263 @@
                -o kernfs-scripts/ kernfs.xsl \
                $BOOK/BOOK/${ARCH}-index.xml >> $LOGDIR/$LOG 2>&1
-      ;;
-    hlfs)
-      xsltproc --nonet --xinclude \
-               -o kernfs-scripts/ kernfs.xsl \
-               $BOOK/index.xml >> $LOGDIR/$LOG 2>&1
       ;;
     lfs)

common/libs/func_check_version.sh

@@ -93 +93 @@
   export LC_ALL
 
-  # LFS/HLFS/CLFS prerequisites
+  # LFS/CLFS prerequisites
   if [ -n "$MIN_Linux_VER" ]; then
     check_version "$MIN_Linux_VER"     "`uname -r`"          "KERNEL"

common/libs/func_download_pkgs

@@ -147 +147 @@
         echo " ...OK"
       ;;
-    hlfs)
-        echo -n "Creating HLFS <${MODEL}> + <${KERNEL}> specific URLs file"
-        xsltproc --nonet --xinclude             \
-                 --stringparam server "$SERVER" \
-                 --stringparam family lfs       \
-                 --stringparam model "$MODEL"   \
-                 --stringparam kernel "$KERNEL" \
-                 -o $BUILDDIR/sources/urls.lst  \
-                 urls.xsl                       \
-                 $BOOK/chapter04/chapter04.xml >>$LOGDIR/$LOG 2>&1
-        echo " ...OK"
-      ;;
     lfs)
         echo -n "Creating LFS specific URLs file"

common/libs/func_validate_configs.sh

@@ -11 +11 @@
     input vars: none
     externals:  color constants
-                PROGNAME (lfs,hlfs,clfs,clfs2,clfs3,blfs)
+                PROGNAME (lfs,clfs,clfs2,clfs3,blfs)
     modifies:   none
     returns:    nothing
@@ -31 +31 @@
   # BOOK Settings by book
   local -r   LFS_book="$BOOK_common INITSYS BLFS_TOOL"
-  #local -r HLFS_added="SET_SSP SET_ASLR SET_PAX SET_HARDENED_TMP SET_WARNINGS \
-  #                     SET_MISC SET_BLOWFISH"
-  local -r HLFS_added=""
-  local -r  HLFS_book="$BOOK_common BLFS_TOOL MODEL KERNEL GRSECURITY_HOST $HLFS_added"
   local -r  CLFS_book="$BOOK_common BLFS_TOOL METHOD $BOOK_clfsX TARGET32 BOOT_CONFIG"
   local -r CLFS2_book="$BOOK_common BLFS_TOOL        $BOOK_clfsX"
@@ -41 +37 @@
   # Build Settings by book
   local -r   LFS_build="$BUILD_chroot NCURSES5 DEL_LA_FILES $BUILD_common PKGMNGT FULL_LOCALE WRAP_INSTALL"
-  local -r  HLFS_build="$BUILD_chroot $BUILD_common"
   local -r  CLFS_build="$BUILD_chroot $BUILD_common"
   local -r CLFS2_build="STRIP         $BUILD_common"
@@ -51 +46 @@
   # Full list of books settings
   local -r   lfs_PARAM_LIST="$LFS_book   $GENERAL_common $LFS_build $LFS_system  $ADVANCED_chroot N_PARALLEL REALSBU SAVE_CH5 $ADVANCED_common"
-  local -r  hlfs_PARAM_LIST="$HLFS_book  $GENERAL_common $HLFS_build  $ADVANCED_chroot $ADVANCED_common"
   local -r  clfs_PARAM_LIST="$CLFS_book  $GENERAL_common $CLFS_build  $ADVANCED_chroot $ADVANCED_common"
   local -r clfs2_PARAM_LIST="$CLFS2_book $GENERAL_common $CLFS2_build                  $ADVANCED_common"

common/libs/func_wrt_Makefile

@@ -83 +83 @@
          ;;
      linux-headers)
-         if [[ "${PROGNAME}" = "lfs" ]] || [[ "${PROGNAME}" = "hlfs" ]] || [[ "${PROGNAME}" = "clfs" ]]; then
+         if [[ "${PROGNAME}" = "lfs" ]] || [[ "${PROGNAME}" = "clfs" ]]; then
            # Uses kernel headers directly
            echo $(grep "^linux-[[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 )
@@ -321 +321 @@
     clfs2 ) MOUNT_ENV="CLFS" ;;
     clfs3 ) MOUNT_ENV="CLFS" ;;
-    hlfs  ) MOUNT_ENV="HLFS" ;;
     *) echo "undefined progname $PROGNAME"; exit 1 ;;
   esac

common/packages.xsl

@@ -5 +5 @@
 
   <xsl:output method="text"/>
-
-  <!-- The libc model used for HLFS -->
-  <xsl:param name="model" select="'glibc'"/>
-
-  <!-- The kernel series used for HLFS -->
-  <xsl:param name="kernel" select="'2.6'"/>
 
   <!-- Should we include a package manager? -->
@@ -20 +14 @@
   <xsl:template match="/">
     <xsl:apply-templates
-         select="//varlistentry[(@condition=$model   or not(@condition)) and
-                                (@revision=$revision or not(@revision))  and
-                                (@vendor=$kernel     or not(@vendor))]
+         select="//varlistentry[(@revision=$revision or not(@revision))  and
                       //para[contains(string(),'Download:')]"/>
     <xsl:if test="$pkgmngt='y'">

common/urls.xsl

@@ -11 +11 @@
   <!-- The book family (lfs or clfs). Needed to use the proper FTP path. -->
   <xsl:param name="family">lfs</xsl:param>
-
-  <!-- The libc model used for HLFS -->
-  <xsl:param name="model" select="'glibc'"/>
-
-  <!-- The kernel series used for HLFS -->
-  <xsl:param name="kernel" select="'2.6'"/>
 
   <!-- Do we use a package manager? -->
@@ -37 +31 @@
       name, the next test must be fixed to match it also. Skip possible
       duplicated URLs due that may be splitted for PDF output -->
-    <xsl:if test="(ancestor::varlistentry[@condition=$model]
-                  or not(ancestor::varlistentry[@condition])) and
-                  (ancestor::varlistentry[@vendor=$kernel]
-                  or not(ancestor::varlistentry[@vendor])) and
-                  (contains(@url, '.bz2') or contains(@url, '.tar.gz') or
+    <xsl:if test="(contains(@url, '.bz2') or contains(@url, '.tar.gz') or
                   contains(@url, '.tgz') or contains(@url, '.patch') or
                   contains(@url, '.xz') or contains(@url, '.lzma')) and

jhalfs

@@ -225 +225 @@
         TREE=${BRANCH_ID}
         ;;
-      hlfs )
-        LFSVRS=${BRANCH_ID}
-        TREE=tags/${BRANCH_ID}/BOOK
-        ;;
       clfs* )
         LFSVRS=${BRANCH_ID}
@@ -395 +391 @@
   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