Changeset 49e360b9

Timestamp:

04/28/2021 09:40:51 PM (3 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

99ee345

Parents:

c461bd9

Message:

Add manual locales needed for tests if using alternate locale installation
instructions.

Minor changes to boot scripts.

Files:

• bootscripts/ChangeLog (modified) (1 diff)
• bootscripts/lfs/lib/services/init-functions (modified) (5 diffs)
• chapter01/changelog.xml (modified) (1 diff)
• chapter08/glibc.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)

bootscripts/ChangeLog

@@ +1 @@
+2021-04-28 Bruce Dubbs <bdubbs@linuxfromscratch.org>
+   * Make check_signal more robust. 
+   * Use a better methog for killproc to remove a dead pid file.
+   * Clarify what signals killproc accepts.
+   * Thanks to input an ddiscussion from Scott Andrews.
+
 2021-02-01 Bruce Dubbs <bdubbs@linuxfromscratch.org>
    * Tweak mountfs to properly exit when an error is found.

bootscripts/lfs/lib/services/init-functions

@@ -284 +284 @@
             # Program is not running, but an invalid pid file exists
             # Remove the pid file.
-            rm -f "${pidfile}"
+
+            progname=${program##*/}
+
+            if [[ -e "/run/${progname}.pid" ]]; then
+                pidfile="/run/${progname}.pid"
+                rm -f "${pidfile}"
+            fi
 
             # This is only a success if no signal was passed.
@@ -714 +720 @@
 ################################################################################
 # check_signal()                                                               #
-# Usage: check_signal [ -{signal} | {signal} ]                                 #
+# Usage: check_signal [ -{signal} ]                                            #
 #                                                                              #
 # Purpose: Check for a valid signal.  This is not defined by any LSB draft,    #
@@ -720 +726 @@
 #          signals chosen are invalid arguments to the other functions.        #
 #                                                                              #
-# Inputs: Accepts a single string value in the form or -{signal} or {signal}   #
+# Inputs: Accepts a single string value in the form of -{signal}               #
 #                                                                              #
 # Return values:                                                               #
@@ -731 +737 @@
 
     # Add error handling for invalid signals
-    valsig="-ALRM -HUP -INT -KILL -PIPE -POLL -PROF -TERM -USR1 -USR2"
+    valsig=" -ALRM -HUP -INT -KILL -PIPE -POLL -PROF -TERM -USR1 -USR2"
     valsig="${valsig} -VTALRM -STKFLT -PWR -WINCH -CHLD -URG -TSTP -TTIN"
     valsig="${valsig} -TTOU -STOP -CONT -ABRT -FPE -ILL -QUIT -SEGV -TRAP"
     valsig="${valsig} -SYS -EMT -BUS -XCPU -XFSZ -0 -1 -2 -3 -4 -5 -6 -8 -9"
-    valsig="${valsig} -11 -13 -14 -15"
+    valsig="${valsig} -11 -13 -14 -15 "
 
     echo "${valsig}" | grep -- " ${1} " > /dev/null
@@ -766 +772 @@
 
     # The list of termination signals (limited to generally used items)
-    valsig="-ALRM -INT -KILL -TERM -PWR -STOP -ABRT -QUIT -2 -3 -6 -9 -14 -15"
+    valsig=" -ALRM -INT -KILL -TERM -PWR -STOP -ABRT -QUIT -2 -3 -6 -9 -14 -15 "
 
     echo "${valsig}" | grep -- " ${1} " > /dev/null

chapter01/changelog.xml

@@ -45 +45 @@
 
     <listitem>
+      <para>2021-04-28</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Add manual locales needed for tests
+          if using alternate locale installation instructions. Fixes
+          <ulink url="&lfs-ticket-root;4844">#4844</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Minor changes to boot scripts. Fixes
+          <ulink url="&lfs-ticket-root;4842">#4842</ulink>.
+          Thanks to Scott Andrews for the report.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2021-04-26</para>
       <itemizedlist>

chapter08/glibc.xml

@@ -281 +281 @@
     install locales not listed in the
     <filename>glibc-&glibc-version;/localedata/SUPPORTED</filename> file
-    in the unlikely case you need them.</para>
+    when you need them. For instance, the following two locales are
+    needed for some tests later in this chapter:</para>
+ 
+<screen role="nodump"><userinput remap="locale-full">localedef -i POSIX -f UTF-8 C.UTF-8 2> /dev/null || true
+localedef -i ja_JP -f SHIFT_JIS ja_JP.SIJS 2> /dev/null || true</userinput></screen>
 
     <note><para>Glibc now uses libidn2 when resolving internationalized 

packages.ent

@@ -377 +377 @@
 <!ENTITY less-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20210201">      <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20210428">      <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">        
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz">