[lfsja-git] r11.0-93 対応。

diff --git a/configure b/configure
index 06836a0..3cd414e 100755 (executable)
--- a/configure
+++ b/configure
@@ -4737,7 +4737,7 @@ fi
 
 
 
-TARGETVER=r11.0-91
+TARGETVER=r11.0-93
 if test "x$revspec" = "xsystemd"; then
   TARGETVER="$TARGETVER-systemd"
 fi

diff --git a/src/appendices/dependencies.ch b/src/appendices/dependencies.ch
index b364650..37457c1 100644 (file)
--- a/src/appendices/dependencies.ch
+++ b/src/appendices/dependencies.ch
@@ -1464,9 +1464,9 @@
           <seg>なし</seg>
 @z
 @x
-          <seg>None</seg>
+            <ulink url="&blfs-book;general/cpio.html">cpio</ulink>
 @y
-          <seg>なし</seg>
+            <ulink url="&blfs-book;general/cpio.html">cpio</ulink>
 @z
 
 %----------------------------------------------------------------------

diff --git a/src/chapter01/changelog.ch b/src/chapter01/changelog.ch
index 2b023be..a2723c6 100644 (file)
--- a/src/chapter01/changelog.ch
+++ b/src/chapter01/changelog.ch
@@ -44,6 +44,56 @@
 @z
 
 @x
+      <para>2021-12-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to vim-8.2.3704. Addresses
+          <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iana-etc-20211124. Fixes
+          <ulink url="&lfs-ticket-root;4957">#4957</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to bc-5.2.1. Fixes
+          <ulink url="&lfs-ticket-root;4959">#4959</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to meson-0.60.2. Fixes
+          <ulink url="&lfs-ticket-root;4960">#4960</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-5.15.5. Fixes
+          <ulink url="&lfs-ticket-root;4956">#4956</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+@y
+      <para>2021-12-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - vim-8.2.3704 へのアップデート。
+          <ulink url="&lfs-ticket-root;4500">#4500</ulink>にて言及。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - iana-etc-20211124 へのアップデート。
+          <ulink url="&lfs-ticket-root;4957">#4957</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - bc-5.2.1 へのアップデート。
+          <ulink url="&lfs-ticket-root;4959">#4959</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - meson-0.60.2 へのアップデート。
+          <ulink url="&lfs-ticket-root;4960">#4960</ulink> を Fix に。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - linux-5.15.5 へのアップデート。
+          <ulink url="&lfs-ticket-root;4956">#4956</ulink> を Fix に。</para>
+        </listitem>
+      </itemizedlist>
+@z
+
+@x
       <para>2021-11-15</para>
       <itemizedlist>
         <listitem>

diff --git a/src/chapter01/jchangelog.ch b/src/chapter01/jchangelog.ch
index 0f22684..d712669 100644 (file)
--- a/src/chapter01/jchangelog.ch
+++ b/src/chapter01/jchangelog.ch
@@ -50,6 +50,17 @@
 
 -->
    <listitem>
+      <para>2021-12-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matsuand] -
+          r11.0-93 (<ulink url="&lfs-changeset;bdc9e03b7">bdc9e03b7</ulink>) までの対応。
+          </para>
+        </listitem>
+      </itemizedlist>
+   </listitem>
+
+   <listitem>
       <para>2021-11-16</para>
       <itemizedlist>
         <listitem>

diff --git a/src/chapter03/packages.ch b/src/chapter03/packages.ch
index 22031ec..ebdee97 100644 (file)
--- a/src/chapter03/packages.ch
+++ b/src/chapter03/packages.ch
@@ -712,11 +712,11 @@
 @x
             The version of vim changes daily. To get the latest version, go to
             <ulink url="https://github.com/vim/vim/releases">
-            https://github.com/vim/vim/releases</ulink>.
+            https://github.com/vim/vim/tags</ulink>.
 @y
             vim のバージョンは日々更新されます。
             最新版を入手するには <ulink url="https://github.com/vim/vim/releases">
-            https://github.com/vim/vim/releases</ulink> にアクセスしてください。
+            https://github.com/vim/vim/tags</ulink> にアクセスしてください。
 @z
 
 @x XML::Parser

diff --git a/src/chapter10/kernel.ch b/src/chapter10/kernel.ch
index c12004a..62bc047 100644 (file)
--- a/src/chapter10/kernel.ch
+++ b/src/chapter10/kernel.ch
@@ -188,6 +188,16 @@
       <title>上の設定項目の説明</title>
 @z
 
+@x Enable kernel headers through /sys/kernel/kheaders.tar.xz
+          <para>This will require <command>cpio</command> building the kernel.
+          <command>cpio</command> is not installed by LFS.</para>
+@y
+          <para>
+          これは、 カーネルビルドにあたって <command>cpio</command> を必要とします。
+          <command>cpio</command> は LFS ではインストールしません。
+          </para>
+@z
+
 @x Support for uevent helper
           <para>Having this option set may interfere with device
           management when using Udev/Eudev. </para>

diff --git a/src/general.ch b/src/general.ch
index 84e31d8..9070352 100644 (file)
--- a/src/general.ch
+++ b/src/general.ch
@@ -47,9 +47,9 @@
 <!ENTITY copyrightdate   "%crdate;">
 ]]>
 
-<!ENTITY jversion        "20211116">
-<!ENTITY jversiond       "20211116">
-<!ENTITY jcorrespondSHA  "784f3c36e"> <!-- lfs-git SHA 値； 本箇所での記載のみ -->
+<!ENTITY jversion        "20211201">
+<!ENTITY jversiond       "20211201">
+<!ENTITY jcorrespondSHA  "bdc9e03b7"> <!-- lfs-git SHA 値； 本箇所での記載のみ -->
 <!ENTITY dir-jversion    "git-ja">
 <!ENTITY dir-jversiond   "git-sysdja">
 @z

diff --git a/version.ac b/version.ac
index cc81f27..7ab936e 100644 (file)
--- a/version.ac
+++ b/version.ac
@@ -2,4 +2,4 @@ dnl
 dnl  This is part of LFSbookja package.
 dnl 
 dnl m4-include this file to define the current LFS version
-m4_define([lfs_version], [r11.0-91])
+m4_define([lfs_version], [r11.0-93])