From ca22630e6aa06c75b222d9d6b7f65cab3d27583b Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Tue, 21 Jun 2022 15:17:03 +0800 Subject: [PATCH 1/3] provide revision-specific wget-list-$(REV) file It's irrational to force a sysv builder to download systemd, or vice versa. But we cannot simply make wget-list specific for revision: IIRC the wget-list file with all packages in either revision is used by some scripts on rivendell. So we keep wget-list as is, and provide a new wget-list-$(REV) file which only contains the packages for one revision. --- Makefile | 30 ++++++++++++++++++------------ chapter03/introduction.xml | 10 +++++----- general.ent | 7 +++++++ 3 files changed, 30 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 597ae1faa..bd6884a66 100644 --- a/Makefile +++ b/Makefile @@ -151,39 +151,45 @@ profile-html: stylesheets/lfs-xsl/profile.xsl \ $(RENDERTMP)/lfs-full.xml -wget-list: $(BASEDIR)/wget-list +wget-list: $(BASEDIR)/wget-list $(BASEDIR)/wget-list-$(REV) $(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml \ packages.ent patches.ent general.ent @echo "Generating consolidated wget list at $(BASEDIR)/wget-list ..." $(Q)mkdir -p $(BASEDIR) - -# $(Q)xsltproc --nonet --xinclude \ -# --stringparam profile.revision $(REV) \ -# --output $(RENDERTMP)/sysd-wget.xml \ -# stylesheets/lfs-xsl/profile.xsl \ -# chapter03/chapter03.xml - $(Q)xsltproc --xinclude --nonet \ --output $(BASEDIR)/wget-list \ stylesheets/wget-list.xsl \ chapter03/chapter03.xml +$(BASEDIR)/wget-list-$(REV): stylesheets/wget-list.xsl \ + chapter03/chapter03.xml \ + packages.ent patches.ent general.ent + $(Q)xsltproc --nonet --xinclude \ + --stringparam profile.revision $(REV) \ + --output $(RENDERTMP)/wget-list.xml \ + stylesheets/lfs-xsl/profile.xsl \ + chapter03/chapter03.xml + $(Q)xsltproc --xinclude --nonet \ + --output $(BASEDIR)/wget-list-$(REV) \ + stylesheets/wget-list.xsl \ + $(RENDERTMP)/wget-list.xml + md5sums: $(BASEDIR)/md5sums $(BASEDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml \ packages.ent patches.ent @echo "Generating consolidated md5sum file at $(BASEDIR)/md5sums ..." $(Q)mkdir -p $(BASEDIR) - $(Q)xsltproc --nonet --xinclude \ + $(Q)xsltproc --nonet --xinclude \ --stringparam profile.revision $(REV) \ - --output $(RENDERTMP)/sysv-md5sum.xml \ + --output $(RENDERTMP)/md5sum.xml \ stylesheets/lfs-xsl/profile.xsl \ chapter03/chapter03.xml - $(Q)xsltproc --xinclude --nonet \ + $(Q)xsltproc --xinclude --nonet \ --output $(BASEDIR)/md5sums \ stylesheets/md5sum.xsl \ - $(RENDERTMP)/sysv-md5sum.xml + $(RENDERTMP)/md5sum.xml $(Q)sed -i -e \ "s/BOOTSCRIPTS-MD5SUM/$(shell md5sum lfs-bootscripts*.tar.xz | cut -d' ' -f1)/" \ $(BASEDIR)/md5sums diff --git a/chapter03/introduction.xml b/chapter03/introduction.xml index bc95ed071..76fd5ee12 100644 --- a/chapter03/introduction.xml +++ b/chapter03/introduction.xml @@ -79,11 +79,11 @@ To download all of the packages and patches by using - wget-list as an input to the - wget command, use: - -wget --input-file=wget-list --continue --directory-prefix=$LFS/sources + &wget-list; + as an input to the wget command, use: +wget --input-file=&wget-list; --continue --directory-prefix=$LFS/sources + Additionally, starting with LFS-7.0, there is a separate file, md5sums, which can be used to verify that all the correct packages are available before proceeding. Place that file in diff --git a/general.ent b/general.ent index 7da71e60e..f378f7e20 100644 --- a/general.ent +++ b/general.ent @@ -72,6 +72,13 @@ ]]> + +]]> + +]]> + From 0c0b88293bdeacf9453a7ea88ddc5a7337c5dcde Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Tue, 21 Jun 2022 17:11:44 +0800 Subject: [PATCH 2/3] minor reword for glibc test failures on slow systems I've observed some failures building LFS on my old i3-3217U (at 1.8 GHz with -j4), but forgot to update the book. Just got reminded by a lfs-support post. --- chapter08/glibc.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml index be7d646d0..577625fe8 100644 --- a/chapter08/glibc.xml +++ b/chapter08/glibc.xml @@ -173,8 +173,9 @@ esac - The nss/tst-nss-files-hosts-multi - test is known to fail on relatively slow systems due to an internal + Some tests, for example + nss/tst-nss-files-hosts-multi, + are known to fail on relatively slow systems due to an internal timeout. - + + One gold test, pr17704a_test, is known to + fail if CONFIG_IA32_EMULATION is disabled in the + kernel configuration of the host system. + Install the package: make tooldir=/usr install diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml index 577625fe8..cb00c0719 100644 --- a/chapter08/glibc.xml +++ b/chapter08/glibc.xml @@ -178,6 +178,17 @@ esac are known to fail on relatively slow systems due to an internal timeout. + + + + About 27 tests, for example elf/tst-pldd, + are known to fail if the kernel supports namespaces (see + namespaces(7) for details) but the host distro + has disabled them via sysctl. +