From e9619f650fc142ac74d5cdbf0b5c23000c1d949e Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Fri, 21 Jul 2023 21:08:09 +0800 Subject: [PATCH 1/6] Partially revert "man-db: Update known test failures, again" This partially reverts commit 1053282e5f0a6e7bba9605676b650d46db6ffaf4. There is actually only one test suite in LFS build even with -k, but on my complete system there are many test failures with "-k". I guess some tests depend on non-LFS packages. The text change is reverted, but the command change is preserved as generally we should use -k for any make check command known to fail. --- chapter08/man-db.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/chapter08/man-db.xml b/chapter08/man-db.xml index 498274f51..88c811d33 100644 --- a/chapter08/man-db.xml +++ b/chapter08/man-db.xml @@ -111,12 +111,14 @@ make - - Many tests are known to fail with groff-1.23.0 or later. If - you still want to test the results anyway, issue: + To test the results, issue: make -k check + + One test named man1/lexgrog.1 is known + to fail. + Install the package: make install From 0d824c52807e3060f19e5ba5c7408905cd3aa4c2 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sat, 22 Jul 2023 18:36:33 +0800 Subject: [PATCH 2/6] kernel: Simplify doc installation --- chapter10/kernel.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml index 244c86623..ad6b252a7 100644 --- a/chapter10/kernel.xml +++ b/chapter10/kernel.xml @@ -431,8 +431,7 @@ Device Drivers ---> Install the documentation for the Linux kernel: -install -d /usr/share/doc/linux-&linux-version; -cp -r Documentation/* /usr/share/doc/linux-&linux-version; +cp -r Documentation -T /usr/share/doc/linux-&linux-version; It is important to note that the files in the kernel source directory are not owned by root. Whenever a From 8435a70be4cc12621cfd3b8f500df85f8d79b2fd Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sat, 22 Jul 2023 23:40:32 +0800 Subject: [PATCH 3/6] bootscripts: mountvirtfs: Create essential symlinks in /dev targeting /proc These were handled by Eudev, but systemd-udevd stopped to creating them since 2020. --- bootscripts/ChangeLog | 4 ++++ bootscripts/lfs/init.d/mountvirtfs | 26 +++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog index 0c1d33f6d..efff97b83 100644 --- a/bootscripts/ChangeLog +++ b/bootscripts/ChangeLog @@ -1,3 +1,7 @@ +2023-07-22 Xi Ruoyao + * In mountvirtfs, create symlinks /dev/{fd,std{in,out,err}} and + /dev/core (optional). + 2023-07-15 Xi Ruoyao * Use /bin/udevadm instead of /sbin/udevadm. diff --git a/bootscripts/lfs/init.d/mountvirtfs b/bootscripts/lfs/init.d/mountvirtfs index 21d98a05d..bbf30cf90 100644 --- a/bootscripts/lfs/init.d/mountvirtfs +++ b/bootscripts/lfs/init.d/mountvirtfs @@ -7,8 +7,9 @@ # Authors : Gerard Beekmans - gerard@linuxfromscratch.org # DJ Lucas - dj@linuxfromscratch.org # Update : Bruce Dubbs - bdubbs@linuxfromscratch.org +# Xi Ruoyao - xry111@xry111.site # -# Version : LFS 7.0 +# Version : LFS 12.0 # ######################################################################## @@ -62,6 +63,29 @@ case "${1}" in log_info_msg2 " ${INFO}/dev/shm" mount -o nosuid,nodev /dev/shm || failed=1 + (exit ${failed}) + evaluate_retval + if [ "${failed}" = 1 ]; then + exit 1 + fi + + log_info_msg "Create symlinks in /dev targeting /proc: ${INFO}/dev/stdin" + ln -sf /proc/self/fd/0 /dev/stdin || failed=1 + + log_info_msg2 " ${INFO}/dev/stdout" + ln -sf /proc/self/fd/1 /dev/stdout || failed=1 + + log_info_msg2 " ${INFO}/dev/stderr" + ln -sf /proc/self/fd/2 /dev/stderr || failed=1 + + log_info_msg2 " ${INFO}/dev/fd" + ln -sf /proc/self/fd /dev/fd || failed=1 + + if [ -e /proc/kcore ]; then + log_info_msg2 " ${INFO}/dev/core" + ln -sf /proc/kcore /dev/core || failed=1 + fi + (exit ${failed}) evaluate_retval exit $failed From da0d47999c7beca8270f16f181968add075c81c3 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sat, 22 Jul 2023 23:44:10 +0800 Subject: [PATCH 4/6] bootscripts: Add missed Change Log entry and version bump for udev --- bootscripts/ChangeLog | 4 ++++ bootscripts/lfs/init.d/udev | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog index efff97b83..d255411b1 100644 --- a/bootscripts/ChangeLog +++ b/bootscripts/ChangeLog @@ -2,6 +2,10 @@ * In mountvirtfs, create symlinks /dev/{fd,std{in,out,err}} and /dev/core (optional). +2023-07-16 Xi Ruoyao + * In udev, set SYSTEMD_LOG_TARGET=kmsg so systemd-udevd will correctly + log messages. + 2023-07-15 Xi Ruoyao * Use /bin/udevadm instead of /sbin/udevadm. diff --git a/bootscripts/lfs/init.d/udev b/bootscripts/lfs/init.d/udev index f7d4b9bff..f3b07b022 100644 --- a/bootscripts/lfs/init.d/udev +++ b/bootscripts/lfs/init.d/udev @@ -7,8 +7,9 @@ # Authors : Zack Winkles, Alexander E. Patrakov # DJ Lucas - dj@linuxfromscratch.org # Update : Bruce Dubbs - bdubbs@linuxfromscratch.org +# Xi Ruoyao - xry111@xry111.site # -# Version : LFS 7.0 +# Version : LFS 12.0 # ######################################################################## From e641f736d70a5ce60c50292fb972b46a2abf351c Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sat, 22 Jul 2023 23:46:40 +0800 Subject: [PATCH 5/6] Update to lfs-bootscripts-20230722 --- chapter01/changelog.xml | 11 +++++++++++ packages.ent | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 57b966b7f..f92fbcfcb 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,17 @@ appropriate for the entry or if needed the entire day's listitem. --> + + 2023-07-22 + + + [xry111] - Make the mountvirtfs bootscript create essential + symlinks in /dev. Fixes + #5289. + + + + 2023-07-15 diff --git a/packages.ent b/packages.ent index 11378b56e..6fd5c0280 100644 --- a/packages.ent +++ b/packages.ent @@ -383,7 +383,7 @@ - + From e5c08bfbf444744ab327e139f9422d52a89ef9ff Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 23 Jul 2023 00:20:13 +0800 Subject: [PATCH 6/6] changelog: Fix rendering with REV=systemd Empty is not allowed. --- chapter01/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index f92fbcfcb..cfb845733 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,7 +40,7 @@ appropriate for the entry or if needed the entire day's listitem. --> - + 2023-07-22