From a9a92e43f7b068ad903eb533b1685a3a56f7c808 Mon Sep 17 00:00:00 2001 From: DJ Lucas Date: Wed, 10 Oct 2018 05:05:17 +0000 Subject: [PATCH] Removed incorrect link to /toold/lib64 in systemd instructions. Fixes #4355. Added systemd-239-meson-0.40.0_fixes-1.patch to resolve build errors with meson. Update to meson-0.40.0. Fixes #4351. Update to linux-4.18.12. Fixes #4352. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11474 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 23 +++++++++++++++++++++++ chapter03/patches.xml | 9 +++++++++ chapter06/systemd.xml | 6 +++++- general.ent | 6 +++--- packages.ent | 12 ++++++------ patches.ent | 5 +++++ 6 files changed, 51 insertions(+), 10 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index a666aff0a..65fec55e2 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -43,6 +43,29 @@ appropriate for the entry or if needed the entire day's listitem. --> + + 2018-10-10 + + + [dj] - Removed incorrect link to /toold/lib64 in systemd + instructions. Fixes + #4355. + + + [dj] - Added systemd-239-meson-0.40.0_fixes-1.patch to resolve + build errors with meson. + + + [dj] - Update to meson-0.40.0. Fixes + #4351. + + + [dj] - Update to linux-4.18.12. Fixes + #4352. + + + + 2018-09-30 diff --git a/chapter03/patches.xml b/chapter03/patches.xml index f7e71bd64..deb408fea 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -134,6 +134,15 @@ + + systemd meson fixes patch - &systemd-meson-patch-size;: + + Download: + MD5 sum: &systemd-meson-patch-md5; + + + + Total size of these patches: about diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml index 0db60770f..c987066d4 100644 --- a/chapter06/systemd.xml +++ b/chapter06/systemd.xml @@ -47,7 +47,7 @@ Because we have not yet installed the final version of Util-Linux, create links to the libraries in the approprite location: -for file in /tools/lib64/lib{blkid,mount,uuid}*; do +for file in /tools/lib/lib{blkid,mount,uuid}*; do ln -sf $file /usr/lib/ done @@ -63,6 +63,10 @@ done patch -Np1 -i ../systemd-&systemd-version;-glibc_statx_fix-1.patch + Apply a patch to fix a build failure with meson-0.40.0: + +patch -Np1 -i ../systemd-&systemd-version;-meson-0.40.0_fixes-1.patch + Remove an unneeded group, render, from the default udev rules: diff --git a/general.ent b/general.ent index f2c6d7f60..2a5afc54e 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ - + - + - + diff --git a/packages.ent b/packages.ent index 2ea26a333..d7f1cffaf 100644 --- a/packages.ent +++ b/packages.ent @@ -413,12 +413,12 @@ - + - + - +