From e33b69f747115b4870604528e5be38742bf01b41 Mon Sep 17 00:00:00 2001
From: matsuand <30614168+matsuand@users.noreply.github.com>
Date: Thu, 13 May 2021 15:42:17 +0900
Subject: [PATCH] =?utf8?q?[lfsja-git]=20r10.1-61=20=E5=AF=BE=E5=BF=9C?=
=?utf8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
---
configure | 2 +-
src/chapter01/changelog.ch | 13 +++++++++++--
src/chapter01/jchangelog.ch | 3 +++
src/chapter08/python.ch | 30 ++++++++++++++++--------------
src/chapter08/shadow.ch | 12 ++++++------
src/chapter08/systemd.ch | 8 ++++----
src/general.ch | 5 +++--
src/index.ch | 4 ----
version.ac | 4 ++--
9 files changed, 46 insertions(+), 35 deletions(-)
diff --git a/configure b/configure
index 6c3e2629..0b8615b0 100755
--- a/configure
+++ b/configure
@@ -4720,7 +4720,7 @@ fi
-TARGETVER=r10.1-57
+TARGETVER=r10.1-61
(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 72d6a616..3997c0bc 100644
--- a/src/chapter01/changelog.ch
+++ b/src/chapter01/changelog.ch
@@ -53,6 +53,11 @@
2021-05-12
+ [bdubbs] - Removed instructions for running tests
+ in Python due to an idefinite hang in the partial
+ LFS envrionment.
+
+
[renodr] - Moved LFS to a merged-/usr configuration. Thanks
goes to Xi Ruoyao for doing almost all of the work. Fixes
#4848.
@@ -62,7 +67,7 @@
#4847.
- [renodr] - Fix a FTBFS when building glibc-2.30 with
+ [renodr] - Fix a FTBFS when building glibc-2.33 with
gcc-11.1.0.
@@ -90,6 +95,10 @@
2021-05-12
+ [bdubbs] - Python ã«ããããã¹ãå®è¡æé ãåé¤ãã¾ããã
+ é¨åçã«ããä»ä¸ãã£ã¦ããªã LFS ç°å¢ã§ã¯å®å®ãããã³ã°ãããã¨ãããããã
+
+
[renodr] - ãã¼ã¸ãã /usr é
ä¸ã®è¨å®ã¨ã㦠LFS ãå¤æ´ãã¾ããã
ã»ã¼ãã¹ã¦ã®ä½æ¥ãè¡ã£ã¦ããã Xi Ruoyao ã«æè¬ã
#4848 ã Fix ã«ã
@@ -99,7 +108,7 @@
#4847 ã Fix ã«ã
- [renodr] - gcc-11.1.0 ã使ã£ã¦ glibc-2.30 ããã«ãããéã® FTBFS ãä¿®æ£ã
+ [renodr] - gcc-11.1.0 ã使ã£ã¦ glibc-2.33 ããã«ãããéã® FTBFS ãä¿®æ£ã
[renodr] - systemd-248 ã¸ã®ã¢ãããã¼ãã
diff --git a/src/chapter01/jchangelog.ch b/src/chapter01/jchangelog.ch
index de5cc368..cafb5776 100644
--- a/src/chapter01/jchangelog.ch
+++ b/src/chapter01/jchangelog.ch
@@ -60,6 +60,9 @@
[matsuand] -
+ r10.1-61 (5d0219fda) ã¾ã§ã®å¯¾å¿ã
+
+ [matsuand] -
r10.1-57 (d7a942197) ã¾ã§ã®å¯¾å¿ã
diff --git a/src/chapter08/python.ch b/src/chapter08/python.ch
index 598b5c1d..be8d52f5 100644
--- a/src/chapter08/python.ch
+++ b/src/chapter08/python.ch
@@ -65,30 +65,32 @@
@z
-@x
- Compile the package:
+@x --enable-optimizations
+ This switch enables stable, but expensive, optimizations.
@y
- &CompileThePackage;
+
+ æ¬ã¹ã¤ããã¯å®å®çã§ã¯ãããã®ã®é«ãã¤ãæé©åãæå¹ã«ãã¾ãã
+
@z
@x
- To test the results, issue:
+ Compile the package:
@y
-
- ãã«ãçµæããã¹ãããå ´åã¯ä»¥ä¸ãå®è¡ãã¾ãã
-
+ &CompileThePackage;
@z
@x
- Some tests requiring a network connection or additional packages are
- skipped. The tests test_unicodedata and test_curses tests are known to fail. For
- more comprehensive results, the tests can be rerun when Python 3 is
- reinstalled in BLFS.
+ Running the tests at this point is not recommended. The
+ tests are known to hang indefinitely in the partial LFS environment.
+ If desired, the tests can be rerun at the end of this chapter or
+ when Python 3 is reinstalled in BLFS. To run the tests anyway,
+ issue make test.
@y
- ãããã¯ã¼ã¯æ¥ç¶ãä»ã®ä¾åããã±ã¼ã¸ãå¿
è¦ã¨ãããã¹ãã¯ãçç¥ãããå ´åãããã¾ãã
- test_unicodedata 㨠test_curses ã®ãã¹ãã¯å¤±æãã¾ãã
- ãã¹ã¦ã®çµæãå¾ãã«ã¯ BLFS ã«ãã㦠Python 3 ãåã¤ã³ã¹ãã¼ã«ããå¾ã«ãããä¸åº¦ãã¹ããå®è¡ãã¦ãã ããã
+ ãã®æç¹ã«ããã¦ãã¹ãå®è¡ãããã¨ã¯ãå§ããã¾ããã
+ é¨åçã«ããä»ä¸ãã£ã¦ããªã LFS ç°å¢ã§ã¯å®å®ãããã³ã°ãããã¨ãããã¾ãã
+ ãã¹ããå¿
è¦ã¨ããå ´åã¯ãæ¬ç« ãä¸çªæå¾ã¾ã§é²ãã¦ããå度å®è¡ããããããã㯠BLFS ã«ãã㦠Python 3 ãã¤ã³ã¹ãã¼ã«éã«è¡ãã¾ãã
+ ããã§ã¯ãªãããã§ãã¹ãå®è¡ããããªã make test ãå®è¡ãã¾ãã
@z
diff --git a/src/chapter08/shadow.ch b/src/chapter08/shadow.ch
index 50aada4b..445e62fb 100644
--- a/src/chapter08/shadow.ch
+++ b/src/chapter08/shadow.ch
@@ -80,16 +80,16 @@
@x
If /bin and/or
- /sbin are prefereed to be
+ /sbin are preferred to be
left over in PATH for some reason, modify
PATH in .bashrc after LFS is
built.
@y
- If /bin and/or
- /sbin are prefereed to be
- left over in PATH for some reason, modify
- PATH in .bashrc after LFS is
- built.
+
+ ä½ããã®çç±ã«ãã PATH ã«å¯¾ã㦠/bin ã /sbin ãæ®ãã¦ããå¿
è¦ãããå ´åã¯ãLFS ãã«ããå®æããå¾ã« .bashrc ã«ãã㦠PATH ãè¨å®ãã¦ãã ããã
+
@z
@x
diff --git a/src/chapter08/systemd.ch b/src/chapter08/systemd.ch
index adf212a5..732e6e19 100644
--- a/src/chapter08/systemd.ch
+++ b/src/chapter08/systemd.ch
@@ -721,12 +721,12 @@
@z
-@x
- Creates, deletes, and manages system extensions through the
- systemd-sysextd daemon
+@x systemd-sysext
+ Activates system extension images
@y
- systemd-sysextd ãã¼ã¢ã³ãéãã¦ã·ã¹ãã æ¡å¼µã®çæãåé¤ã管çãè¡ãã¾ãã
+
+ ã·ã¹ãã æ¡å¼µã¤ã¡ã¼ã¸ãæå¹ã«ãã¾ãã
@z
diff --git a/src/general.ch b/src/general.ch
index c82e0daa..fdb30074 100644
--- a/src/general.ch
+++ b/src/general.ch
@@ -24,8 +24,9 @@
-->
-
-
+
+
+
@z
diff --git a/src/index.ch b/src/index.ch
index 54eda92b..f8d1bd4e 100644
--- a/src/index.ch
+++ b/src/index.ch
@@ -3,10 +3,6 @@
%
% This is a CTIE change file for the original XML source of the LFSbook.
%
-% $Author$
-% $Rev$
-% $Date:: $
-%
@x
@y
diff --git a/version.ac b/version.ac
index 4c6c682e..12572526 100644
--- 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-57])
-m4_define([lfsd_version], [r10.1-57-systemd])
+m4_define([lfs_version], [r10.1-61])
+m4_define([lfsd_version], [r10.1-61-systemd])
--
2.11.0