[lfsja-git] r10.1-121 対応。

diff --git a/configure b/configure
index ec9576e..b1526d1 100755 (executable)
--- a/configure
+++ b/configure
@@ -4720,7 +4720,7 @@ fi
 
 
 
-TARGETVER=r10.1-120
+TARGETVER=r10.1-121
 
 (cd ${bookdir} && sh git-version.sh)
 if test -f ${bookdir}/version.ent; then

diff --git a/src/chapter01/changelog.ch b/src/chapter01/changelog.ch
index 3cb57cb..3d7207c 100644 (file)
--- a/src/chapter01/changelog.ch
+++ b/src/chapter01/changelog.ch
@@ -50,6 +50,22 @@
 @z
 
 @x
+      <para>2021-07-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Remove modifications to m4 that are no longer needed.</para>
+        </listitem>
+      </itemizedlist>
+@y
+      <para>2021-07-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - m4 における修正内容が不要になったため削除。</para>
+        </listitem>
+      </itemizedlist>
+@z
+
+@x
       <para>2021-07-08</para>
       <itemizedlist>
         <listitem revision="systemd">

diff --git a/src/chapter01/jchangelog.ch b/src/chapter01/jchangelog.ch
index bc630f6..ab4944a 100644 (file)
--- a/src/chapter01/jchangelog.ch
+++ b/src/chapter01/jchangelog.ch
@@ -60,6 +60,17 @@
 -->
 
    <listitem>
+      <para>2021-07-16</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matsuand] -
+          r10.1-121 (<ulink url="&lfs-changeset;f3997370c">f3997370c</ulink>) までの対応。
+          </para>
+        </listitem>
+      </itemizedlist>
+   </listitem>
+
+   <listitem>
       <para>2021-07-12</para>
       <itemizedlist>
         <listitem>

diff --git a/src/general.ch b/src/general.ch
index ca174a3..6b5a6ab 100644 (file)
--- a/src/general.ch
+++ b/src/general.ch
@@ -24,9 +24,9 @@
 <!ENTITY releasedate     "August 26th, 2021">
 <!ENTITY copyrightdate   "1999-2021">
 -->
-<!ENTITY jversion        "20210712">
-<!ENTITY jversiond       "20210712">
-<!ENTITY jcorrespondSHA  "176404f5e"> <!-- lfs-git SHA 値； 本箇所での記載のみ -->
+<!ENTITY jversion        "20210716">
+<!ENTITY jversiond       "20210716">
+<!ENTITY jcorrespondSHA  "f3997370c"> <!-- lfs-git SHA 値； 本箇所での記載のみ -->
 <!ENTITY dir-jversion    "git-ja">
 <!ENTITY dir-jversiond   "git-sysdja">
 @z

diff --git a/version.ac b/version.ac
index 6ed3a8d..651c8c0 100644 (file)
--- a/version.ac
+++ b/version.ac
@@ -2,5 +2,5 @@ dnl
 dnl  This is part of LFSbookja package.
 dnl 
 dnl m4-include this file to define the current LFS version
-m4_define([lfs_version], [r10.1-120])
-m4_define([lfsd_version], [r10.1-120-systemd])
+m4_define([lfs_version], [r10.1-121])
+m4_define([lfsd_version], [r10.1-121-systemd])