Changes in / [ca368ad:0f7a988]

Files:

• BLFS/xsl/scripts.xsl (modified) (3 diffs)
• Config.in (modified) (8 diffs)
• LFS/lfs.xsl (modified) (3 diffs)
• LFS/master.sh (modified) (2 diffs)
• README (modified) (2 diffs)
• common/chroot.xsl (modified) (2 diffs)
• common/libs/func_book_parser (modified) (3 diffs)
• common/libs/func_download_pkgs (modified) (1 diff)
• common/libs/func_install_blfs (modified) (3 diffs)
• common/libs/func_validate_configs.sh (modified) (4 diffs)
• common/libs/func_wrt_Makefile (modified) (1 diff)
• common/run-in-cgroup.sh (deleted)
• common/urls.xsl (modified) (1 diff)
• jhalfs (modified) (3 diffs)
• optimize/optimize_functions (modified) (1 diff)

BLFS/xsl/scripts.xsl

@@ -306 +306 @@
       </xsl:when><!-- @role="package" -->
 
-      <xsl:when test="@role = 'qt5-prefix' or @role = 'qt6-prefix'">
+      <xsl:when test="@role = 'qt4-prefix' or @role = 'qt5-prefix'">
         <xsl:apply-templates select=".//screen[./userinput]"/>
       </xsl:when>
@@ -458 +458 @@
       </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="first_letter"
+                  select="translate(substring($package,1,1),
+                                    'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
+                                    'abcdefghijklmnopqrstuvwxyz')"/>
     <xsl:text>&#xA;</xsl:text>
     <xsl:value-of select="$varname"/>
@@ -473 +477 @@
     <xsl:value-of select="$varname"/>
     <xsl:text>"
-  else<!-- Download from upstream http -->
-    wget -T 30 -t 5 "</xsl:text>
-    <xsl:value-of select="$httpurl"/>
+  else&#xA;</xsl:text>
+    <!-- Download from upstream http -->
+    <xsl:if test="string-length($httpurl) &gt; 10">
+      <xsl:text>    wget -T 30 -t 5 "</xsl:text>
+      <xsl:value-of select="$httpurl"/>
+      <xsl:text>" ||&#xA;</xsl:text>
+    </xsl:if>
+    <!-- Download from upstream ftp -->
+    <xsl:if test="string-length($ftpurl) &gt; 10">
+      <xsl:text>    wget -T 30 -t 5 "</xsl:text>
+      <xsl:value-of select="$ftpurl"/>
+      <xsl:text>" ||&#xA;</xsl:text>
+    </xsl:if>
+    <!-- The FTP_SERVER mirror as a last resort -->
+    <xsl:text>    wget -T 30 -t 5 "${JH_FTP_SERVER}svn/</xsl:text>
+    <xsl:value-of select="$first_letter"/>
+    <xsl:text>/$</xsl:text>
+    <xsl:value-of select="$varname"/>
     <xsl:text>"
   fi

Config.in

@@ -1 @@
-# Check for "nproc" presence:
-config HAVE_NPROC
-    def_bool $(shell,if nproc &>/dev/null; then echo y; else echo n; fi)
-
-# Check for "cpuset controller in cgroup v2" presence:
-config HAVE_CGROUP
-    def_bool $(shell,if grep -q cpuset /sys/fs/cgroup/cgroup.controllers 2>/dev/null; then echo y; else echo n; fi)
-
 menu "BOOK Settings"
 
@@ -430 +422 @@
             #   timing out.
 
+    config SERVER
+        string "FTP mirror"
+        default "http://ftp.osuosl.org"
+        depends on GETPKG
+        help
+            #-- FTP mirror to download packages and patches if not found
+            #   in $SRC_ARCHIVE
+            #   As a last resort, the files will downloaded from upstream,
+            #   if possible.
+
     config    RUNMAKE
         bool    "Run the makefile"
@@ -449 +451 @@
 menu "Build Settings"
 depends on !BOOK_BLFS
-
-    #--- Parallelism
-    menu "Parallelism settings"
-    if HAVE_NPROC
-        config ALL_CORES
-        bool "Use all cores"
-        default y
-        help
-              If you answer y, MAKEFLAGS will be set to "-j$(nproc)" at the
-              beginning of each package script, and book instructions will not
-              be changed otherwise. This will run the scripts with the same
-              settings as in the book since version r12.0-87 included. Before
-              that version, this will run the builds with all cores, but some
-              test suites may still be run sequentially. You'll be asked for
-              a CPU set to use, so that the number of jobs can still be limited
-              in this way (useful for measuring SBU values at -j4, for
-              example).
-              If you answer n, then jhalfs will fall back to a static number
-              of cores, defined below.
-
-        if ALL_CORES && HAVE_CGROUP
-            config CPUSET
-            string "set of cpus to use, or 'all' for all cpus"
-            default "all"
-            help
-                 See "List format" in cpuset(7). Choosing cpus depend
-                 on the topology of your processors. Sometimes two
-                 hyperthreads on the same core are numbered consecutively.
-                 For example for using all cores and no hyperthreading on
-                 a Haswell, use "0,2,4,6". Other brands may have a different
-                 topology, and may require e.g. "0-3" to use the first 4 cores.
-                 If not sure, keep the default.
-        endif
-
-    endif # HAVE_NPROC
-    if !HAVE_NPROC
-        config ALL_CORES
-        bool
-        default n
-    endif
-
-    config    N_PARALLEL
-        int "Number of parallel `make' jobs"
-        depends on !ALL_CORES
-        default 1
-        help
-            #-- The usual recommandation is (number of CPU cores)+1
-            #   Do not set for meaningful SBU calculations.
-
-    config    REALSBU
-        bool    "Build Binutils pass1 without parallelism (Real SBU)"
-        default    n
-        help
-           #-- Use -j1 in make invokation for Binutils pass1 to
-           #   get a valid SBU value.
-    endmenu # parallelism
 
     #--- Test Suites
@@ -522 +468 @@
             #  do not stop on test suite failures.
 
+    menu "Test settings"
+    depends on    CONFIG_TESTS
     choice
-        depends on    CONFIG_TESTS
         prompt    "Tests level"
         default    TST_1
@@ -543 +490 @@
 
     endchoice
+
+    endmenu # test settings
 
     config    TEST
@@ -815 +764 @@
 depends on !BOOK_BLFS
 
-    #--- Optimizations
-    config    CONFIG_OPTIMIZE
-        bool    "Optimization"
-        default    n
-        help
-            #   Opens a menu for various optimization settings:
-            #   Actual optimization flags MUST be defined in ./optimize/*
-            #   before activating this option.
-            #
-            # WARNING: The use of build optimizations may lead to build issues.
-            #   If the system doesn't work as expected, please rebuild
-            #   without optimizations before asking for support.
-    menu    "Optimization settings"
-        depends on CONFIG_OPTIMIZE
-
-    choice
-        prompt "Optimization level"
-        default OPT_1
-        help
-            #-- Optimization values are set in optimize/* files
-
-        config    OPT_1
-            bool    "Final system only"
-
-        config    OPT_2
-            bool    "Both temp tools and final system"
-
-    endchoice
-
-    endmenu # Optimization settings
-    config    OPTIMIZE
-        int
-        default    "0"    if !CONFIG_OPTIMIZE
-        default    "1"    if OPT_1
-        default    "2"    if OPT_2
-
-    #--- End Optimizations
-
     config    REPORT
         bool "Create SBU and disk usage report"
@@ -858 +769 @@
 
     config    SAVE_CH5
-        bool "Save temporary system work"
+        bool "Save Chapter 5 work"
         depends on BOOK_LFS || BOOK_LFS_SYSD
         default n
         help
-            Save the state of jhalfs after finishing building the temporary
-            system
+            Save the state of jhalfs at the end of chapter 5:
             
             if you tick this item, the whole $LFS directory is
-            saved when chapter 7 is finished. It'll be in a .tar
-            file in the $BUILD_DIR/jhalfs directory
+            saved when chapter 5 is finished. It'll be in an xz
+            compressed tarball in the $LFS/jhalfs directory
 
     #--- ICA
@@ -899 +809 @@
 
     #--- End ICA
+
+    #--- Optimizations
+    config    CONFIG_OPTIMIZE
+        bool    "Optimization and parallelization"
+        default    n
+        help
+            #   Opens a menu for various optimization settings:
+            #   Actual optimization flags MUST be defined in ./optimize/*
+            #   before activating this option.
+            #
+            # WARNING: The use of build optimizations may lead to build issues.
+            #   If the system doesn't work as expected, please rebuild
+            #   without optimizations before asking for support.
+    menu    "Parallelization and Optimization settings"
+        depends on CONFIG_OPTIMIZE
+
+    config    N_PARALLEL
+        int "Number of parallel `make' jobs"
+        default 1
+        help
+            #-- The usual recommandation is (number of CPU cores)+1
+            #   Do not set for meaningful SBU calculations.
+
+    choice
+        prompt "Optimization level"
+        default OPT_1
+        help
+            #-- Optimization values are set in optimize/* files
+
+        config    OPT_1
+            bool    "Final system only"
+
+        config    OPT_2
+            bool    "Both temp tools and final system"
+
+    endchoice
+
+    config    REALSBU
+        bool    "Build Binutls pass1 without optimization (Real SBU)"
+        depends on OPT_2
+        default    n
+        help
+           #-- Use -j1 in make invokation for Binutils pass1 to
+           #   get a valid SBU value.
+
+    endmenu # Optimization settings
+    config    OPTIMIZE
+        int
+        default    "0"    if !CONFIG_OPTIMIZE
+        default    "1"    if OPT_1
+        default    "2"    if OPT_2
+
+    #--- End Optimizations
 
     #-- Internal Settings

LFS/lfs.xsl

@@ -28 +28 @@
   -->
   <xsl:param name="testsuite" select="1"/>
-
-  <!-- Parallelism (LFS >= 12.1) -->
-  <xsl:param name="jobs" select="1"/>
-
-  <!-- value of jobs for binutils-pass1 -->
-  <xsl:param name="jobs-bp1" select="1"/>
 
   <!-- Install non wide character ncurses 5? -->
@@ -624 +618 @@
         <xsl:value-of select="$hostname"/>
       </xsl:when>
-      <xsl:when test="contains(string(.),'$(nproc)')">
-        <xsl:value-of select="$jobs"/>
-      </xsl:when>
       <xsl:otherwise>
         <xsl:text>**EDITME</xsl:text>
@@ -1253 +1244 @@
 </xsl:text>
     </xsl:if>
-    <xsl:text>
-export MAKEFLAGS="-j</xsl:text>
-    <xsl:choose>
-      <xsl:when test="@id='ch-tools-binutils-pass1'">
-        <xsl:value-of select="$jobs-bp1"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$jobs"/>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text>"
-</xsl:text>
     <xsl:text>SECONDS=${PREV_SEC}
 

LFS/master.sh

@@ -128 +128 @@
       # If using optimizations, write the instructions
       case "${OPTIMIZE}$1${nb_chaps}${this_script}${REALSBU}" in
-          0* | *binutils-pass1y | 15* | 167* | 177*) ;;
-          *kernel*) ;; # No CFLAGS for kernel
-          *)  wrt_optimize "$name" ;;
+          0* | *binutils-pass1y | 15* | 167* | 177*)
+              wrt_makeflags "$name" "-j1" "1" ;;
+          *kernel*) # No CFLAGS for kernel
+              wrt_makeflags "$name" "$JH_MAKEFLAGS" "$N_PARALLEL" ;;
+          *)  wrt_optimize "$name" &&
+              wrt_makeflags "$name" "$JH_MAKEFLAGS" "$N_PARALLEL" ;;
       esac
-      # There is no need to tweak MAKEFLAGS anymore, this is done
-      # by lfs.xsl. But still, NINJAJOBS needs to be set if
-      # N_PARALLEL is defined.
-      if [ -n "N_PARALLEL" ]; then
-         wrt_makeflags "$name" "$JH_MAKEFLAGS" "$N_PARALLEL"
-      fi
-    fi # end of package specific instructions
+    fi
 
 # Some scriptlet have a special treatment; otherwise standard
@@ -290 +287 @@
   done
 
-  # If CPUSET is defined and not equal to "all", then we define a first target
-  # that calls a script which re-enters make calling target all
-  if [ -n "$CPUSET" ] && [ "$CPUSET" != all ]; then
-(
-    cat << EOF
-
-all-with-cpuset:
-        @CPUSPEC="\$(CPUSET)" ./run-in-cgroup.sh \$(MAKE) all
-EOF
-) >> $MKFILE
-  fi
   # Drop in the main target 'all:' and the chapter targets with each sub-target
   # as a dependency. Also prevent running targets in parallel.

README

@@ -1 +1 @@
 1. INTRODUCTION::
 
-      The scripts in this directory implement an automation of the building
-   of a GNU/LInux system, as described in the Linux From Scratch book series.
-   The name of the project is jhalfs: in that name, "alfs" stands for
-   "automated linux from scratch", and the initials "jh" have been kept since
-   the original "jhalfs-0.2" code developed by Jeremy Huntwork.
-
-      The list of supported books can be found at
-   http://wiki.linuxfromscratch.org/alfs/wiki/SupportedBooks (maybe outdated,
-   current develoment books and latest version are always supported).
-
-      The documentation is split among various README.* files. Here is a list
-   of what is in which:
-      - README (this file): instructions to use the LFS book. This should be
-        enough if you just want to build a base system as per the LFS book. It
-        is also a required reading for all the other projects.
-      - README.BLFS: instructions to install an automated build infrastructure
-        for the BLFS book. There are two ways to do so: (i) install the
-        tools at the end of an LFS build, or
-        (ii) install the tools on an already running system. Both methods are
-        described in that file.
-      - README.CUSTOM: instructions to run custom commands either during the LFS
-        build, or at the end of a LFS build. Note that you will not find
-        instructions on how to write those commands, but some examples are
-        available.
-      - README.PACKAGE_MANAGEMENT: instructions to use package management during
-        the build (Note: the only package manager that is regularly tested is
-        porg)
-
-      Other sources of information are the context help in the menu interface,
-   and the LFS books themselves (both required readings of course!).
+     The scripts in this directory implement an automation of the building
+  of a GNU/LInux system, as described in the Linux From Scratch book series.
+  The name of the project is jhalfs: in that name, "alfs" stands for
+  "automated linux from scratch", and the initials "jh" have been kept since
+  the original "jhalfs-0.2" code developed by Jeremy Huntwork.
+
+     The list of supported books can be found at
+  http://wiki.linuxfromscratch.org/alfs/wiki/SupportedBooks.
+
+     The documentation is split among various README.* files. Here is a list
+  of what is in which:
+    - README (this file): instructions to use the LFS book. This should be
+      enough if you just want to build a base system as per the LFS book. It is
+      also a required reading for all the other projects.
+    - README.BLFS: instructions to install an automated build infrastructure
+      for the BLFS book. There are two ways to do so: (i) install the
+      tools at the end of an LFS build, or
+      (ii) install the tools on an already running system. Both methods are
+      described in that file.
+    - README.CUSTOM: instructions to run custom commands either during the xLFS
+      build, at the end of a xLFS build. Note that you will not find
+      instructions on how to write those commands, but some examples are
+      available.
+    - README.PACKAGE_MANAGEMENT: instructions to use package management during
+      the build
+
+     Other sources of information are the context help in the menu interface,
+  and the xLFS books themselves.
 
 2. PREREQUISITES::
 
-      It is strongly advised that you first build manually a complete system
-   before attempting to automate the build.
-
-      Of course the "Host System Requirements" should be fulfilled. Some
-   supplementary packages are needed for using jhalfs. They are detailed
-   at the bottom of the page:
-   https://www.linuxfromscratch.org/alfs/download.html. In short, you need
-   wget, sudo, libxml2, libxslt, docbook-4.5-xml, and docbook-xsl-nons.
+     As said elsewhere, it is strongly advised that you first build manually
+  a complete system before attempting to automate the build.
+
+     Of course the "Host System Requirements" should be fulfilled. The needed
+  supplementary packages are detailed at the bottom of the page:
+  https://www.linuxfromscratch.org/alfs/download.html. In short, you need
+  wget, sudo, libxml2, libxslt, docbook-4.5-xml, and docbook-xsl-nons.
 
 3. INSTALLATION::
 
-      No installation is required. You may want to move the files in this
-   directory to a convenient location, and then follow the instructions below.
+     No installation is required. You may want to move the files in this
+  directory to a convenient location, and then follow the instructions below.
 
 4. CONFIGURATION::
 
-   4.1. CONFIGURATION OF THE TOOLS:
-         There is no configuration of the tools themselves. The various
-      parameters for the build are set through a menu driven interface. See
-      the section RUNNING below for details.
-
-   4.2. PRELIMINARY TASKS:
-         This tool has no support at all for creating a partition and a mount
-      point for the built system. You should follow the book up to the section
-      "Mounting the new partition". Note that the default name for the
-      partition mount point is "/mnt/build_dir", instead of /mnt/lfs.
-      You can change that default to anything you'd like in the menu, so you
-      may name it /mnt/lfs if you prefer . We'll use the name /mnt/build_dir
-      in the sequel.
-
-         For downloading packages, you can use the tool or download them
-      yourself. Even if using the tool, it is recommended to set up a source
-      repository where you store already downloaded packages. The tool will
-      automatically search a package in this repository before downloading it
-      if it is not found there. This repository cannot be the same as
-      /mnt/build_dir/sources. As an example, we'll use /usr/src. You should
-      arrange for the user running the tool to have write access to this
-      directory.
-
-         If you want to build the kernel as part of the automated build,
-      a configuration file must be provided. In order to do so, it is
-      recommended to download the kernel tarball, unpack it, run
-      <make menuconfig> (or any other *config), configure the kernel as per
-      the book, and save the resulting .config file to a location where it can
-      be retrieved later on. It is suggested to put it into the source
-      repository, with a versioned name, e.g.
-      /usr/src/config-<arch>-<kernel version>-<config details>.
-
-         Another file you may provide is the fstab file. As for the kernel
-      configuration, this file has to be prepared before running the menu.
-      You can copy-paste the file from the "Creating the /etc/fstab File"
-      page, then edit to suit the future lfs system layout, then save the
-      file. A convenient location and name is /usr/src/fstablfs.
-
-         At a more advanced level, you may want to supply custom commands
-      to be run at the end of LFS build. Scripts containing those commands
-      are located in the ./custom/config directory. Examples are given in
-      ./custom/examples. A template is provided as ./custom/template. See
-      README.CUSTOM for more details.
+  4.1. CONFIGURATION OF THE TOOLS:
+       There is no configuration of the tools themselves. The various
+    parameters for the build are set through a menu driven interface. See
+    the section RUNNING below for details.
+
+  4.2. PRELIMINARY TASKS:
+       This tool has no support at all for creating a partition and a mount
+    point for the built system. You should follow the book up to the section
+    "Mounting the new partition". Note that the default name for the
+    partition mount point is "/mnt/build_dir", instead of /mnt/{c,}lfs.
+    You can change that default to anything you'd like in the menu, so you
+    may name it /mnt/lfs, or whatever you like. We'll use the name
+    /mnt/build_dir in the sequel.
+
+       The tool can download the needed packages for you, or you may download
+    them yourself. The tool may optionally use a package archive directory
+    where the downloaded packages are stored. That directory name may be made
+    available to the tool in two ways: (i) export the SRC_ARCHIVE variable,
+    for example SRC_ARCHIVE=/usr/src, (ii) enter the name at the "Package
+    Archive Directory" menu prompt. Note that the user should have write
+    permission to that directory. If a needed package is found in that
+    directory, it is copied to /mnt/build_dir/sources, if not, it is
+    downloaded to that directory and copied to /mnt/build_dir/sources,
+    except if found in /mnt/build_dir/sources, in which case, it is just
+    copied to $SRC_ARCHIVE. If you want the tool to download packages and you
+    do not want to archive them, just unset SRC_ARCHIVE, and keep the
+    default entry for "Package Archive Directory". If you choose to download
+    the packages by yourself, you should download (or copy) them to
+    /mnt/build_dir/sources directly.
+
+       If you want to build the kernel as part of the automated build, select
+    "Build the kernel" in the menu. Then, a configuration file must be
+    provided. In order to do so, it is recommended to download the kernel
+    tarball, unpack it, run <make menuconfig> (or any other *config),
+    configure the kernel as per
+    the book, and save the resulting .config file to a location where it can
+    be retrieved later on (a convenient location and name is
+    $SRC_ARCHIVE/config-<arch>-<kernel version>-<config details>).
+
+       Another file you may provide is the fstab file. To use it, select
+    "Use a custom fstab file" in the menu interface, and enter the name of
+    the file where asked. As for the kernel configuration, this file has to
+    be prepared before running the menu. A convenient location and name is
+    $SRC_ARCHIVE/fstablfs.
+
+       At a more advanced level, you may want to supply custom commands
+    to be run at the end of (C)LFS build. Scripts containing those commands
+    are located in the ./custom/config directory. Examples are given in
+    ./custom/examples. A template is provided as ./custom/template. See
+    README.CUSTOM for more details.
 
 5. RUNNING::
 
-   IMPORTANT::
-         You must be logged as a normal user with sudo privileges to run
+  IMPORTANT::
+      You must be logged as a normal user with sudo privileges to run
       the Makefile. Furthermore, you are supposed to have enough privilege
       to become any user. If you are not bothered about security issues,
-      the entry for the user running the tool in /etc/sudoers could be
-      <user> ALL=(ALL) NOPASSWD:ALL
-
-      The command <make> will launch a menu based configuration program,
-   similar to the kernel "menuconfig" configuration tool.
-
-      Help on parameter function is available from the on-line help (type the
-   character `?' after highlighting the parameter). Please do use the help:
-   it may contain additional information not duplicated in this file.
-
-   MENU "BOOK Settings"
-
-      Use BOOK: You have three choices: LFS System V, LFS systemd, BLFS.
-         The BLFS part is described in README.BLFS
-
-      Book version: You have two choices: "Branch" or "Working Copy"
-         Branch will have the tool clone the book's git repository. The
-      choice of the branch (actually any git commit) or of the file
-      location for the working copy is done in the next menu entry.
-
-      Multilib: Four choices: Normal LFS, Multilib with i686 libraries,
-      multilib with x32 libraries, multilib with all libraries.
-         It is recommended to use "Normal LFS" unless you know what you
-      are doing
-
-      Build method: two choices: chroot (as in book), boot
-         Presently, the "boot" method is not implemented, so keep the default.
-
-      Add blfs-tools support (see README.BLFS)
-         This will install the blfs tools onto the newly built system. It
-      is not the same thing as choosing the BLFS book in the menu, which
-      will install the blfs tools on the currently running system.
-
-      Add custom tools support (see README.CUSTOM)
-
-   MENU "General Settings"
-
-      Build Directory: the name of the root of the LFS system
-         This is the equivalent of the LFS variable in the book. Set it
-      to "/mnt/lfs" if you have followed the book for creating the LFS
-      partition and mount point.
-
-      Retrieve source files: Say y to have jhalfs download the packages
-         If you say no, you must download the packages yourself and put
-      them into the /mnt/build_dir/sources directory. Follow book's
-      chapter 3 instructions.
-         If you say yes, you'll be asked several other questions:
-         - Package Archive Directory: Repository of downloaded packages
-            This directory, which is on the host and should be writable
-         by the user running the tool, is for storing downloaded packages.
-            If you keep the default "$SRC_ARCHIVE", you can set this variable
-         to the absolute path of the repository and export it. Or if the
-         variable is not set, jhalfs downloads the sources directly to
-         /mnt/build_dir/sources.
-            Instead of using the SRC_ARCHIVE envar, you can also enter the
-         path of the repository directory into this field.
-         - Retry on 'connection refused' failure: self explanatory
-         - Number of retry attempts on download failures: self explanatory
-         - Download timeout (in seconds): self explanatory
-
-      Run the makefile: start the build immediately after running the tool
-         This is not the preferred method: it is recommended to rather
-      run "make -C /mnt/build_dir/jhalfs" after the tool has finished
-      setting up the build. But this may be handy if you are sure everything
-      is well, and want to leave the tool and the build run without
-      supervision.
-
-      Rebuild files: clean up the /mnt/build_dir directory
-         Say n if you want to rerun the tool (to update generated scripts
-      for example) without removing what has already been done. Otherwise,
-      say y. Note that there are some guards against removing a directory
-      containing useful things, but double check that the /mnt/build_dir
-      directory is really what you want to erase.
-
-   MENU "Build Settings"
-
-      MENU Parallelism settings
-       - Use all cores:
-            If you say y, MAKEFLAGS will be set to "-j$(nproc)" at the
-         beginning of each script. Other envars are supposed to be passed
-         from the environment, as done in new books. Note that for old books,
-         this means the scripts using make or ninja will be run with all
-         cores, but not when this needs to set special envars like
-         TESTSUITEFLAGS. You can still define the number of cores used
-         in next field.
-            If you say n, you'll be asked for a static number of threads
-         to use.
-       - set of cpus to use, or 'all' for all cpus (only if using all cores):
-            You can define here the cores you want to use. See help for
-         details. This is the preferred way of reducing the number of cores
-         rather than using a static thread number.
-       - Number of parallel `make' jobs (only if not using all cores):
-            Every occurrence of $(nproc) in new books will be replaced with
-         the number entered here. Also MAKEFLAGS will be set to "-jN" (where
-         N is the number entered) at the beginning of each scripts. Furthermore
-         NINJAJOBS will be set to N in the environment. This allows to run all
-         books with N threads, except for paarts that need other envars to be
-         set
-       - Build Binutils pass1 without parallelism (Real SBU)
-            The standard SBU is defined as the time to run the binutils-pass1
-         build with only one thread. Saying y here allows to get a value for
-         it. If you say n, the value is not meaningful for SBU measurements.
-
-      Run testsuites: say y to run the test suites
-         You'll have the choice between running all the test suites, or only
-      those deemed critical (binutils, gmp, mpfr, mpc, and gcc).
-
-      Package management: see README.PACKAGE_MANAGEMENT
-
-      Create a log of installed files for each package: self explanatory
-
-      Strip Installed Binaries/Libraries: use the book instructions for
-      stripping
-
-      DO NOT use/display progress_bar (self explanatory)
-
-   MENU System configuration
-
-      Use a custom fstab file:
-         If you say y, you'll have to provide a file containing the fstab
-      for the LFS system. See above "preliminary tasks".
-
-      Build the kernel:
-         If you say y, you'll be asked for a file containing the kernel
-      configuration. See above "preliminary tasks".
-
-      Install non-wide-character ncurses (rarely used nowadays):
-         If you say y, the system will use instructions in the note on the
-      ncurses page to install those libraries.
-
-      TimeZone: set to the result of "tzselect"
-
-      Language: set to the result of the instructions on "The Bash Shell
-      Startup Files" page.
-
-      Install the full set of locales: installs all the locales known to
-      glibc.
-
-      Groff page size: choice between "A4" and "Letter".
-
-      Hostname: self explanatory
-
-      Network configuration: various fields for setting network. Look at
-      chapter 9 for background.
-
-      Console configuration: various fields for setting console, as described
-      in chapter 9.
-
-   MENU Advanced features:
-
-      Optimization: Optimization settings are done by editing files in the
-      "optimize" directory. The menu just allows you to choose between applying
-      optimizations only to the final chapter or to all the book. Say n for
-      a normal build
-
-      Create SBU and disk usage report: self explanatory
-
-      Save temporary system work: self explanatory (see help)
-
-      Run comparison analysis on final stage: build the system several times
-      using the preceding one, to test whether it is able to rebuild itself
-      identically. Don't use normally...
-
-      Internal Settings (WARNING: for jhalfs developers only): says it all
+      the entry for the user "jhalfs_user" in /etc/sudoers could be
+      jhalfs_user ALL=(ALL) NOPASSWD:ALL
+
+     The command <make> will launch a menu based configuration program. The
+  underlying menu code was borrowed from BusyBox and slightly modified for
+  our use.
+
+     Help on parameter function is available from the on-line help. Please
+  make use of that feature: it may contain additional information not
+  duplicated in this file.
+
+     You should first choose which book and flavour you want to build. Note
+  that when you choose the BLFS book, the tool will just install the BLFS
+  tool to your system. You'll have to run that installed tool to build
+  packages in BLFS. See README.BLFS to know how. If you choose any other
+  book, you'll have to configure the settings and the build parameters
+  from the menu. Note that you may choose to install the blfs tools onto
+  the newly built system. It is not the same thing as choosing
+  the BLFS book in the menu, which will install the blfs tools on the
+  currently running system.
+
+     The "General Settings" menu is where the "Build Directory" name is to be
+  entered. Other entries in that menu select what the tool should do. The
+  "Run the Makefile" entry selects whether the tool will start the build
+  automatically after generating the needed files. The "Rebuild files" selects
+  whether to clean the build directory before doing anything else. To protect
+  against removing important files, this can only be done in an empty directory,
+  or a directory previously populated by the tool.
+
+     The "Build Settings" menu is where various options for the build can be
+  selected. Two options, "Use a custom fstab file" and "Build the kernel",
+  have been described above. "Do not use/display progress_bar", if set, will
+  prevent a progress bar to be displayed during the build. That may be useful
+  on slow machine. The other options should be self explanatory, using either
+  the online help or book reading.
+
+     The "Advanced Features" menu is for various maintenance tasks, like
+  testing the build instructions or reporting build statistics. One useful
+  option is "Optimization and parallelisation". It is not recommended to use
+  it for setting compiler optimization flags, although it is possible, but
+  if you select it, you'll be able to select the number of parallel `make'
+  jobs, which allows much faster builds on modern multicore CPUs.
 
      Once you have set the parameters and saved the configuration, the script
@@ -394 +276 @@
        machine.
 
+    Q. "What is the function of "User account" and "Group account" menu
+        settings?"
+    A. If you are running jhalfs from a low or non-privileged account you may
+       not have the priv to create/delete the user needed to build temporary
+       tools.
+       These settings allow you to use your own user and group name to do those
+       build steps.
+
+       These variables are adjustable also when invoking make:
+
+         cd $BUILDDIR; make LUSER=myaccount LGROUP=mygroup
+
+       The only changes to your account will be the creation of a NEW .bashrc
+       after saving your original to .bashrc.XXX
+
     Q. "How could I stop the build at a predefined chosen point?"
     A. Launch the Makefile manually passing the last numbered target to be build

common/chroot.xsl

@@ -6 +6 @@
       extension-element-prefixes="exsl"
       version="1.0">
-
-  <xsl:param name="jobs_2" select="1"/>
 
   <xsl:template match="/">
@@ -58 +56 @@
     <xsl:param name="instructions" select="''"/>
     <xsl:choose>
-      <xsl:when test="contains($instructions, '$(nproc || echo 1)')">
-        <xsl:call-template name="extract-chroot">
-          <xsl:with-param
-            name="instructions"
-            select="concat(substring-before($instructions, '$(nproc || echo 1)'), $jobs_2, substring-after($instructions, '$(nproc || echo 1)'))"/>
-        </xsl:call-template>
-      </xsl:when>
       <xsl:when test="not(starts-with($instructions,'&#xA;chroot')) and
                       contains($instructions, '&#xA;chroot')">

common/libs/func_book_parser

@@ -64 +64 @@
   popd > /dev/null
 
-  if [ "$ALL_CORES" = "y" ]; then
-          JOBS="\$(nproc)"
-  else
-          JOBS="$N_PARALLEL"
-  fi
-  if [ "$REALSBU" = y ]; then JOBSBP1=1; else JOBSBP1="$JOBS"; fi
-
   # First profile the book, for revision and arch. Note that
   # MULTIBLIB is set to "default" if pure 64 bit book. In this case,
@@ -110 +103 @@
            --stringparam log-level      "$LOG_LEVEL"    \
            --stringparam script-root    "$SCRIPT_ROOT"  \
-           --stringparam jobs           "$JOBS"         \
-           --stringparam jobs-bp1       "$JOBSBP1"      \
            --output "./${COMMANDS}/"                    \
            $XSL                                         \
@@ -151 +142 @@
   echo -n "... "
   xsltproc --nonet --xinclude \
-           --stringparam jobs_2 "$JOBS_2" \
-           -o chroot-scripts/ chroot.xsl  \
+           -o chroot-scripts/ chroot.xsl \
            $BOOK/chapter0?/*chroot*.xml >> $LOGDIR/$LOG 2>&1
   echo "done"

common/libs/func_download_pkgs

@@ -133 +133 @@
   echo -n "Creating URLs file... "
   xsltproc --nonet --xinclude                \
+           --stringparam server "$SERVER"    \
+           --stringparam family lfs          \
            --stringparam pkgmngt "$PKGMNGT"  \
            --stringparam revision "$INITSYS" \

common/libs/func_install_blfs

@@ -137 +137 @@
 BUILD_ROOT=/sources
 BUILD_SUBDIRS=y
-JOBS=$(if [ "$ALL_CORES" = y ]; then echo 0; else echo $N_PARALLEL; fi)
+JOBS=$(if [ -n "$N_PARALLEL" ]; then echo $N_PARALLEL; else echo 1; fi)
 EOF
-# The 0 value above is for using all cores
 for OPT_VAR in CFLAGS CXXFLAGS LDFLAGS; do
   eval optVal=\$${OPT_VAR}_$DEF_OPT_MODE
@@ -181 +180 @@
 sudo find . -name unpacked -exec rm \{\} \;
 if [ "$GETPKG" = "y" ]; then
+    JH_FTP_SERVER=$SERVER/pub/blfs/ \
     JH_SRC_ARCHIVE=${SRC_ARCHIVE:-/dev/null}     \
     $BUILDDIR$BLFS_ROOT/download_script
@@ -219 +219 @@
 # updating to the end of the process, adding an 'update' target
 sed -i -e '/xsltproc/,+6d' \
-       -e '/^all/i update:' \
+       -e '/^all/s@$@ update@' \
        -e 's/touch/@touch/' Makefile
 cat >> Makefile << EOF
-update: all
+update:
         @echo Updating the tracking file
         @for pack in \$\$(grep '<productname' ../$LFS_XML/tmp/lfs-full.xml | \\

common/libs/func_validate_configs.sh

@@ -19 +19 @@
   local -r     BOOK_common="COMMIT BOOK CUSTOM_TOOLS"
   local -r  GENERAL_common="LUSER LGROUP LHOME BUILDDIR CLEAN GETPKG SRC_ARCHIVE \
-                            RETRYSRCDOWNLOAD RETRYDOWNLOADCNT DOWNLOADTIMEOUT \
+                            SERVER RETRYSRCDOWNLOAD RETRYDOWNLOADCNT DOWNLOADTIMEOUT \
                             RUNMAKE"
   local -r    BUILD_chroot="TEST STRIP"
@@ -36 +36 @@
 
   # Full list of books settings
-  local -r   lfs_PARAM_LIST="$LFS_book   $GENERAL_common $LFS_build $LFS_system  $ADVANCED_chroot ALL_CORES CPUSET N_PARALLEL REALSBU SAVE_CH5 $ADVANCED_common"
+  local -r   lfs_PARAM_LIST="$LFS_book   $GENERAL_common $LFS_build $LFS_system  $ADVANCED_chroot N_PARALLEL REALSBU SAVE_CH5 $ADVANCED_common"
 #  local -r  blfs_PARAM_LIST="BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR"
 
@@ -130 +130 @@
       TARGET32)         [[ -n "${TARGET32}" ]] &&  echo -e "`eval echo $PARAM_VALS`" ;;
       MIPS_LEVEL)       [[ "${ARCH}" = "mips" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
+      SERVER)           [[ "$GETPKG" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
       RETRYSRCDOWNLOAD) [[ "$GETPKG" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
       RETRYDOWNLOADCNT) [[ "$GETPKG" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
       DOWNLOADTIMEOUT)  [[ "$GETPKG" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
-      CPUSET)           [[ "$HAVE_CGROUP" = "y" ]] && [[ "$ALL_CORES" = "y" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
-      N_PARALLEL)       [[ "$ALL_CORES" = "n" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
+      N_PARALLEL)       [[ "$OPTIMIZE" -gt "0" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
+      REALSBU)          [[ "$OPTIMIZE" = "2" ]] && echo -e "`eval echo $PARAM_VALS`" ;;
 
       # Envars that requires some validation
@@ -167 +168 @@
 
         # Treatment of LANG parameter
-      LANG )  # See if the locale value has been set
+      LANG )  # See it the locale value has been set
                echo -n "`eval echo $PARAM_VALS`"
                [[ -z "${!config_param}" ]] &&

common/libs/func_wrt_Makefile

@@ -45 +45 @@
 PKGMNGT          = $PKGMNGT
 WRAP_INSTALL     = $WRAP_INSTALL
-CPUSET           = $CPUSET
 
 

common/urls.xsl

@@ -5 +5 @@
 
   <xsl:output method="text"/>
+
+  <!-- The FTP server used as fallback -->
+  <xsl:param name="server">ftp://ftp.osuosl.org</xsl:param>
 
   <!-- Do we use a package manager? -->

jhalfs

@@ -176 +176 @@
 UNICODE=${UNICODE:=n}
 LOCAL=${LOCAL:=n}
-ALL_CORES=${ALL_CORES:=n}
 REALSBU=${REALSBU:=n}
 SAVE_CH5=${SAVE_CH5:=n}
@@ -289 +288 @@
   # optimize configurations
   load_file optimize/opt_config 'Loading optimization config'
+  # The number of parallel jobs is taken from configuration now
+  # shellcheck disable=SC2034
+  JH_MAKEFLAGS="-j${N_PARALLEL}"
   # Validate optimize settings, if required
   validate_opt_settings
-fi
-# Parallelization is outside optimization, because it is now in the book
-if [[ "$ALL_CORES" = "n" ]]; then
-  # shellcheck disable=SC2034
-  JH_MAKEFLAGS="-j${N_PARALLEL}"
 fi
 #
@@ -324 +321 @@
 
 # Copy common helper files
-  cp "$COMMON_DIR"/{makefile-functions,progress_bar.sh,run-in-cgroup.sh} "$JHALFSDIR/"
+  cp "$COMMON_DIR"/{makefile-functions,progress_bar.sh} "$JHALFSDIR/"
 
 # Copy needed stylesheets

optimize/optimize_functions

@@ -17 +17 @@
   echo -e "asking for support.${OFF}\n"
 
-#  [ -n "$JH_MAKEFLAGS" ] && \
-#  echo -e "BLACK_LIST: ${L_arrow}${BOLD}${BLACK_LIST}${OFF}${R_arrow}\n"
+  echo -e "MAKEFLAGS: ${L_arrow}${BOLD}${JH_MAKEFLAGS}${OFF}${R_arrow}"
+  [ -n "$JH_MAKEFLAGS" ] && \
+  echo -e "BLACK_LIST: ${L_arrow}${BOLD}${BLACK_LIST}${OFF}${R_arrow}\n"
 
   echo -e "DEF_OPT_MODE: ${L_arrow}${BOLD}${DEF_OPT_MODE}${OFF}${R_arrow}\n"