Changeset a68ea9a


Ignore:
Timestamp:
04/29/2021 06:25:19 AM (6 months ago)
Author:
Xi Ruoyao <xry111@…>
Branches:
xry111/usr-move
Children:
811f42a
Parents:
80a0fa6 (diff), 99ee345 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'trunk' into xry111/usr-move

Files:
7 edited

Legend:

Unmodified
Added
Removed
  • bootscripts/ChangeLog

    r80a0fa6 ra68ea9a  
     12021-04-28 Bruce Dubbs <bdubbs@linuxfromscratch.org>
     2   * Make check_signal more robust.
     3   * Use a better methog for killproc to remove a dead pid file.
     4   * Clarify what signals killproc accepts.
     5   * Thanks to input an ddiscussion from Scott Andrews.
     6
    172021-02-01 Bruce Dubbs <bdubbs@linuxfromscratch.org>
    28   * Tweak mountfs to properly exit when an error is found.
  • bootscripts/lfs/lib/services/init-functions

    r80a0fa6 ra68ea9a  
    284284            # Program is not running, but an invalid pid file exists
    285285            # Remove the pid file.
    286             rm -f "${pidfile}"
     286
     287            progname=${program##*/}
     288
     289            if [[ -e "/run/${progname}.pid" ]]; then
     290                pidfile="/run/${progname}.pid"
     291                rm -f "${pidfile}"
     292            fi
    287293
    288294            # This is only a success if no signal was passed.
     
    714720################################################################################
    715721# check_signal()                                                               #
    716 # Usage: check_signal [ -{signal} | {signal} ]                                 #
     722# Usage: check_signal [ -{signal} ]                                            #
    717723#                                                                              #
    718724# Purpose: Check for a valid signal.  This is not defined by any LSB draft,    #
     
    720726#          signals chosen are invalid arguments to the other functions.        #
    721727#                                                                              #
    722 # Inputs: Accepts a single string value in the form or -{signal} or {signal}   #
     728# Inputs: Accepts a single string value in the form of -{signal}               #
    723729#                                                                              #
    724730# Return values:                                                               #
     
    731737
    732738    # Add error handling for invalid signals
    733     valsig="-ALRM -HUP -INT -KILL -PIPE -POLL -PROF -TERM -USR1 -USR2"
     739    valsig=" -ALRM -HUP -INT -KILL -PIPE -POLL -PROF -TERM -USR1 -USR2"
    734740    valsig="${valsig} -VTALRM -STKFLT -PWR -WINCH -CHLD -URG -TSTP -TTIN"
    735741    valsig="${valsig} -TTOU -STOP -CONT -ABRT -FPE -ILL -QUIT -SEGV -TRAP"
    736742    valsig="${valsig} -SYS -EMT -BUS -XCPU -XFSZ -0 -1 -2 -3 -4 -5 -6 -8 -9"
    737     valsig="${valsig} -11 -13 -14 -15"
     743    valsig="${valsig} -11 -13 -14 -15 "
    738744
    739745    echo "${valsig}" | grep -- " ${1} " > /dev/null
     
    766772
    767773    # The list of termination signals (limited to generally used items)
    768     valsig="-ALRM -INT -KILL -TERM -PWR -STOP -ABRT -QUIT -2 -3 -6 -9 -14 -15"
     774    valsig=" -ALRM -INT -KILL -TERM -PWR -STOP -ABRT -QUIT -2 -3 -6 -9 -14 -15 "
    769775
    770776    echo "${valsig}" | grep -- " ${1} " > /dev/null
  • chapter01/changelog.xml

    r80a0fa6 ra68ea9a  
    4545
    4646    <listitem>
     47      <para>2021-04-28</para>
     48      <itemizedlist>
     49        <listitem revision="systemd">
     50          <para>[renodr] - Fix building systemd with Linux-API-Headers 5.11.14
     51          and higher, as well as with meson-0.57.2. Fixes
     52          <ulink url="&lfs-ticket-root;4851">#4851</ulink>.</para>
     53        </listitem>
     54        <listitem>
     55          <para>[bdubbs] - Add manual locales needed for tests
     56          if using alternate locale installation instructions. Fixes
     57          <ulink url="&lfs-ticket-root;4844">#4844</ulink>.</para>
     58        </listitem>
     59        <listitem>
     60          <para>[bdubbs] - Minor changes to boot scripts. Fixes
     61          <ulink url="&lfs-ticket-root;4842">#4842</ulink>.
     62          Thanks to Scott Andrews for the report.</para>
     63        </listitem>
     64      </itemizedlist>
     65    </listitem>
     66
     67    <listitem>
    4768      <para>2021-04-26</para>
    4869      <itemizedlist>
  • chapter08/glibc.xml

    r80a0fa6 ra68ea9a  
    281281    install locales not listed in the
    282282    <filename>glibc-&glibc-version;/localedata/SUPPORTED</filename> file
    283     in the unlikely case you need them.</para>
     283    when you need them. For instance, the following two locales are
     284    needed for some tests later in this chapter:</para>
     285 
     286<screen role="nodump"><userinput remap="locale-full">localedef -i POSIX -f UTF-8 C.UTF-8 2> /dev/null || true
     287localedef -i ja_JP -f SHIFT_JIS ja_JP.SIJS 2> /dev/null || true</userinput></screen>
    284288
    285289    <note><para>Glibc now uses libidn2 when resolving internationalized
  • chapter08/systemd.xml

    r80a0fa6 ra68ea9a  
    5151    with future versions of the kernel:</para>
    5252
    53 <screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-2.patch</userinput></screen>
     53<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-3.patch</userinput></screen>
    5454
    5555    <para>Remove tests that cannot be built in chroot:</para>
  • packages.ent

    r80a0fa6 ra68ea9a  
    377377<!ENTITY less-fin-sbu "less than 0.1 SBU">
    378378
    379 <!ENTITY lfs-bootscripts-version "20210201">      <!-- Scripts depend on this format -->
     379<!ENTITY lfs-bootscripts-version "20210428">      <!-- Scripts depend on this format -->
    380380<!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">       
    381381<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz">
  • patches.ent

    r80a0fa6 ra68ea9a  
    6868<!ENTITY sysvinit-consolidated-patch-size "2.4 KB">
    6969
    70 <!ENTITY systemd-upstream-fixes-patch "systemd-&systemd-version;-upstream_fixes-2.patch">
    71 <!ENTITY systemd-upstream-fixes-patch-md5 "7afe3d13464ae7d20dbe5e6f0fb8ccd3">
    72 <!ENTITY systemd-upstream-fixes-patch-size "12 KB">
     70<!ENTITY systemd-upstream-fixes-patch "systemd-&systemd-version;-upstream_fixes-3.patch">
     71<!ENTITY systemd-upstream-fixes-patch-md5 "949768da539ddfa2bf6e936b81ed96df">
     72<!ENTITY systemd-upstream-fixes-patch-size "16 KB">
Note: See TracChangeset for help on using the changeset viewer.