aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml39
-rw-r--r--chapter01/whatsnew.xml14
-rw-r--r--chapter08/gcc.xml4
-rw-r--r--chapter08/udev.xml4
-rw-r--r--packages.ent54
-rw-r--r--udev-lfs/55-lfs.rules6
-rw-r--r--udev-lfs/55-lfs.txt11
-rw-r--r--udev-lfs/81-cdrom.rules3
-rw-r--r--udev-lfs/83-cdrom-symlinks.rules13
-rw-r--r--udev-lfs/ChangeLog4
-rw-r--r--udev-lfs/Makefile.lfs9
-rw-r--r--udev-lfs/README2
12 files changed, 88 insertions, 75 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 73fc65f72..d5debd345 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,45 @@
appropriate for the entry or if needed the entire day's listitem.
-->
+ <listitem>
+ <para>2023-07-28</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Update udev-lfs tarball to remove obsolete
+ cdrom rules and references to ISDN devices. Fixes
+ <ulink url='&lfs-ticket-root;5291'>#5291</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to wheel-0.41.0 (Python Module). Fixes
+ <ulink url='&lfs-ticket-root;5290'>#5290</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to tar-1.35. Fixes
+ <ulink url='&lfs-ticket-root;5287'>#5287</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to systemd-254. Fixes
+ <ulink url='&lfs-ticket-root;5293'>#5293</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to meson-1.2.0. Fixes
+ <ulink url='&lfs-ticket-root;5286'>#5286</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to linux-6.4.7. Fixes
+ <ulink url='&lfs-ticket-root;5288'>#5288</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to gcc-13.2.0. Fixes
+ <ulink url='&lfs-ticket-root;5292'>#5292</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to file-5.45. Fixes
+ <ulink url='&lfs-ticket-root;5294'>#5294</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
<listitem revision='sysv'>
<para>2023-07-28</para>
<itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 42d10c0aa..f40d3b33a 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -100,9 +100,9 @@
<!--<listitem>
<para>Expect-&expect-version;</para>
</listitem>-->
- <!--<listitem>
+ <listitem>
<para>File-&file-version;</para>
- </listitem>-->
+ </listitem>
<!--<listitem>
<para>Findutils-&findutils-version;</para>
</listitem>-->
@@ -250,15 +250,15 @@
<listitem revision="sysv">
<para>Sysklogd-&sysklogd-version;</para>
</listitem>
- <listitem revision="systemd">
+ <listitem>
<para>Systemd-&systemd-version;</para>
</listitem>
<!--<listitem revision="sysv">
<para>SysVinit-&sysvinit-version;</para>
</listitem>-->
- <!--<listitem>
+ <listitem>
<para>Tar-&tar-version;</para>
- </listitem>-->
+ </listitem>
<!--<listitem>
<para>Tcl-&tcl-version;</para>
</listitem>-->
@@ -274,9 +274,9 @@
<listitem>
<para>Vim-&vim-version;</para>
</listitem>
- <!--<listitem>
+ <listitem>
<para>wheel-&wheel-version;</para>
- </listitem>-->
+ </listitem>
<!--<listitem>
<para>XML-Parser-&xml-parser-version;</para>
</listitem>-->
diff --git a/chapter08/gcc.xml b/chapter08/gcc.xml
index 43f699689..bb22fbca5 100644
--- a/chapter08/gcc.xml
+++ b/chapter08/gcc.xml
@@ -172,10 +172,10 @@ su tester -c "PATH=$PATH make -k check"</userinput></screen>
url="&test-results;"/> and
<ulink url="https://gcc.gnu.org/ml/gcc-testresults/"/>.</para>
- <para>Two tests named <filename>pr104610.c</filename> and
+ <para><!--Two tests named <filename>pr104610.c</filename> and
<filename>pr69482-1.c</filename> are known to fail because the test
files does not account for the
- <parameter>--enable-default-ssp</parameter> option.
+ <parameter>- -enable-default-ssp</parameter> option.-->
<!-- https://gcc.gnu.org/PR106375 and https://gcc.gnu.org/PR109353 -->
Two tests named <filename>copy.cc</filename> and
<filename>pr56837.c</filename> are known to fail.
diff --git a/chapter08/udev.xml b/chapter08/udev.xml
index 2d3792511..67e835afc 100644
--- a/chapter08/udev.xml
+++ b/chapter08/udev.xml
@@ -127,7 +127,7 @@ meson setup \
install -vm755 -d /usr/{lib,share}/pkgconfig
install -vm755 udevadm /usr/bin/
install -vm755 systemd-hwdb /usr/bin/udev-hwdb
-ln -sv ../bin/udevadm /usr/sbin/udevd
+ln -svfn ../bin/udevadm /usr/sbin/udevd
cp -av libudev.so{,*[0-9]} /usr/lib/
install -vm644 ../src/libudev/libudev.h /usr/include/
install -vm644 src/libudev/*.pc /usr/lib/pkgconfig/
@@ -147,7 +147,7 @@ make -f &udev-lfs-version;/Makefile.lfs install</userinput></screen>
<!-- Please make sure systemd man pages tarball has a common leading
component in the path. -->
-<screen><userinput remap="install">tar -xf ../../systemd-man-pages-253.tar.xz --strip-components=1 \
+<screen><userinput remap="install">tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz --strip-components=1 \
-C /usr/share/man --wildcards '*/udev*' '*/libudev*' \
'*/systemd-'{hwdb,udevd.service}.8
sed 's/systemd\(\\\?-\)/udev-/' /usr/share/man/man8/systemd-hwdb.8 \
diff --git a/packages.ent b/packages.ent
index 09008604d..66e7314ab 100644
--- a/packages.ent
+++ b/packages.ent
@@ -172,10 +172,10 @@
<!ENTITY expect-tmp-du "3.9 MB">
<!ENTITY expect-tmp-sbu "0.2 SBU">
-<!ENTITY file-version "5.44">
-<!ENTITY file-size "1,159 KB">
+<!ENTITY file-version "5.45">
+<!ENTITY file-size "1,218 KB">
<!ENTITY file-url "https://astron.com/pub/file/file-&file-version;.tar.gz">
-<!ENTITY file-md5 "a60d586d49d015d842b9294864a89c7a">
+<!ENTITY file-md5 "26b2a96d4e3a8938827a1e572afd527a">
<!ENTITY file-home "https://www.darwinsys.com/file/">
<!ENTITY file-tmp-du "36 MB">
<!ENTITY file-tmp-sbu "0.1 SBU">
@@ -218,10 +218,10 @@
<!ENTITY gawk-fin-du "43 MB">
<!ENTITY gawk-fin-sbu "0.2 SBU">
-<!ENTITY gcc-version "13.1.0">
-<!ENTITY gcc-size "85,402 KB">
+<!ENTITY gcc-version "13.2.0">
+<!ENTITY gcc-size "85,800 KB">
<!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.xz">
-<!ENTITY gcc-md5 "43e4de77f2218c83ca675257ea1af9ef">
+<!ENTITY gcc-md5 "e0e48554cc6e4f261d55ddee9ab69075">
<!ENTITY gcc-sha256 "">
<!ENTITY gcc-home "https://gcc.gnu.org/">
<!ENTITY gcc-tmpp1-du "3.8 GB">
@@ -433,12 +433,12 @@
<!ENTITY linux-major-version "6">
<!ENTITY linux-minor-version "4">
-<!ENTITY linux-patch-version "3">
+<!ENTITY linux-patch-version "7">
<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "134,557 KB">
+<!ENTITY linux-size "134,566 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "c83363136e61977c63d655733424d37a">
+<!ENTITY linux-md5 "f3d802a16823550866e7dcafb1350bb5">
<!ENTITY linux-home "https://www.kernel.org/">
<!-- measured for 5.13.4 / gcc-11.1.0 on x86_64 : minimum is
allnoconfig rounded down to allow for ongoing cleanups,
@@ -493,10 +493,10 @@
<!ENTITY markupsafe-fin-du "544 KB">
<!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
-<!ENTITY meson-version "1.1.1">
-<!ENTITY meson-size "2,076 KB">
+<!ENTITY meson-version "1.2.0">
+<!ENTITY meson-size "2,132 KB">
<!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "0f810b31b26156989ac9321fa2063a04">
+<!ENTITY meson-md5 "677616183f2c5e03e2139b06280129a0">
<!ENTITY meson-home "https://mesonbuild.com">
<!ENTITY meson-fin-du "41 MB">
<!ENTITY meson-fin-sbu "less than 0.1 SBU">
@@ -643,20 +643,20 @@
<!ENTITY sysklogd-fin-du "0.7 MB">
<!ENTITY sysklogd-fin-sbu "less than 0.1 SBU">
-<!ENTITY systemd-version "253">
+<!ENTITY systemd-version "254">
<!--<!ENTITY systemd-stable "6b4878d">-->
<!-- The above entity is used whenever we move to a stable backport branch. In the event of a critical problem or kernel
change that is incompatible, we will switch to the backport branch until the next stable release. -->
-<!ENTITY systemd-size "11,708 KB">
+<!ENTITY systemd-size "13,985 KB">
<!ENTITY systemd-url "&github;/systemd/systemd/archive/v&systemd-version;/systemd-&systemd-version;.tar.gz">
<!--<!ENTITY systemd-url "&anduin-sources;/systemd-&systemd-version;-&systemd-stable;.tar.xz">-->
-<!ENTITY systemd-md5 "7cf12ee8a91a04306fc6cf290eed42e8">
+<!ENTITY systemd-md5 "0d266e5361dc72097b6c18cfde1c0001">
<!ENTITY systemd-home "https://www.freedesktop.org/wiki/Software/systemd/">
-<!ENTITY systemd-man-version "253">
-<!ENTITY systemd-man-size "600 KB">
+<!ENTITY systemd-man-version "254">
+<!ENTITY systemd-man-size "626 KB">
<!--<!ENTITY systemd-man-url "&anduin-sources;/systemd-man-pages-&systemd-version;-&systemd-stable;.tar.xz">-->
<!ENTITY systemd-man-url "&anduin-sources;/systemd-man-pages-&systemd-man-version;.tar.xz">
-<!ENTITY systemd-man-md5 "8b54792c9433fc8db8e5d10db326802d">
+<!ENTITY systemd-man-md5 "fc32faeac581e1890ca27fcea3858410">
<!ENTITY systemd-fin-du "258 MB">
<!ENTITY systemd-fin-sbu "0.7 SBU">
@@ -668,10 +668,10 @@
<!ENTITY sysvinit-fin-du "4.4 MB">
<!ENTITY sysvinit-fin-sbu "less than 0.1 SBU">
-<!ENTITY tar-version "1.34">
-<!ENTITY tar-size "2,174 KB">
+<!ENTITY tar-version "1.35">
+<!ENTITY tar-size "2,263 KB">
<!ENTITY tar-url "&gnu;tar/tar-&tar-version;.tar.xz">
-<!ENTITY tar-md5 "9a08d29a9ac4727130b5708347c0f5cf">
+<!ENTITY tar-md5 "a2d8042658cfd8ea939e6d911eaf4152">
<!ENTITY tar-home "&gnu-software;tar/">
<!ENTITY tar-tmp-du "38 MB">
<!ENTITY tar-tmp-sbu "0.1 SBU">
@@ -709,10 +709,10 @@
<!ENTITY udev-fin-du "130 MB">
<!ENTITY udev-fin-sbu "0.2 SBU">
-<!ENTITY udev-lfs-version "udev-lfs-20171102">
-<!ENTITY udev-lfs-size "11 KB">
+<!ENTITY udev-lfs-version "udev-lfs-20230728">
+<!ENTITY udev-lfs-size "10 KB">
<!ENTITY udev-lfs-url "&anduin-sources;/&udev-lfs-version;.tar.xz">
-<!ENTITY udev-lfs-md5 "27cd82f9a61422e186b9d6759ddf1634">
+<!ENTITY udev-lfs-md5 "8a3b921e3a28d36ac46d17137d920268">
<!ENTITY udev-lfs-home " ">
<!ENTITY util-linux-minor "2.39">
@@ -737,10 +737,10 @@
<!ENTITY vim-fin-du "235 MB">
<!ENTITY vim-fin-sbu "2.4 SBU">
-<!ENTITY wheel-version "0.40.0">
-<!ENTITY wheel-size "96 KB">
+<!ENTITY wheel-version "0.41.0">
+<!ENTITY wheel-size "95 KB">
<!ENTITY wheel-url "&pypi-src;/w/wheel/wheel-&wheel-version;.tar.gz">
-<!ENTITY wheel-md5 "ec5004c46d1905da98bb5bc1a10ddd21">
+<!ENTITY wheel-md5 "aa72e4a9847874aae8302108fb0fd333">
<!ENTITY wheel-home "&pypi-home;/wheel/">
<!ENTITY wheel-fin-du "1.3 MB">
<!ENTITY wheel-fin-sbu "less than 0.1 SBU">
diff --git a/udev-lfs/55-lfs.rules b/udev-lfs/55-lfs.rules
index 34229ea2c..8d37ba920 100644
--- a/udev-lfs/55-lfs.rules
+++ b/udev-lfs/55-lfs.rules
@@ -6,9 +6,3 @@
SUBSYSTEM=="rtc", ACTION=="add", MODE="0644", RUN+="/etc/rc.d/init.d/setclock start"
KERNEL=="rtc", ACTION=="add", MODE="0644", RUN+="/etc/rc.d/init.d/setclock start"
-# Comms devices
-
-KERNEL=="ippp[0-9]*", GROUP="dialout"
-KERNEL=="isdn[0-9]*", GROUP="dialout"
-KERNEL=="isdnctrl[0-9]*", GROUP="dialout"
-KERNEL=="dcbri[0-9]*", GROUP="dialout"
diff --git a/udev-lfs/55-lfs.txt b/udev-lfs/55-lfs.txt
index 5f116f9b7..6e0afda59 100644
--- a/udev-lfs/55-lfs.txt
+++ b/udev-lfs/55-lfs.txt
@@ -7,14 +7,9 @@ Description of rules:
By default, Udev creates device nodes with UID 0, GID 0, and permissions 0660.
-ISDN-related devices should be owned by the 'dialout' group, hence the following
-rule (and similar):
-
-KERNEL=="ippp[0-9]*", GROUP="dialout"
-
-The RTC-related rules cause the setclock bootscript to be run as soon as the
+The RTC-related rule causes the setclock bootscript to be run as soon as the
RTC device has been created by Udev, meaning that times in log files, for
example, are as accurate as possible as quickly as possible.
-A final word of caution: Any particular rule must be written on one line, and a
-comma must separate each part of the rule.
+A word of caution: A comma must separate each part of the rule. A rule can span
+multiple lines if the newline is escaped by a backslash.
diff --git a/udev-lfs/81-cdrom.rules b/udev-lfs/81-cdrom.rules
deleted file mode 100644
index cb7ea5748..000000000
--- a/udev-lfs/81-cdrom.rules
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/udev/rules.d/81-cdrom.rules: Set CD-ROM permissions and get device capabilities
-
-ACTION=="add", SUBSYSTEM=="block", ENV{ID_TYPE}=="cd", IMPORT{program}="cdrom_id --export $tempnode", GROUP="cdrom"
diff --git a/udev-lfs/83-cdrom-symlinks.rules b/udev-lfs/83-cdrom-symlinks.rules
deleted file mode 100644
index 1a21a0649..000000000
--- a/udev-lfs/83-cdrom-symlinks.rules
+++ /dev/null
@@ -1,13 +0,0 @@
-# /etc/udev/rules.d/83-cdrom-symlinks.rules: Determine CD drive capability.
-
-ACTION!="add", GOTO="cd_aliases_generator_end"
-SUBSYSTEM!="block", GOTO="cd_aliases_generator_end"
-ENV{GENERATED}=="?*", GOTO="cd_aliases_generator_end"
-
-# Fail the uevent if the autogenerated rules cannot be saved
-ENV{ID_CDROM}=="?*", PROGRAM="/bin/grep -c ' / [^[:space:]]* rw' /proc/mounts", \
- RESULT!="1", RUN+="/bin/false", GOTO="cd_aliases_generator_end"
-
-ENV{ID_CDROM}=="?*", PROGRAM="write_cd_rules", SYMLINK+="%c"
-
-LABEL="cd_aliases_generator_end"
diff --git a/udev-lfs/ChangeLog b/udev-lfs/ChangeLog
index 560346143..53660938a 100644
--- a/udev-lfs/ChangeLog
+++ b/udev-lfs/ChangeLog
@@ -1,3 +1,7 @@
+2023-07-28 <bdubbs@linuxfromscratch.org>
+ * Remove obsolete 83-cdrom-symlinks.rules and 81-cdrom.rules
+ * Remove references to obsolete ISDN devices
+
2017-10-27 <bdubbs@linuxfromscratch.org>
* 83-cdrom-symlinks.rules: Adjust test for writable root directory.
diff --git a/udev-lfs/Makefile.lfs b/udev-lfs/Makefile.lfs
index 1218d9dcd..a8b4d7f30 100644
--- a/udev-lfs/Makefile.lfs
+++ b/udev-lfs/Makefile.lfs
@@ -3,7 +3,7 @@
# vim: tabstop=3
-VERSION=20171102
+VERSION=20230728
SHELL=/bin/bash
ifeq ($(V),)
@@ -16,15 +16,14 @@ all:
@echo "Use the install target"
install:
- @mkdir -pv $(DESTDIR)/lib/udev/rules.d \
+ @mkdir -pv $(DESTDIR)/usr/lib/udev/rules.d \
$(DESTDIR)/etc/udev/rules.d \
$(DESTDIR)/usr/share/doc/udev-$(VERSION)/lfs
# Copy rules
@cp -v udev-lfs-$(VERSION)/*.rules $(DESTDIR)/etc/udev/rules.d
- @cp -v udev-lfs-$(VERSION)/*_rules \
- udev-lfs-$(VERSION)/init-net-rules.sh \
- udev-lfs-$(VERSION)/rule_generator.functions $(DESTDIR)/lib/udev
+ @cp -v udev-lfs-$(VERSION)/init-net-rules.sh \
+ udev-lfs-$(VERSION)/rule_generator.functions $(DESTDIR)/usr/lib/udev
# Copy documentation
@cp -v udev-lfs-$(VERSION)/README $(DESTDIR)/usr/share/doc/udev-$(VERSION)/lfs
diff --git a/udev-lfs/README b/udev-lfs/README
index 61d0e86bc..1f050eb15 100644
--- a/udev-lfs/README
+++ b/udev-lfs/README
@@ -14,9 +14,7 @@ Makefile.lfs - The LFS Makefile. Installs udev rules for LFS.
contrib - Useful rules from debian
contrib/debian
-contrib/debian/83-cdrom-symlinks.rules
contrib/debian/write_cd_aliases
-contrib/debian/81-cdrom.rules
55-lfs.rules - LFS custom rules
write_net_rules - Scripts for LFS rules