Changeset 7d40eeb
- Timestamp:
- 07/18/2023 08:19:36 PM (14 months ago)
- Branches:
- multilib, xry111/multilib
- Children:
- 67b901f
- Parents:
- 9cdd53b (diff), b5acea48 (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. - Files:
-
- 1 added
- 1 deleted
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
appendices/dependencies.xml
r9cdd53b r7d40eeb 4 4 <!ENTITY % general-entities SYSTEM "../general.ent"> 5 5 %general-entities; 6 <!-- Convenient entity for "Systemd" or "Udev" --> 7 <!ENTITY systemd-udev "<phrase revision='systemd'>Systemd</phrase> 8 <phrase revision='sysv'>Udev</phrase>"> 6 9 ]> 7 10 … … 467 470 <segtitle>&before;</segtitle> 468 471 <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> 472 473 </seglistitem> 473 474 </segmentedlist> … … 637 638 638 639 <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">678 640 <segtitle>&external;</segtitle> 679 641 <seglistitem> … … 1556 1518 <segtitle>&before;</segtitle> 1557 1519 <seglistitem> 1558 <seg> Systemd</seg>1520 <seg>&systemd-udev;</seg> 1559 1521 </seglistitem> 1560 1522 </segmentedlist> … … 1634 1596 <segtitle>&before;</segtitle> 1635 1597 <seglistitem> 1636 <seg><phrase revision="sysv">Eudev</phrase> 1637 <phrase revision="systemd">Systemd</phrase></seg> 1598 <seg>&systemd-udev;</seg> 1638 1599 </seglistitem> 1639 1600 </segmentedlist> … … 1914 1875 <segtitle>&before;</segtitle> 1915 1876 <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> 1919 1878 </seglistitem> 1920 1879 </segmentedlist> … … 2237 2196 <segtitle>&before;</segtitle> 2238 2197 <seglistitem> 2239 <seg> 2240 <phrase revision='sysv'>None</phrase> 2241 <phrase revision='systemd'>Systemd</phrase> 2242 </seg> 2198 <seg>&systemd-udev;</seg> 2243 2199 </seglistitem> 2244 2200 </segmentedlist> … … 2439 2395 <segtitle>&before;</segtitle> 2440 2396 <seglistitem> 2441 <seg>Coreutils, Kmod, and Linux</seg>2397 <seg>Coreutils, Kmod, Linux, and &systemd-udev;</seg> 2442 2398 </seglistitem> 2443 2399 </segmentedlist> … … 2561 2517 <seg><phrase revision='systemd'>D-Bus, </phrase>E2fsprogs, 2562 2518 IProute2, Kmod, Man-DB, Procps-ng, Python, 2563 <phrase revision='systemd'>Systemd, </phrase>and Util-linux</seg>2519 &systemd-udev;, and Util-linux</seg> 2564 2520 </seglistitem> 2565 2521 </segmentedlist> … … 2867 2823 <segtitle>&dependencies;</segtitle> 2868 2824 <seglistitem> 2869 <seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, Expat, Gawk,2825 <seg>Acl, Bash, Binutils, Coreutils, Diffutils, Gawk, 2870 2826 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> 2872 2828 </seglistitem> 2873 2829 </segmentedlist> … … 2876 2832 <segtitle>&runtime;</segtitle> 2877 2833 <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> 2879 2836 </seglistitem> 2880 2837 </segmentedlist> … … 3105 3062 </segmentedlist> 3106 3063 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 3107 3104 <!-- Begin Util-linux dependency info --> 3108 3105 <bridgehead renderas="sect2" id="util-linux-dep">Util-linux</bridgehead> … … 3111 3108 <segtitle>&dependencies;</segtitle> 3112 3109 <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, 3115 3111 GCC, Gettext, Glibc, Grep, Make, Ncurses, Pkgconf, Sed, 3116 <phrase revision="systemd">Systemd, </phrase>and Zlib</seg>3112 &systemd-udev;, and Zlib</seg> 3117 3113 </seglistitem> 3118 3114 </segmentedlist> … … 3121 3117 <segtitle>&runtime;</segtitle> 3122 3118 <seglistitem> 3123 <seg>Glibc, Ncurses, Readline, and Zlib</seg>3119 <seg>Glibc, Ncurses, Readline, &systemd-udev;, and Zlib</seg> 3124 3120 </seglistitem> 3125 3121 </segmentedlist> … … 3309 3305 <segtitle>&before;</segtitle> 3310 3306 <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> 3314 3308 </seglistitem> 3315 3309 </segmentedlist> … … 3387 3381 <segtitle>&before;</segtitle> 3388 3382 <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> 3391 3384 </seglistitem> 3392 3385 </segmentedlist> -
appendices/udev-rules.xml
r9cdd53b r7d40eeb 9 9 <appendix id="rules" xreflabel="Appendix E" revision="sysv"> 10 10 <?dbhtml dir="scripts"?> 11 <?dbhtml filename=" eudev-rules.html"?>11 <?dbhtml filename="udev-rules.html"?> 12 12 13 13 <title>Udev configuration rules</title> 14 14 15 15 <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> 17 17 18 18 <sect1 id="lfsrules" role="wrap"> -
bootscripts/ChangeLog
r9cdd53b r7d40eeb 1 2023-07-15 Xi Ruoyao <xry111@xry111.site> 2 * Use /bin/udevadm instead of /sbin/udevadm. 3 1 4 2022-09-30 Bruce Dubbs <bdubbs@linuxfromscratch.org> 2 5 * Mount /dev/shm as a tmpfs. -
bootscripts/lfs/init.d/udev
r9cdd53b r7d40eeb 46 46 # Start the udev daemon to continually watch for, and act on, 47 47 # uevents 48 /sbin/udevd --daemon48 SYSTEMD_LOG_TARGET=kmsg /sbin/udevd --daemon 49 49 50 50 # Now traverse /sys in order to "coldplug" devices that have 51 51 # already been discovered 52 / sbin/udevadm trigger --action=add --type=subsystems53 / sbin/udevadm trigger --action=add --type=devices54 / sbin/udevadm trigger --action=change --type=devices52 /bin/udevadm trigger --action=add --type=subsystems 53 /bin/udevadm trigger --action=add --type=devices 54 /bin/udevadm trigger --action=change --type=devices 55 55 56 56 # Now wait for udevd to process the uevents we triggered 57 57 if ! is_true "$OMIT_UDEV_SETTLE"; then 58 / sbin/udevadm settle58 /bin/udevadm settle 59 59 fi 60 60 -
bootscripts/lfs/init.d/udev_retry
r9cdd53b r7d40eeb 35 35 log_info_msg "Retrying failed uevents, if any..." 36 36 37 # As of udev-186, the --run option is no longer valid38 #rundir=$(/sbin/udevadm info --run)39 37 rundir=/run/udev 40 38 # From Debian: "copy the rules generated before / was mounted … … 53 51 while read line ; do 54 52 for subsystem in $line ; do 55 / sbin/udevadm trigger --subsystem-match=$subsystem --action=add53 /bin/udevadm trigger --subsystem-match=$subsystem --action=add 56 54 done 57 55 done … … 59 57 # Now wait for udevd to process the uevents we triggered 60 58 if ! is_true "$OMIT_UDEV_RETRY_SETTLE"; then 61 / sbin/udevadm settle59 /bin/udevadm settle 62 60 fi 63 61 -
chapter01/changelog.xml
r9cdd53b r7d40eeb 44 44 <para>2023-07-15</para> 45 45 <itemizedlist> 46 <listitem revision='sysv'> 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> 46 50 <listitem> 47 51 <para>[bdubbs] - Update to iana-etc-20230629. Addresses -
chapter01/whatsnew.xml
r9cdd53b r7d40eeb 92 92 <para>E2fsprogs-&e2fsprogs-version;</para> 93 93 </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>--> 97 97 <!--<listitem> 98 98 <para>Expat-&expat-version;</para> … … 305 305 <listitem><para></para></listitem> <!-- satisfy build --> 306 306 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 307 319 <listitem> 308 320 <para>Libxcrypt-&libxcrypt-version;</para> … … 335 347 336 348 <listitem> 349 <para>eudev-3.2.12</para> 350 </listitem> 351 352 <listitem> 337 353 <para>Pkg-config-0.29.2</para> 338 354 </listitem> -
chapter03/packages.xml
r9cdd53b r7d40eeb 172 172 <para>Download: <ulink url="&elfutils-url;"/></para> 173 173 <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>182 174 </listitem> 183 175 </varlistentry> … … 397 389 </varlistentry> 398 390 399 <varlistentry revision="systemd">391 <varlistentry> 400 392 <term>Jinja2 (&jinja2-version;) - <token>&jinja2-size;</token>:</term> 401 393 <listitem> … … 546 538 </varlistentry> 547 539 548 <varlistentry revision="systemd">540 <varlistentry> 549 541 <term>MarkupSafe (&markupsafe-version;) - <token>&markupsafe-size;</token>:</term> 550 542 <listitem> … … 707 699 </varlistentry> 708 700 709 <varlistentry revision="systemd">701 <varlistentry> 710 702 <term>Systemd (&systemd-version;) - <token>&systemd-size;</token>:</term> 711 703 <listitem> … … 716 708 </varlistentry> 717 709 718 <varlistentry revision="systemd">710 <varlistentry> 719 711 <term>Systemd Man Pages(&systemd-version;) - <token>&systemd-man-size;</token>:</term> 720 712 <listitem> -
chapter08/chapter08.xml
r9cdd53b r7d40eeb 93 93 94 94 <!-- sysv only --> 95 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href=" eudev.xml"/>95 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udev.xml"/> 96 96 97 97 <!-- Both sysv on systemd builds --> -
chapter08/jinja2.xml
r9cdd53b r7d40eeb 6 6 ]> 7 7 8 <sect1 id="ch-system-jinja2" role="wrap" revision="systemd">8 <sect1 id="ch-system-jinja2" role="wrap"> 9 9 <?dbhtml filename="jinja2.html"?> 10 10 -
chapter08/man-pages.xml
r9cdd53b r7d40eeb 41 41 <title>Installation of Man-pages</title> 42 42 43 <para>Remove two man pages for password hashing functions. 44 <application>Libxcrypt</application> will provide a better version 45 of these man pages:</para> 46 47 <screen><userinput remap="pre">rm -v man3/crypt*</userinput></screen> 48 43 49 <para>Install Man-pages by running:</para> 44 50 -
chapter08/markupsafe.xml
r9cdd53b r7d40eeb 6 6 ]> 7 7 8 <sect1 id="ch-system-markupsafe" role="wrap" revision="systemd">8 <sect1 id="ch-system-markupsafe" role="wrap"> 9 9 <?dbhtml filename="markupsafe.html"?> 10 10 -
chapter09/network.xml
r9cdd53b r7d40eeb 38 38 <para>The interface names depend on the implementation and 39 39 configuration of the udev daemon running on the system. The udev 40 daemon for LFS (installed in <xref linkend="ch-system- eudev"/>) will40 daemon for LFS (installed in <xref linkend="ch-system-udev"/>) will 41 41 not run until the LFS system is booted. So the interface names 42 42 in the LFS system cannot always be determined by running -
chapter09/udev.xml
r9cdd53b r7d40eeb 17 17 18 18 <para>In <xref linkend="chapter-building-system"/>, we installed the udev 19 daemon when <phrase revision="sysv"> eudev</phrase>19 daemon when <phrase revision="sysv">udev</phrase> 20 20 <phrase revision="systemd">systemd</phrase> was built. Before we go into the 21 21 details regarding how udev works, a brief history of previous methods of -
chapter10/kernel.xml
r9cdd53b r7d40eeb 339 339 <listitem> 340 340 <para>Having this option set may interfere with device 341 management when using Udev /Eudev.</para>341 management when using Udev.</para> 342 342 </listitem> 343 343 </varlistentry> … … 349 349 kernel, even without Udev running. Udev then runs on top of this, 350 350 managing permissions and adding symlinks. This configuration 351 item is required for all users of Udev /Eudev.</para>351 item is required for all users of Udev.</para> 352 352 </listitem> 353 353 </varlistentry> -
lfs-latest-git.php
r9cdd53b r7d40eeb 125 125 if ( $package == "elfutils" ) $dirpath = "https://sourceware.org/ftp/elfutils"; 126 126 if ( $package == "expect" ) $dirpath = "https://sourceforge.net/projects/expect/files"; 127 if ( $package == "eudev" ) $dirpath = github("eudev-project/eudev");128 127 if ( $package == "file" ) $dirpath = "https://github.com/file/file/tags"; 129 128 if ( $package == "flex" ) $dirpath = github("westes/flex"); -
packages.ent
r9cdd53b r7d40eeb 156 156 <!ENTITY elfutils-fin-du "120 MB"> 157 157 <!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">165 158 166 159 <!ENTITY expat-version "2.5.0"> … … 400 393 <!ENTITY less-fin-sbu "less than 0.1 SBU"> 401 394 402 <!ENTITY lfs-bootscripts-version "20230 101"> <!-- Scripts depend on this format -->395 <!ENTITY lfs-bootscripts-version "20230716"> <!-- Scripts depend on this format --> 403 396 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB"> 404 397 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz"> … … 723 716 <!ENTITY tzdata-home "https://www.iana.org/time-zones"> 724 717 718 <!ENTITY udev-fin-du "130 MB"> 719 <!ENTITY udev-fin-sbu "0.2 SBU"> 720 725 721 <!ENTITY udev-lfs-version "udev-lfs-20171102"> 726 722 <!ENTITY udev-lfs-size "11 KB"> -
prologue/why.xml
r9cdd53b r7d40eeb 139 139 140 140 <listitem revision="sysv"> 141 <para> Eudev</para>141 <para>Udev</para> 142 142 143 143 <para>This package is a device manager. It dynamically controls the ownership, … … 234 234 <para>This package produces a program that generates a perfect hash 235 235 function from a set of keys. It is required by 236 <phrase revision='sysv'> Eudev</phrase>236 <phrase revision='sysv'>Udev</phrase> 237 237 <phrase revision='systemd'>Systemd</phrase>.</para> 238 238 </listitem>
Note:
See TracChangeset
for help on using the changeset viewer.