[lfsja-git] r11.1-166 対応。

[lfsbookja/lfsja-git.git] / src / general.ch

diff --git a/src/general.ch b/src/general.ch
index 1858f69..ed33366 100644 (file)
--- a/src/general.ch
+++ b/src/general.ch
@@ -4,36 +4,60 @@
 % This is a CTIE change file for the original XML source of the LFSbook.
 %
 @x
-<!-- version info automatically generated by git
+<!-- Editing  up to the line of ==== should be enough
 @y
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- version info automatically generated by git
+<!-- Editing  up to the line of ==== should be enough
 @z
 
 @x
-<!--
-<!ENTITY version         "10.2-rc1">
-<!ENTITY versiond        "10.2-rc1">
-<!ENTITY releasedate     "August 26th, 2021">
-<!ENTITY copyrightdate   "1999-2021">
--->
+<![ %rc; [
+<![ %sysv; [
+<!ENTITY version         "%relnum;-rc%rcnum;">
+<!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; -->
+]]>
+<![ %systemd; [
+<!ENTITY version         "%relnum;-systemd-rc%rcnum;">
+<!ENTITY short-version   "systemd">  <!-- Used below in &blfs-book; -->
+]]>
+<!ENTITY errata          "&lfs-root;lfs/errata/&version;/">
+<!ENTITY generic-version "%relnum;-rc%rcnum;"> <!-- Used below in
+                                                    &patches-root;,
+                                                    &downloads-root;, and
+                                                    &test-results; -->
+<!ENTITY releasedate     "%reldate;">
+<!ENTITY copyrightdate   "%crdate;">
+]]>
 @y
-<!--
-<!ENTITY version         "10.2-rc1">
-<!ENTITY versiond        "10.2-rc1">
-<!ENTITY releasedate     "August 26th, 2021">
-<!ENTITY copyrightdate   "1999-2021">
--->
-<!ENTITY jversion        "20210423">
-<!ENTITY jversiond       "20210423">
-<!ENTITY dir-jversion    "svn-ja">
-<!ENTITY dir-jversiond   "svn-sysdja">
+<![ %rc; [
+<![ %sysv; [
+<!ENTITY version         "%relnum;-rc%rcnum;">
+<!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; -->
+]]>
+<![ %systemd; [
+<!ENTITY version         "%relnum;-systemd-rc%rcnum;">
+<!ENTITY short-version   "systemd">  <!-- Used below in &blfs-book; -->
+]]>
+<!ENTITY errata          "&lfs-root;lfs/errata/&version;/">
+<!ENTITY generic-version "%relnum;-rc%rcnum;"> <!-- Used below in
+                                                    &patches-root;,
+                                                    &downloads-root;, and
+                                                    &test-results; -->
+<!ENTITY releasedate     "%reldate;">
+<!ENTITY copyrightdate   "%crdate;">
+]]>
+
+<!ENTITY jversion        "20220812">
+<!ENTITY jversiond       "20220812">
+<!ENTITY jcorrespondSHA  "c25dd3fc1"> <!-- lfs-git SHA 値； 本箇所での記載のみ -->
+<!ENTITY dir-jversion    "git-ja">
+<!ENTITY dir-jversiond   "git-sysdja">
 @z
 
 @x
-<!ENTITY lfs-root        "https://rivendell.linuxfromscratch.org/">
+<!ENTITY lfs-root        "https://www.linuxfromscratch.org/">
 @y
-<!ENTITY lfs-root        "https://rivendell.linuxfromscratch.org/">
+<!ENTITY lfs-root        "https://www.linuxfromscratch.org/">
 <!ENTITY lfs-rootja      "http://lfsbookja.osdn.jp/">
 @z
 
@@ -44,26 +68,20 @@
 <!ENTITY download-scripts  "&lfs-rootja;&dir-jversion;/">
 @z
 
-% systemd版には lfs-bootscripts が不要なので以下も不要
-%@x
-%<!ENTITY downloads-rootd "&lfs-root;lfs/downloads/&generic-versiond;/">
-%@y
-%<!ENTITY downloads-rootd "&lfs-root;lfs/downloads/&generic-versiond;/">
-%<!ENTITY download-scriptsd "&lfs-rootja;&dir-jversiond;/">
-%@z
-
 @x
-<!ENTITY lfs-ticket-root "http://wiki.linuxfromscratch.org/lfs/ticket/">
+<!ENTITY lfs-ticket-root "https://wiki.linuxfromscratch.org/lfs/ticket/">
 @y
-<!ENTITY lfs-ticket-root "http://wiki.linuxfromscratch.org/lfs/ticket/">
+<!ENTITY lfs-ticket-root "https://wiki.linuxfromscratch.org/lfs/ticket/">
+<!ENTITY lfs-changeset   "https://wiki.linuxfromscratch.org/lfs/changeset/">
 <!ENTITY lfs-ticket-rootja "https://osdn.net/projects/lfsbookja/ticket/">
-<!ENTITY lfs-rev-root    "http://wiki.linuxfromscratch.org/lfs/changeset/">
+<!ENTITY lfs-rev-root    "https://wiki.linuxfromscratch.org/lfs/changeset/">
 @z
 
 @x
 <!ENTITY buildtime       "Approximate build time">
 <!ENTITY diskspace       "Required disk space">
 <!ENTITY dependencies    "Installation depends on">
+<!ENTITY runtime         "Required at runtime">
 <!ENTITY testsuites      "Test suite depends on">
 <!ENTITY before          "Must be installed before">
 <!ENTITY external        "Optional dependencies">
@@ -71,6 +89,7 @@
 <!ENTITY buildtime       "概算ビルド時間">
 <!ENTITY diskspace       "必要ディスク容量">
 <!ENTITY dependencies    "インストール依存パッケージ">
+<!ENTITY runtime         "実行時依存パッケージ">
 <!ENTITY testsuites      "テストスイート依存パッケージ">
 <!ENTITY before          "事前インストールパッケージ">
 <!ENTITY external        "任意依存パッケージ">