From 747287d8adcd0881952c80451ce29a98d8225f17 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Tue, 2 Nov 2021 14:22:30 +0100 Subject: [PATCH 1/3] gawk, chap 6: now config.guess is in build-aux --- chapter06/gawk.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter06/gawk.xml b/chapter06/gawk.xml index efe7b4380..40d69548d 100644 --- a/chapter06/gawk.xml +++ b/chapter06/gawk.xml @@ -51,7 +51,7 @@ ./configure --prefix=/usr \ --host=$LFS_TGT \ - --build=$(./config.guess) + --build=$(build-aux/config.guess) Compile the package: From 095286b709ec60e070ee798ffc12e133d289d15f Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Tue, 2 Nov 2021 14:23:41 +0100 Subject: [PATCH 2/3] Revert the change /bin/bash->/usr/bin/bash We are not sure what the interaction with /etc/shells is... --- chapter07/createfiles.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chapter07/createfiles.xml b/chapter07/createfiles.xml index 85d24c6a6..e7e3c7868 100644 --- a/chapter07/createfiles.xml +++ b/chapter07/createfiles.xml @@ -61,7 +61,7 @@ EOF command: cat > /etc/passwd << "EOF" -root:x:0:0:root:/root:/usr/bin/bash +root:x:0:0:root:/root:/bin/bash bin:x:1:1:bin:/dev/null:/usr/bin/false daemon:x:6:6:Daemon User:/dev/null:/usr/bin/false messagebus:x:18:18:D-Bus Message Daemon User:/run/dbus:/usr/bin/false @@ -70,7 +70,7 @@ nobody:x:99:99:Unprivileged User:/dev/null:/usr/bin/false EOF cat > /etc/passwd << "EOF" -root:x:0:0:root:/root:/usr/bin/bash +root:x:0:0:root:/root:/bin/bash bin:x:1:1:bin:/dev/null:/usr/bin/false daemon:x:6:6:Daemon User:/dev/null:/usr/bin/false messagebus:x:18:18:D-Bus Message Daemon User:/run/dbus:/usr/bin/false @@ -175,7 +175,7 @@ EOF user. We add this user here and delete this account at the end of that chapter. -echo "tester:x:101:101::/home/tester:/usr/bin/bash" >> /etc/passwd +echo "tester:x:101:101::/home/tester:/bin/bash" >> /etc/passwd echo "tester:x:101:" >> /etc/group install -o tester -d /home/tester From 3328dfdc691a1920fcae70954fa77f1ddc49bcfc Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Tue, 2 Nov 2021 21:44:49 +0800 Subject: [PATCH 3/3] systemd: fix a typo --- chapter08/systemd.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml index 46719cc27..70e747650 100644 --- a/chapter08/systemd.xml +++ b/chapter08/systemd.xml @@ -59,7 +59,7 @@ sed -i -e 's/GROUP="render"/GROUP="video"/' \ -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in - Fix a mesaon problem: + Fix a meson problem: sed -i 's/+ want_libfuzzer.*$/and want_libfuzzer/' meson.build