Merge branch 'trunk' into xry111/parallelism

2023-11-13 13:44:32 +01:00 · 2023-11-13 13:44:32 +01:00 · 1352172467
commit 1352172467
parent 74601a7f06 5ed69f823f
9 changed files with 137 additions and 26 deletions
--- a/BLFS/gen-special.sh
+++ b/BLFS/gen-special.sh
@ -116,7 +116,7 @@ EOF
 # So we have to read that command too, since it may be assumed
 # that the preceding package is a dependency of the following,
 # except the first.
-  list_cat="$(sed -n '/>cat/,/EOF</p' $file | grep -v 'cat\|EOF' |
+  list_cat="$(sed -n '/>cat/,/EOF</p' $file | grep -v 'cat\|EOF\|#' |
              awk '{ print $NF }' | sed 's/-&.*//')"

 # Rationale for the sed below: the following for breaks words at spaces (unless
@ -170,7 +170,25 @@ EOF
 <!-- End dependencies -->
        </module>
 EOF
-    cat >> tmpfile << EOF
+#    cat >> tmpfile << EOF
+#        <xsl:element name="dependency">
+#          <xsl:attribute name="status">
+#            <xsl:value-of select="\$status"/>
+#          </xsl:attribute>
+#          <xsl:attribute name="build">
+#            <xsl:value-of select="\$build"/>
+#          </xsl:attribute>
+#          <xsl:attribute name="name">$packname</xsl:attribute>
+#          <xsl:attribute name="type">ref</xsl:attribute>
+#        </xsl:element>
+#EOF
+    precpack=$packname
+  done
+  cat >>$SPECIAL_FILE << EOF
+     </package>
+   </xsl:when>
+EOF
+  cat >> tmpfile << EOF
        <xsl:element name="dependency">
          <xsl:attribute name="status">
            <xsl:value-of select="\$status"/>
@ -181,13 +199,6 @@ EOF
          <xsl:attribute name="name">$packname</xsl:attribute>
          <xsl:attribute name="type">ref</xsl:attribute>
        </xsl:element>
-EOF
-  done
-  cat >>$SPECIAL_FILE << EOF
-     </package>
-   </xsl:when>
-EOF
-  cat >> tmpfile << EOF
      </xsl:when>
 EOF
 done
--- a/BLFS/xsl/process-install.xsl
+++ b/BLFS/xsl/process-install.xsl
@ -16,6 +16,7 @@
         contains(string($current-instr),'tracker-miner') or
         contains(string($current-instr),'gtweak') or
         contains(string($current-instr),'query-immodules') or
+         contains(string($current-instr),'chgrp -v mail') or
         contains(string($current-instr),'gnome-control-center')">
 ]>

--- a/BLFS/xsl/process-replaceable.xsl
+++ b/BLFS/xsl/process-replaceable.xsl
@ -123,6 +123,33 @@
      <xsl:when test="string()='&lt;loginname&gt;'">
        <xsl:text>$USER</xsl:text>
      </xsl:when>
+<!-- for xorg environment. Note that libreoffice too uses &lt;PREFIX&gt; -->
+      <xsl:when test="string()='&lt;PREFIX&gt;' and
+                      ancestor::sect1[@id='xorg-env']">
+        <xsl:text>/usr</xsl:text>
+      </xsl:when>
+<!-- for libreoffice. Note that xorg environment too uses &lt;PREFIX&gt; -->
+      <xsl:when test="string()='&lt;PREFIX&gt;' and
+                      ancestor::sect1[@id='libreoffice']">
+                      <xsl:text>/opt/</xsl:text>
+                      <xsl:value-of select="ancestor::sect1/@xreflabel"/>
+      </xsl:when>
+<!-- for abiword -->
+      <xsl:when test="string()='&lt;lang&gt;'">
+        <xsl:choose>
+          <xsl:when test="starts-with($language,'en_US')">
+            <!-- normal.awt for en_US is already there, copy
+                 the one for en_GB (could be any other) -->
+            <xsl:text>en_GB</xsl:text>
+          </xsl:when>
+          <xsl:otherwise>
+            <!-- in general, there are normal.awt-ll_CC files-->
+            <xsl:copy-of select="$lang-ll"/>
+            <xsl:text>_</xsl:text>
+            <xsl:copy-of select="$lang-CC"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:when>
      <xsl:otherwise>
        <xsl:text>**EDITME</xsl:text>
        <xsl:apply-templates/>
--- a/Config.in
+++ b/Config.in
@ -564,13 +564,6 @@ depends on !BOOK_BLFS
        bool "Strip Installed Binaries/Libraries"
        default n

-    config    DEL_LA_FILES
-        bool "Remove libtool .la files"
-        default y
-        help
-            #-- Remove files libxxx.la installed by libtool. For a rationale
-            #   see https://blog.flameeyes.eu/tags/lafiles/
-
    config    NO_PROGRESS_BAR
        bool "DO NOT use/display progress_bar"
        default n
@ -619,6 +612,13 @@ menu "System configuration"
            #-- Fully qualified path to a kernel config file
            #   The config file will be copied to ${BUILD_DIR}/sources
            #   and renamed 'kernel-config'
+            #
+            #   Important: if the config file is out of date (missing
+            #   option), the kernel build will timeout instead of
+            #   waiting forever for an input. This will generate error
+            #   124. In this case, update your config file,
+            #   copy it to $BUILD_DIR/sources/kernel-config, and
+            #   restart the build.
    #--- End Kernel

    config    NCURSES5
@ -961,6 +961,14 @@ depends on !BOOK_BLFS
            string "Package contents list"
            default "unpacked"

+        config    DEL_LA_FILES
+            bool "Remove libtool .la files"
+            default y
+            help
+                #-- Remove files libxxx.la installed by libtool. Only set to
+                #   "n" if you know what you are doing. For a rationale
+                #   see https://blog.flameeyes.eu/tags/lafiles/
+
    #--- End Internal Settings
    endmenu

--- a/LFS/lfs.xsl
+++ b/LFS/lfs.xsl
@ -419,6 +419,8 @@ echo -e "\n\nTotalseconds: $SECONDS\n"
        <xsl:text>make mrproper&#xA;</xsl:text>
        <xsl:if test="ancestor::sect1[@id='ch-bootable-kernel']">
          <xsl:text>cp -v ../kernel-config .config&#xA;</xsl:text>
+          <xsl:text>timeout 60 make oldconfig ||\&#xA;</xsl:text>
+          <xsl:text>{ echo kernel config is not up to date; exit 124; }&#xA;</xsl:text>
        </xsl:if>
      </xsl:when>
 <!-- test instructions -->
--- a/LFS/master.sh
+++ b/LFS/master.sh
@ -368,24 +368,24 @@ mk_SUDO: mk_LUSER
 	@sudo make BREAKPOINT=\$(BREAKPOINT) SUDO
 	@touch \$@

-mk_CHROOT: mk_SUDO
+mk_CHROOT: mk_SUDO devices
 	@\$(call echo_CHROOT_request)
 	@( sudo \$(CHROOT1) -c "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) CHROOT")
 	@touch \$@

-mk_BOOT: mk_CHROOT
+mk_BOOT: mk_CHROOT devices
 	@\$(call echo_CHROOT_request)
 	@( sudo \$(CHROOT1) -c "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) BOOT")
 	@touch \$@

-mk_BLFS_TOOL: create-sbu_du-report
+mk_BLFS_TOOL: create-sbu_du-report devices
 	@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
 	  \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
 	  (sudo \$(CHROOT1) -c "make -C $BLFS_ROOT/work"); \\
 	fi;
 	@touch \$@

-mk_CUSTOM_TOOLS: mk_BLFS_TOOL
+mk_CUSTOM_TOOLS: mk_BLFS_TOOL devices
 	@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
 	  \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\
 	  sudo mkdir -p ${BUILDDIR}${TRACKING_DIR}; \\
@ -437,11 +437,11 @@ fi
    cat << EOF

 chroot1: devices
-	sudo \$(CHROOT1)
+	-sudo \$(CHROOT1)
 	\$(MAKE) teardown

 chroot: devices
-	sudo \$(CHROOT1)
+	-sudo \$(CHROOT1)
 	\$(MAKE) teardown

 SETUP:        $SETUP_TGT
--- a/common/kernfs.xsl
+++ b/common/kernfs.xsl
@ -16,9 +16,69 @@
  </xsl:template>

  <xsl:template match="userinput">
-    <xsl:apply-templates/>
+    <xsl:call-template name="check-mount">
+      <xsl:with-param name="mytext" select="string()"/>
+    </xsl:call-template>
    <xsl:text>
 </xsl:text>
  </xsl:template>

+  <xsl:template name="check-mount">
+    <xsl:param name="mytext" select="''"/>
+    <xsl:choose>
+      <xsl:when test="contains($mytext,'&#xA;')">
+        <xsl:call-template name="check-mount">
+          <xsl:with-param name="mytext"
+                          select="substring-before($mytext,'&#xA;')"/>
+        </xsl:call-template>
+        <xsl:text>&#xA;</xsl:text>
+        <xsl:call-template name="check-mount">
+          <xsl:with-param name="mytext"
+                          select="substring-after($mytext,'&#xA;')"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:when test="starts-with(normalize-space($mytext),'mountpoint')">
+        <xsl:copy-of select="$mytext"/>
+      </xsl:when>
+      <xsl:when test="starts-with(normalize-space($mytext),'mount')">
+        <xsl:variable name="mountpoint">
+          <xsl:call-template name="last-arg">
+            <xsl:with-param name="myline" select="$mytext"/>
+          </xsl:call-template>
+        </xsl:variable>
+        <xsl:text>mountpoint -q </xsl:text>
+        <xsl:copy-of select="$mountpoint"/>
+        <xsl:text> || </xsl:text>
+        <xsl:copy-of select="$mytext"/>
+      </xsl:when>
+      <xsl:when test="starts-with(normalize-space($mytext),'umount')">
+        <xsl:variable name="mountpoint">
+          <xsl:call-template name="last-arg">
+            <xsl:with-param name="myline" select="$mytext"/>
+          </xsl:call-template>
+        </xsl:variable>
+        <xsl:text>mountpoint -q </xsl:text>
+        <xsl:copy-of select="$mountpoint"/>
+        <xsl:text> &amp;&amp; </xsl:text>
+        <xsl:copy-of select="$mytext"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:copy-of select="$mytext"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="last-arg">
+    <xsl:param name="myline" select="''"/>
+    <xsl:choose>
+      <xsl:when test="contains($myline,' ')">
+        <xsl:call-template name="last-arg">
+          <xsl:with-param name="myline" select="substring-after($myline,' ')"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:copy-of select="$myline"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
 </xsl:stylesheet>
--- a/common/libs/func_compare.sh
+++ b/common/libs/func_compare.sh
@ -22,9 +22,11 @@ wrt_compare_targets() {            #
  local dir
  printf -v dir chapter%02d "$1"

-  sed -i '/userdel/d' $dir/*revised*
+  REVISED=cleanup
+  if ls $dir/*revised* 2>/dev/null; then REVISED=revised; fi
+  sed -i '/userdel/d' $dir/*$REVISED*
  for (( N = 2; N < ITERATIONS; N++ )); do
-     sed -i '/userdel/d' $dir-build_$N/*revised*
+     sed -i '/userdel/d' $dir-build_$N/*$REVISED*
  done

 }
--- a/common/libs/func_validate_configs.sh
+++ b/common/libs/func_validate_configs.sh
@ -29,7 +29,7 @@ inline_doc
  local -r   LFS_book="$BOOK_common INITSYS BLFS_TOOL"

  # Build Settings by book
-  local -r   LFS_build="$BUILD_chroot NCURSES5 DEL_LA_FILES $BUILD_common PKGMNGT FULL_LOCALE WRAP_INSTALL"
+  local -r   LFS_build="$BUILD_chroot NCURSES5 $BUILD_common PKGMNGT FULL_LOCALE WRAP_INSTALL"

  # System Settings by book
  local -r LFS_system="HOSTNAME INTERFACE IP_ADDR GATEWAY PREFIX BROADCAST DOMAIN DNS1 DNS2 FONT KEYMAP LOCAL LOG_LEVEL"