ソースを参照

Merge changes from trunk to multilib

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@12145 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Thomas Trepl 4 年 前
コミット
999c5ba355
4 ファイル変更39 行追加15 行削除
  1. 19 0
      chapter01/changelog.xml
  2. 5 0
      chapter08/grub.xml
  3. 3 3
      general.ent
  4. 12 12
      packages.ent

+ 19 - 0
chapter01/changelog.xml

@@ -45,6 +45,25 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <itemizedlist>
+      <para>2021-02-20</para>
+        <listitem>
+          <para>[bdubbs] - Update to meson-0.57.1. Fixes
+          <ulink url="&lfs-ticket-root;4821">#4821</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Python-3.9.2. Fixes
+          <ulink url="&lfs-ticket-root;4820">#4820</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[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.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <itemizedlist>
       <para>2021-02-18</para>

+ 5 - 0
chapter08/grub.xml

@@ -40,6 +40,11 @@
   <sect2 role="installation">
     <title>Installation of GRUB</title>
 
+    <para>First, fix an issue introduced by binutils-2.36:</para>
+
+<screen><userinput remap="pre">sed "s/gold-version/&amp; -R .note.gnu.property/" \
+    -i Makefile.in grub-core/Makefile.in</userinput></screen>
+
     <para>Prepare GRUB for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr          \

+ 3 - 3
general.ent

@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20210218">
+<!ENTITY version         "SVN-20210220">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20210218-systemd">
+<!ENTITY versiond        "20210220-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "February 18th, 2021">
+<!ENTITY releasedate     "February 20th, 2021">
 
 <!ENTITY copyrightdate   "1999-2021"><!-- jhalfs needs a literal dash, not &ndash; -->
 

+ 12 - 12
packages.ent

@@ -480,10 +480,10 @@
 <!ENTITY man-pages-fin-du "4.7 MB">
 <!ENTITY man-pages-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY meson-version "0.57.0">
-<!ENTITY meson-size "1,801 KB">
+<!ENTITY meson-version "0.57.1">
+<!ENTITY meson-size "1,806 KB">
 <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "6dab36fcd89067897d2afa857a494752">
+<!ENTITY meson-md5 "fbd744560351491892478a36a1586815">
 <!ENTITY meson-home "https://mesonbuild.com">
 <!ENTITY meson-fin-du "37 MB">
 <!ENTITY meson-fin-sbu "less than 0.1 SBU">
@@ -581,19 +581,19 @@
 <!-- If python minor version changes, updates in python and 
      meson pages will be needed: python3.6 and python3.6m -->
 
-<!ENTITY python-version "3.9.1">
+<!ENTITY python-version "3.9.2">
 <!ENTITY python-minor "3.9">
-<!ENTITY python-size "18,455 KB">
+<!ENTITY python-size "18,477 KB">
 <!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
-<!ENTITY python-md5 "61981498e75ac8f00adcb908281fadb6">
+<!ENTITY python-md5 "f0dc9000312abeb16de4eccce9a870ab">
 <!ENTITY python-home "https://www.python.org/">
-<!ENTITY python-tmp-du "373 MB">
-<!ENTITY python-tmp-sbu "1.2 SBU">
-<!ENTITY python-fin-du "293 MB">
-<!ENTITY python-fin-sbu "3.1 SBU">
+<!ENTITY python-tmp-du "374 MB">
+<!ENTITY python-tmp-sbu "0.9 SBU">
+<!ENTITY python-fin-du "294 MB">
+<!ENTITY python-fin-sbu "2.8 SBU">
 <!ENTITY python-docs-url "https://www.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2">
-<!ENTITY python-docs-md5 "89fd591994e303186c349014b8f9e0fd">
-<!ENTITY python-docs-size "6,648 KB">
+<!ENTITY python-docs-md5 "719cd64a4c5768b646b716df20229400">
+<!ENTITY python-docs-size "6,659 KB">
 
 <!ENTITY readline-version "8.1">
 <!ENTITY readline-size "2,924 KB">