From cc2c231b500bb4ae0fbbb1ff2bda7707dfd2189e Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Thu, 3 Mar 2022 04:13:40 +0800 Subject: [PATCH 1/5] remove meson "test SBU" added unintentionally --- packages.ent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages.ent b/packages.ent index 6215f2586..fb2704ff7 100644 --- a/packages.ent +++ b/packages.ent @@ -496,7 +496,7 @@ - + From 9c4380393eb32dde391a26e83e358f1a9a1939f2 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sat, 5 Mar 2022 03:03:19 +0800 Subject: [PATCH 2/5] gcc: use $(gcc -dumpmachine) instead of *linux-gnu It's consistent with other commands in the same page, and also helpful for porting to targets with different triplets (-musl or -gnuabi64). --- chapter08/gcc.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter08/gcc.xml b/chapter08/gcc.xml index 4c62a8d17..16bb5f99f 100644 --- a/chapter08/gcc.xml +++ b/chapter08/gcc.xml @@ -174,7 +174,7 @@ rm -rf /usr/lib/gcc/$(gcc -dumpmachine)/&gcc-version;/include-fixed/bits/root user and group: chown -v -R root:root \ - /usr/lib/gcc/*linux-gnu/&gcc-version;/include{,-fixed} + /usr/lib/gcc/$(gcc -dumpmachine)/&gcc-version;/include{,-fixed} Create a symlink required by the FHS From 070bc9a4f72fc3b8bfde76bd93f46f8086bb8e19 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sat, 5 Mar 2022 04:27:39 +0800 Subject: [PATCH 3/5] add zstd upstream fixes patch --- chapter01/whatsnew.xml | 7 +------ chapter03/patches.xml | 7 +++++++ chapter08/zstd.xml | 4 ++++ patches.ent | 4 ++++ 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index fe9b3b278..e009291ca 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -280,14 +280,9 @@ Added: - diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 1a6e52338..4b24fad1f 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -141,6 +141,13 @@ + + Zstd Upstream Fixes Patch - &zstd-upstream-fixes-patch-size;: + + Download: + MD5 sum: &zstd-upstream-fixes-patch-md5; + + Total size of these patches: about diff --git a/chapter08/zstd.xml b/chapter08/zstd.xml index 881aba286..cde0b9231 100644 --- a/chapter08/zstd.xml +++ b/chapter08/zstd.xml @@ -42,6 +42,10 @@ Installation of Zstd + Apply a patch to fix some issues identified by upstream: + +patch -Np1 -i ../&zstd-upstream-fixes-patch; + Compile the package: make diff --git a/patches.ent b/patches.ent index cd2fb93e8..7e43f7e0a 100644 --- a/patches.ent +++ b/patches.ent @@ -87,3 +87,7 @@ + + + + From 8a572f06bb088ada73a0522625b3618e2d377bd8 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sat, 5 Mar 2022 04:59:41 +0800 Subject: [PATCH 4/5] don't chown $LFS/sources to lfs (#5018) --- chapter04/addinguser.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/chapter04/addinguser.xml b/chapter04/addinguser.xml index 49fb43466..535f20b02 100644 --- a/chapter04/addinguser.xml +++ b/chapter04/addinguser.xml @@ -85,12 +85,6 @@ case $(uname -m) in x86_64) chown -v lfs $LFS/lib64 ;; esac - If a separate working directory was created as suggested, give - user lfs ownership of this - directory: - -chown -v lfs $LFS/sources - In some host systems, the following command does not complete properly and suspends the login to the lfs user to the background. If the prompt "lfs:~$" does not appear immediately, entering the From cb39502e14b1d38de4c8089c65048c67f1e6078b Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sat, 5 Mar 2022 16:35:00 +0800 Subject: [PATCH 5/5] add changelog entries for 20220305 --- chapter01/changelog.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index cce1eb603..72cebc79e 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,21 @@ appropriate for the entry or if needed the entire day's listitem. --> + + 2022-03-05 + + + [xry111] - Stop changing the owner of + $LFS/source to + lfs. Fixes + #5018. + + + [xry111] - Add zstd-1.5.2 upstream fixes patch. + + + + 2022-03-02