Changeset b277295


Ignore:
Timestamp:
07/17/2023 11:38:16 PM (11 months ago)
Author:
Xi Ruoyao <xry111@…>
Branches:
xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1
Children:
e8179f4
Parents:
803bcf8 (diff), 2cbb613 (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 remote-tracking branch 'origin/trunk' into xry111/loongarch

Files:
1 added
1 deleted
13 edited

Legend:

Unmodified
Added
Removed

  • appendices/dependencies.xml

    r803bcf8 rb277295  
    44  <!ENTITY % general-entities SYSTEM "../general.ent">
    55  %general-entities;
     6  <!-- Convenient entity for "Systemd" or "Udev" -->
     7  <!ENTITY systemd-udev "<phrase revision='systemd'>Systemd</phrase>
     8                         <phrase revision='sysv'>Udev</phrase>">
    69]>
    710
    … …  
    467470        <segtitle>&before;</segtitle>
    468471        <seglistitem>
    469           <seg>Bash, Diffutils, <phrase revision="sysv">Eudev, </phrase>
    470           Findutils, <phrase revision="sysv">and </phrase>Man-DB<phrase
    471           revision="systemd">, and Systemd</phrase></seg>
     472          <seg>Bash, Diffutils, Findutils, Man-DB, and &systemd-udev;</seg>
    472473        </seglistitem>
    473474      </segmentedlist>
    … …  
    637638
    638639      <segmentedlist id="e2fsprogs-optdeps">
    639         <segtitle>&external;</segtitle>
    640         <seglistitem>
    641           <seg>None</seg>
    642         </seglistitem>
    643       </segmentedlist>
    644 
    645 <!-- Begin Eudev dependency info -->
    646   <bridgehead renderas="sect2" id="eudev-dep" revision="sysv">Eudev</bridgehead>
    647 
    648       <segmentedlist id="eudev-depends" revision="sysv">
    649         <segtitle>&dependencies;</segtitle>
    650         <seglistitem>
    651           <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Gperf, Make,
    652           Sed, and Util-linux</seg>
    653         </seglistitem>
    654       </segmentedlist>
    655 
    656       <segmentedlist id="eudev-rundeps" revision="sysv">
    657         <segtitle>&runtime;</segtitle>
    658         <seglistitem>
    659           <seg>Glibc, Kmod, Xz, Util-linux, and Zlib.</seg>
    660         </seglistitem>
    661       </segmentedlist>
    662 
    663       <segmentedlist id="eudev-testdeps" revision="sysv">
    664         <segtitle>&testsuites;</segtitle>
    665         <seglistitem>
    666           <seg>None</seg>
    667         </seglistitem>
    668       </segmentedlist>
    669 
    670       <segmentedlist id="eudev-before" revision="sysv">
    671         <segtitle>&before;</segtitle>
    672         <seglistitem>
    673           <seg>None</seg>
    674         </seglistitem>
    675       </segmentedlist>
    676 
    677       <segmentedlist id="eudev-optdeps" revision="sysv">
    678640        <segtitle>&external;</segtitle>
    679641        <seglistitem>
    … …  
    15561518        <segtitle>&before;</segtitle>
    15571519        <seglistitem>
    1558           <seg>Systemd</seg>
     1520          <seg>&systemd-udev;</seg>
    15591521        </seglistitem>
    15601522      </segmentedlist>
    … …  
    16341596        <segtitle>&before;</segtitle>
    16351597        <seglistitem>
    1636           <seg><phrase revision="sysv">Eudev</phrase>
    1637           <phrase revision="systemd">Systemd</phrase></seg>
     1598          <seg>&systemd-udev;</seg>
    16381599        </seglistitem>
    16391600      </segmentedlist>
    … …  
    19141875        <segtitle>&before;</segtitle>
    19151876        <seglistitem>
    1916           <seg>GCC, Perl, Python,
    1917           <phrase revision='sysv'>and </phrase>Shadow<phrase
    1918           revision='systemd'>, and Systemd</phrase></seg>
     1877          <seg>GCC, Perl, Python, Shadow, and &systemd-udev;</seg>
    19191878        </seglistitem>
    19201879      </segmentedlist>
    … …  
    22372196        <segtitle>&before;</segtitle>
    22382197        <seglistitem>
    2239           <seg>
    2240             <phrase revision='sysv'>None</phrase>
    2241             <phrase revision='systemd'>Systemd</phrase>
    2242           </seg>
     2198          <seg>&systemd-udev;</seg>
    22432199        </seglistitem>
    22442200      </segmentedlist>
    … …  
    24392395        <segtitle>&before;</segtitle>
    24402396        <seglistitem>
    2441           <seg>Coreutils, Kmod, and Linux</seg>
     2397          <seg>Coreutils, Kmod, Linux, and &systemd-udev;</seg>
    24422398        </seglistitem>
    24432399      </segmentedlist>
    … …  
    25612517          <seg><phrase revision='systemd'>D-Bus, </phrase>E2fsprogs,
    25622518          IProute2, Kmod, Man-DB, Procps-ng, Python,
    2563                   <phrase revision='systemd'>Systemd, </phrase>and Util-linux</seg>
     2519                  &systemd-udev;, and Util-linux</seg>
    25642520        </seglistitem>
    25652521      </segmentedlist>
    … …  
    28672823        <segtitle>&dependencies;</segtitle>
    28682824        <seglistitem>
    2869          <seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, Expat, Gawk,
     2825         <seg>Acl, Bash, Binutils, Coreutils, Diffutils, Gawk,
    28702826         GCC, Glibc, Gperf, Grep, Jinja2, Libcap, Libxcrypt, Meson,
    2871          Pkgconf, Sed, Util-linux, and Zstd</seg>
     2827         OpenSSL, Pkgconf, Sed, Util-linux, and Zstd</seg>
    28722828        </seglistitem>
    28732829      </segmentedlist>
    … …  
    28762832        <segtitle>&runtime;</segtitle>
    28772833        <seglistitem>
    2878           <seg>Acl, Attr, Glibc, Libcap, Libxcrypt, and Util-linux</seg>
     2834          <seg>Acl, Glibc, Libcap, Libxcrypt, OpenSSL, Util-linux, Xz,
     2835          Zlib, and Zstd</seg>
    28792836        </seglistitem>
    28802837      </segmentedlist>
    … …  
    31053062      </segmentedlist>
    31063063
     3064<!-- Begin Udev dependency info -->
     3065  <bridgehead renderas="sect2" id="udev-dep" revision="sysv">Udev</bridgehead>
     3066
     3067      <segmentedlist id="udev-depends" revision="sysv">
     3068        <segtitle>&dependencies;</segtitle>
     3069        <seglistitem>
     3070         <seg>Acl, Bash, Binutils, Coreutils, Diffutils, Gawk,
     3071         GCC, Glibc, Gperf, Grep, Jinja2, Libcap, Libxcrypt, Meson,
     3072         OpenSSL, Pkgconf, Sed, Util-linux, and Zstd</seg>
     3073        </seglistitem>
     3074      </segmentedlist>
     3075
     3076      <segmentedlist id="udev-rundeps" revision="sysv">
     3077        <segtitle>&runtime;</segtitle>
     3078        <seglistitem>
     3079          <seg>Acl, Glibc, Libcap, OpenSSL, and Util-linux</seg>
     3080        </seglistitem>
     3081      </segmentedlist>
     3082
     3083      <segmentedlist id="udev-testdeps" revision="sysv">
     3084        <segtitle>&testsuites;</segtitle>
     3085        <seglistitem>
     3086          <seg>None</seg>
     3087        </seglistitem>
     3088      </segmentedlist>
     3089
     3090      <segmentedlist id="udev-before" revision="sysv">
     3091        <segtitle>&before;</segtitle>
     3092        <seglistitem>
     3093          <seg>Util-linux</seg>
     3094        </seglistitem>
     3095      </segmentedlist>
     3096
     3097      <segmentedlist id="udev-optdeps" revision="sysv">
     3098        <segtitle>&external;</segtitle>
     3099        <seglistitem>
     3100          <seg>None</seg>
     3101        </seglistitem>
     3102      </segmentedlist>
     3103
    31073104<!-- Begin Util-linux dependency info -->
    31083105  <bridgehead renderas="sect2" id="util-linux-dep">Util-linux</bridgehead>
    … …  
    31113108        <segtitle>&dependencies;</segtitle>
    31123109        <seglistitem>
    3113           <seg>Bash, Binutils, Coreutils, Diffutils,
    3114           <phrase revision="sysv">Eudev, </phrase>File, Findutils, Gawk,
     3110          <seg>Bash, Binutils, Coreutils, Diffutils, File, Findutils, Gawk,
    31153111          GCC, Gettext, Glibc, Grep, Make, Ncurses, Pkgconf, Sed,
    3116           <phrase revision="systemd">Systemd, </phrase>and Zlib</seg>
     3112          &systemd-udev;, and Zlib</seg>
    31173113        </seglistitem>
    31183114      </segmentedlist>
    … …  
    31213117        <segtitle>&runtime;</segtitle>
    31223118        <seglistitem>
    3123           <seg>Glibc, Ncurses, Readline, and Zlib</seg>
     3119          <seg>Glibc, Ncurses, Readline, &systemd-udev;, and Zlib</seg>
    31243120        </seglistitem>
    31253121      </segmentedlist>
    … …  
    33093305        <segtitle>&before;</segtitle>
    33103306        <seglistitem>
    3311           <seg><phrase revision="sysv">Eudev, </phrase>File, GRUB, Kmod,
    3312           Libelf, <phrase revision="sysv">and </phrase>Man-DB<phrase
    3313           revision="systemd">, and Systemd</phrase></seg>
     3307          <seg>File, GRUB, Kmod, Libelf, Man-DB, and &systemd-udev;</seg>
    33143308        </seglistitem>
    33153309      </segmentedlist>
    … …  
    33873381        <segtitle>&before;</segtitle>
    33883382        <seglistitem>
    3389           <seg><phrase revision='sysv'>GCC and Libelf</phrase>
    3390           <phrase revision='systemd'>GCC, Libelf, and Systemd</phrase></seg>
     3383          <seg>GCC, Libelf, and &systemd-udev;</seg>
    33913384        </seglistitem>
    33923385      </segmentedlist>

  • appendices/udev-rules.xml

    r803bcf8 rb277295  
    1414
    1515  <para>The rules in this appendix are listed for convenience.  Installation is
    16   normally done via instructions in <xref linkend='ch-system-eudev'/>.  </para>
     16  normally done via instructions in <xref linkend='ch-system-udev'/>.  </para>
    1717
    1818  <sect1 id="lfsrules" role="wrap">

  • bootscripts/ChangeLog

    r803bcf8 rb277295  
     12023-07-15 Xi Ruoyao <xry111@xry111.site>
     2   * Use /bin/udevadm instead of /sbin/udevadm.
     3
    142022-09-30 Bruce Dubbs <bdubbs@linuxfromscratch.org>
    25   * Mount /dev/shm as a tmpfs.

  • bootscripts/lfs/init.d/udev

    r803bcf8 rb277295  
    4646      # Start the udev daemon to continually watch for, and act on,
    4747      # uevents
    48       /sbin/udevd --daemon
     48      SYSTEMD_LOG_TARGET=kmsg /sbin/udevd --daemon
    4949
    5050      # Now traverse /sys in order to "coldplug" devices that have
    5151      # already been discovered
    52       /sbin/udevadm trigger --action=add    --type=subsystems
    53       /sbin/udevadm trigger --action=add    --type=devices
    54       /sbin/udevadm trigger --action=change --type=devices
     52      /bin/udevadm trigger --action=add    --type=subsystems
     53      /bin/udevadm trigger --action=add    --type=devices
     54      /bin/udevadm trigger --action=change --type=devices
    5555
    5656      # Now wait for udevd to process the uevents we triggered
    5757      if ! is_true "$OMIT_UDEV_SETTLE"; then
    58          /sbin/udevadm settle
     58         /bin/udevadm settle
    5959      fi
    6060

  • bootscripts/lfs/init.d/udev_retry

    r803bcf8 rb277295  
    3535      log_info_msg "Retrying failed uevents, if any..."
    3636
    37       # As of udev-186, the --run option is no longer valid
    38       #rundir=$(/sbin/udevadm info --run)
    3937      rundir=/run/udev
    4038      # From Debian: "copy the rules generated before / was mounted
    … …  
    5351      while read line ; do
    5452         for subsystem in $line ; do
    55             /sbin/udevadm trigger --subsystem-match=$subsystem --action=add
     53            /bin/udevadm trigger --subsystem-match=$subsystem --action=add
    5654         done
    5755      done
    … …  
    5957      # Now wait for udevd to process the uevents we triggered
    6058      if ! is_true "$OMIT_UDEV_RETRY_SETTLE"; then
    61          /sbin/udevadm settle
     59         /bin/udevadm settle
    6260      fi
    6361

  • chapter01/changelog.xml

    r803bcf8 rb277295  
    4545      <itemizedlist>
    4646        <listitem>
     47          <para>[xry111] - Replace eudev-3.2.12 with udev from systemd-253.
     48          Fixes <ulink url='&lfs-ticket-root;5285'>#5085</ulink>.</para>
     49        </listitem>
     50        <listitem>
    4751          <para>[bdubbs] - Update to iana-etc-20230629.  Addresses
    4852          <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>

  • chapter01/whatsnew.xml

    r803bcf8 rb277295  
    9292       <para>E2fsprogs-&e2fsprogs-version;</para>
    9393    </listitem>-->
    94     <listitem revision="sysv">
    95        <para>Eudev-&eudev-version;</para>
    96     </listitem>
     94    <!--<listitem revision="sysv">
     95       <para>Udev-&systemd-version; (from systemd)</para>
     96    </listitem>-->
    9797    <!--<listitem>
    9898       <para>Expat-&expat-version;</para>
    … …  
    305305    <listitem><para></para></listitem>  <!-- satisfy build -->
    306306
     307    <listitem revision="sysv">
     308       <para>Udev-&systemd-version; (from systemd)</para>
     309    </listitem>
     310
     311    <listitem revision="sysv">
     312      <para>Jinja2-&jinja2-version;</para>
     313    </listitem>
     314
     315    <listitem revision="sysv">
     316      <para>MarkupSafe-&markupsafe-version;</para>
     317    </listitem>
     318
    307319    <listitem>
    308320      <para>Libxcrypt-&libxcrypt-version;</para>
    … …  
    339351
    340352    <listitem>
     353      <para>eudev-3.2.12</para>
     354    </listitem>
     355
     356    <listitem>
    341357      <para>grub-2.06-upstream_fixes-1.patch</para>
    342358    </listitem>

  • chapter03/packages.xml

    r803bcf8 rb277295  
    172172        <para>Download: <ulink url="&elfutils-url;"/></para>
    173173        <para>MD5 sum: <literal>&elfutils-md5;</literal></para>
    174       </listitem>
    175     </varlistentry>
    176 
    177     <varlistentry revision="sysv">
    178       <term>Eudev (&eudev-version;) - <token>&eudev-size;</token>:</term>
    179       <listitem>
    180         <para>Download: <ulink url="&eudev-url;"/></para>
    181         <para>MD5 sum: <literal>&eudev-md5;</literal></para>
    182174      </listitem>
    183175    </varlistentry>
    … …  
    388380    </varlistentry>
    389381
    390     <varlistentry revision="systemd">
     382    <varlistentry>
    391383      <term>Jinja2 (&jinja2-version;) - <token>&jinja2-size;</token>:</term>
    392384      <listitem>
    … …  
    537529    </varlistentry>
    538530
    539     <varlistentry revision="systemd">
     531    <varlistentry>
    540532      <term>MarkupSafe (&markupsafe-version;) - <token>&markupsafe-size;</token>:</term>
    541533      <listitem>
    … …  
    698690    </varlistentry>
    699691
    700     <varlistentry revision="systemd">
     692    <varlistentry>
    701693      <term>Systemd (&systemd-version;) - <token>&systemd-size;</token>:</term>
    702694      <listitem>
    … …  
    707699    </varlistentry>
    708700
    709     <varlistentry revision="systemd">
     701    <varlistentry>
    710702      <term>Systemd Man Pages(&systemd-version;) - <token>&systemd-man-size;</token>:</term>
    711703      <listitem>

  • chapter08/chapter08.xml

    r803bcf8 rb277295  
    9292
    9393  <!-- sysv only -->
    94   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eudev.xml"/>
     94  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udev.xml"/>
    9595
    9696  <!-- Both sysv on systemd builds -->

  • chapter08/jinja2.xml

    r803bcf8 rb277295  
    66]>
    77
    8 <sect1 id="ch-system-jinja2" role="wrap" revision="systemd">
     8<sect1 id="ch-system-jinja2" role="wrap">
    99  <?dbhtml filename="jinja2.html"?>
    1010

  • chapter08/markupsafe.xml

    r803bcf8 rb277295  
    66]>
    77
    8 <sect1 id="ch-system-markupsafe" role="wrap" revision="systemd">
     8<sect1 id="ch-system-markupsafe" role="wrap">
    99  <?dbhtml filename="markupsafe.html"?>
    1010

  • chapter09/network.xml

    r803bcf8 rb277295  
    3838      <para>The interface names depend on the implementation and
    3939      configuration of the udev daemon running on the system.  The udev
    40       daemon for LFS (installed in <xref linkend="ch-system-eudev"/>) will
     40      daemon for LFS (installed in <xref linkend="ch-system-udev"/>) will
    4141      not run until the LFS system is booted.  So the interface names
    4242      in the LFS system cannot always be determined by running

  • packages.ent

    r803bcf8 rb277295  
    156156<!ENTITY elfutils-fin-du "120 MB">
    157157<!ENTITY elfutils-fin-sbu "0.3 SBU">
    158 
    159 <!ENTITY eudev-version "3.2.12">
    160 <!ENTITY eudev-size "2,145 KB">
    161 <!ENTITY eudev-url "https://github.com/eudev-project/eudev/releases/download/v&eudev-version;/eudev-&eudev-version;.tar.gz">
    162 <!ENTITY eudev-md5 "6f1559ca7c27013ff68816e2732498a3">
    163 <!ENTITY eudev-fin-du "83 MB">
    164 <!ENTITY eudev-fin-sbu "0.1 SBU">
    165158
    166159<!ENTITY expat-version "2.5.0">
    … …  
    391384<!ENTITY less-fin-sbu "less than 0.1 SBU">
    392385
    393 <!ENTITY lfs-bootscripts-version "20230101">      <!-- Scripts depend on this format -->
     386<!ENTITY lfs-bootscripts-version "20230716">      <!-- Scripts depend on this format -->
    394387<!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">
    395388<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz">
    … …  
    714707<!ENTITY tzdata-home "https://www.iana.org/time-zones">
    715708
     709<!ENTITY udev-fin-du "130 MB">
     710<!ENTITY udev-fin-sbu "0.2 SBU">
     711
    716712<!ENTITY udev-lfs-version "udev-lfs-20171102">
    717713<!ENTITY udev-lfs-size    "11 KB">
Note: See TracChangeset for help on using the changeset viewer.