From b4dce40f7c6200e9459778fc054607855bb9e2db Mon Sep 17 00:00:00 2001 From: Thomas Trepl Date: Sun, 21 Feb 2021 07:15:36 +0000 Subject: [PATCH] Merge changes from trunk to multilib git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@12145 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 19 +++++++++++++++++++ chapter08/grub.xml | 5 +++++ general.ent | 6 +++--- packages.ent | 24 ++++++++++++------------ 4 files changed, 39 insertions(+), 15 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 2e9ab619f..a8512992d 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -45,6 +45,25 @@ appropriate for the entry or if needed the entire day's listitem. --> + + + 2021-02-20 + + [bdubbs] - Update to meson-0.57.1. Fixes + #4821. + + + [bdubbs] - Update to Python-3.9.2. Fixes + #4820. + + + [pierre] - Fix grub to prevent generation of a huge binary + blob for lzma compression. Reported on the lfs-support mailing + list by Frans de Boer. + + + + 2021-02-18 diff --git a/chapter08/grub.xml b/chapter08/grub.xml index 51726e87f..d78a4458a 100644 --- a/chapter08/grub.xml +++ b/chapter08/grub.xml @@ -40,6 +40,11 @@ Installation of GRUB + First, fix an issue introduced by binutils-2.36: + +sed "s/gold-version/& -R .note.gnu.property/" \ + -i Makefile.in grub-core/Makefile.in + Prepare GRUB for compilation: ./configure --prefix=/usr \ diff --git a/general.ent b/general.ent index 98ba1b607..5ef641cfa 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ - + - + - + diff --git a/packages.ent b/packages.ent index 14d5e5438..2f06fb564 100644 --- a/packages.ent +++ b/packages.ent @@ -480,10 +480,10 @@ - - + + - + @@ -581,19 +581,19 @@ - + - + - + - - - - + + + + - - + +