From: matsuand <30614168+matsuand@users.noreply.github.com>
Date: Thu, 12 May 2022 12:35:07 +0000 (+0900)
Subject: [lfsja-git] r11.1-117 対応。
X-Git-Url: http://git.osdn.net/view?p=lfsbookja%2Flfsja-git.git;a=commitdiff_plain;h=8f9a15cb3eef154f8441ca0d99b5e96a02d1e899
[lfsja-git] r11.1-117 対応。
---
diff --git a/configure b/configure
index 6af959db..b100c412 100755
--- a/configure
+++ b/configure
@@ -4737,7 +4737,7 @@ fi
-TARGETVER=r11.1-92
+TARGETVER=r11.1-117
if test "x$revspec" = "xsystemd"; then
TARGETVER="$TARGETVER-systemd"
fi
diff --git a/src/chapter01/changelog.ch b/src/chapter01/changelog.ch
index e92cddff..f956d14d 100644
--- a/src/chapter01/changelog.ch
+++ b/src/chapter01/changelog.ch
@@ -44,6 +44,120 @@
@z
@x
+ 2022-05-01
+
+
+ [bdubbs] - Update to openssl-3.0.3. Fixes
+ #5057.
+
+
+@y
+ 2022-05-01
+
+
+ [bdubbs] - openssl-3.0.3 ã¸ã®ã¢ãããã¼ãã
+ #5057 ã Fix ã«ã
+
+
+@z
+
+@x
+ 2022-05-01
+
+
+ [bdubbs] - Change nobody/nogroup uid/gid to 65534.
+
+
+ [bdubbs] - Update to meson-0.62.1. Fixes
+ #5052.
+
+
+ [bdubbs] - Update to libpipeline-1.5.6. Fixes
+ #5053.
+
+
+ [bdubbs] - Update to elfutils-0.187. Fixes
+ #5054.
+
+
+ [bdubbs] - Update to Jinja2-3.1.2. Fixes
+ #5055.
+
+
+ [bdubbs] - Update to vim-8.2.4814. Addresses
+ #4500.
+
+
+ [bdubbs] - Update to sysvinit-3.03. Fixes
+ #5046.
+
+
+ [bdubbs] - Update to linux-5.17.5. Fixes
+ #5050.
+
+
+ [bdubbs] - Update to gcc-11.3.0. Fixes
+ #5051.
+
+
+ [bdubbs] - Update to coreutils-9.1. Fixes
+ #5048.
+
+
+ [bdubbs] - Update to bc-5.2.4. Fixes
+ #5049.
+
+
+@y
+ 2022-05-01
+
+
+ [bdubbs] - nobody/nogroup ã® uid/gid ã 65534 ã«å¤æ´ã
+
+
+ [bdubbs] - meson-0.62.1 ã¸ã®ã¢ãããã¼ãã
+ #5052 ã Fix ã«ã
+
+
+ [bdubbs] - libpipeline-1.5.6 ã¸ã®ã¢ãããã¼ãã
+ #5053 ã Fix ã«ã
+
+
+ [bdubbs] - elfutils-0.187 ã¸ã®ã¢ãããã¼ãã
+ #5054 ã Fix ã«ã
+
+
+ [bdubbs] - Jinja2-3.1.2 ã¸ã®ã¢ãããã¼ãã
+ #5055 ã Fix ã«ã
+
+
+ [bdubbs] - vim-8.2.4814 ã¸ã®ã¢ãããã¼ãã
+ #4500 ã«ããã¦è¨åã
+
+
+ [bdubbs] - sysvinit-3.03 ã¸ã®ã¢ãããã¼ãã
+ #5046 ã Fix ã«ã
+
+
+ [bdubbs] - linux-5.17.5 ã¸ã®ã¢ãããã¼ãã
+ #5050 ã Fix ã«ã
+
+
+ [bdubbs] - gcc-11.3.0 ã¸ã®ã¢ãããã¼ãã
+ #5051 ã Fix ã«ã
+
+
+ [bdubbs] - coreutils-9.1 ã¸ã®ã¢ãããã¼ãã
+ #5048 ã Fix ã«ã
+
+
+ [bdubbs] - bc-5.2.4 ã¸ã®ã¢ãããã¼ãã
+ #5049 ã Fix ã«ã
+
+
+@z
+
+@x
2022-04-15
diff --git a/src/chapter01/jchangelog.ch b/src/chapter01/jchangelog.ch
index 0c830eb3..994fac0d 100644
--- a/src/chapter01/jchangelog.ch
+++ b/src/chapter01/jchangelog.ch
@@ -50,6 +50,17 @@
-->
+ 2022-05-12
+
+
+ [matsuand] -
+ r11.1-117 (59d5489ff) ã¾ã§ã®å¯¾å¿ã
+
+
+
+
+
+
2022-04-22
diff --git a/src/chapter05/gcc-pass1.ch b/src/chapter05/gcc-pass1.ch
index b768eb53..1f53db5d 100644
--- a/src/chapter05/gcc-pass1.ch
+++ b/src/chapter05/gcc-pass1.ch
@@ -69,52 +69,6 @@
@z
-%@x
-% The following command will change the location of GCC's default
-% dynamic linker to use the one installed in /tools. It also removes /usr/include from GCC's include search path.
-% Issue:
-%@y
-%
-% 以ä¸ã®ã³ãã³ã㯠GCC ã®ããã©ã«ãã®ãã¤ãããã¯ãªã³ã«ã¼ã®é
ç½®ãã£ã¬ã¯ããªããæ¢ã«ã¤ã³ã¹ãã¼ã«ããã¦ãã /tools ã¨ãã¾ãã
-% ã¾ã GCC ã®ã¤ã³ã¯ã«ã¼ããã¹ãã /usr/include ãé¤ãã¾ãã
-%
-%@z
-
-%@x
-% In case the above seems hard to follow, let's break it down a bit.
-% First we copy the files gcc/config/linux.h,
-% gcc/config/i386/linux.h, and
-% gcc/config/i386/linux64.h to a file of
-% the same name but with an added suffix of .orig
. Then the
-% first sed expression prepends /tools
to every instance of
-% /lib/ld
, /lib64/ld
or
-% /lib32/ld
, while the second one replaces hard-coded
-% instances of /usr
. Next, we add our define statements which
-% alter the default startfile prefix to the end of the file. Note that the
-% trailing /
in /tools/lib/
is required.
-% Finally, we use touch to update the timestamp on the
-% copied files. When used in conjunction with cp -u, this
-% prevents unexpected changes to the original files in case the commands are
-% inadvertently run twice.
-%@y
-%
-% ä¸ã®ã³ãã³ããããåãããªãå ´åã¯ä¸ã¤ä¸ã¤èªã¿ä¸ãã¦ãã£ã¦ãã ããã
-% ã¾ã gcc/config/linux.h,
-% gcc/config/i386/linux.h, and
-% gcc/config/i386/linux64.h ã¨ãããã¡ã¤ã«ãããã¡ã¤ã«å称ã®æ«å°¾ã« .orig
ãä»ãå ãã¦ã³ãã¼ãã¾ãã
-% ããã¦ä¸ã¤ãã® sed ã³ãã³ãã§ã¯ããã®ãã¡ã¤ã«å
ã«ãã/lib/ld
, /lib64/ld
, /lib32/ld
ã¨ããè¨è¿°é¨åã®é ã«/tools
ãä»ä¸ãã¾ãã
-% ã¾ãäºã¤ãã® sed ã³ãã³ãã«ãã£ã¦ãã¼ãã³ã¼ãã£ã³ã°ããã¦ãã/usr
ã¨ããé¨åãæ¸ãæãã¾ãã
-% ããã¦ããã§å ããã¹ãå®ç¾©æããã¡ã¤ã«ã®æ«å°¾ã«è¿½å ããæ¤ç´¢ãã¹ã¨ startfile ããªãã£ãã¯ã¹ãå¤æ´ãã¾ãã
-% ãã®éã«/tools/lib/
ã®çµããã«ã¯/
ãå¿
è¦ã¨ãªãã¾ãã
-% æå¾ã« touch ã«ãã£ã¦ã³ãã¼ãããã¡ã¤ã«ã®ã¿ã¤ã ã¹ã¿ã³ããæ´æ°ãã¾ãã
-% cp -u ãç¨ããã®ã¯ã誤ã£ã¦ã³ãã³ããäºåº¦èµ·åããã¨ãã¦ããªãªã¸ãã«ãã¡ã¤ã«ãå£ããªãããã«ããããã§ãã
-%
-%@z
-
@x
On x86_64 hosts, set the default directory name for
64-bit libraries to lib
:
@@ -124,26 +78,6 @@
@z
-%@x
-% GCC doesn't detect stack protection correctly, which causes problems
-% for the build of Glibc-&glibc-version;, so fix that by issuing the following
-% command:
-%@y
-%
-% GCC ã¯ã¹ã¿ãã¯ãããã¯ã·ã§ã³ (stack protection) ãæ£ããæ¤åºãã¾ããã
-% ãã®ãã¨ã¯ Glibc-&glibc-version; ã«ããã¦ãã«ãããéã«ã¯åé¡ã¨ãªãã¾ãã
-% ããã§ä»¥ä¸ã®ã³ãã³ããå®è¡ãããã¨ã§è§£æ¶ãã¾ãã
-%
-%@z
-
-%@x
-% Also fix a problem identified upstream:
-%@y
-%
-% ã¢ããã¹ããªã¼ã ãèªèãã¦ããåé¡ãä¿®æ£ãã¾ãã
-%
-%@z
-
@x
The GCC documentation recommends building GCC
in a dedicated build directory:
@@ -204,49 +138,6 @@
@z
-%@x --with-local-prefix=/tools
-% The local prefix is the location in the system that GCC will search
-% for locally installed include files. The default is /usr/local.
-% Setting this to /tools helps keep the host location of
-% /usr/local out of this GCC's search path.
-%@y
-%
-% ãã¼ã«ã«ããªããã¯ã¹ (local prefix) ã¯ãGCC ããã¼ã«ã«ã«ã¤ã³ã¹ãã¼ã«ããã¦ããã¤ã³ã¯ã«ã¼ããã¡ã¤ã«ãæ¢ãã«ãããã£ã¬ã¯ããªãæå³ãã¾ãã
-% ãã®ããã©ã«ã㯠/usr/local ã§ãã
-% ãã®è¨å®ã /tools ã¨ãããã¨ã§ãGCC ãæ¢ãåºããã¹ãã /usr/local ãé¤å¤ãã¾ãã
-%
-%@z
-
-%@x --with-native-system-header-dir=/tools/include
-% By default, GCC searches /usr/include for
-% system headers. In conjunction with the sysroot switch, this would
-% normally translate to $LFS/usr/include. However
-% the headers that will be installed in the next two sections will go
-% to $LFS/tools/include. This switch ensures that
-% gcc will find them correctly. In the second pass of GCC, this same
-% switch will ensure that no headers from the host system are
-% found.
-%@y
-%
-% GCC ãã·ã¹ãã ãããã¼ãæ¢ãåºãããã©ã«ãã®ãã¹ã¯ /usr/include ã§ãã
-% å¾ã« root ãå¤æ´ããéã«ã¯ããã®ãã£ã¬ã¯ããªã¯ $LFS/usr/include ã¨ãªãã¾ãã
-% ããããã®ç´å¾ã®2ã¤ã®ä½æ¥ãéãã¦ããããã¼ãã¤ã³ã¹ãã¼ã«ããå
㯠$LFS/tools/include ã¨ãã¦ãã¾ãã
-% ã¤ã¾ãæ¬ã¹ã¤ãã㯠GCC ããããã¼ãæ£ããè¦ã¤ãåºããããã«ãããã®ã§ãã
-% GCC ã®2åãã®ãã«ãã§ã¯ãåãã¹ã¤ãããç¨ãã¦ããã¹ãã·ã¹ãã ã®ãããã¼ã¯ä¸åè¦ã¤ãåºããªãããã«ãã¾ãã
-%
-%@z
-
-@x --enable-initfini-array
- This switch forces the use of some internal data structures
- that are needed but cannot be detected when building a cross
- compiler.
-@y
-
- ãã®ã¹ã¤ããã¯å
é¨ãã¼ã¿æ§é ãå©ç¨ãããã¨ãæ示ãã¾ãã
- ã¯ãã¹ã³ã³ãã¤ã©ã¼ã®ãã«ãæã«ãããå¿
è¦ã«ãªãã¾ãããèªåã§ã¯è¨å®ããã¾ããã
-
-@z
-
@x --disable-shared
This switch forces GCC to link its internal libraries
statically. We need this because the shared libraries require glibc,
@@ -298,44 +189,12 @@
GCC ãã³ã³ãã¤ã«ãã¾ãã
@z
-%@x
-% Compilation is now complete. At this point, the test suite would
-% normally be run, but, as mentioned before, the test suite framework is
-% not in place yet. The benefits of running the tests at this point
-% are minimal since the programs from this first pass will soon be
-% replaced.
-%@y
-%
-% ã³ã³ãã¤ã«ãçµäºãã¾ããã
-% ãã®æç¹ã§ããã¹ãã¹ã¤ã¼ããå®è¡ãããã¨ã¯ã§ãã¾ãã
-% ãã åã«ãè¿°ã¹ã¦ããããã«ããã¹ãã¹ã¤ã¼ãã®ãã¬ã¼ã ã¯ã¼ã¯ãã¾ã æºåã§ãã¦ãã¾ããã
-% ããã«ãã®æç¹ã§çæãããããã°ã©ã ã¯ãããã«æ¬¡ã®çæä½æ¥ã«ãã£ã¦ç½®ãæãããã¾ãããããã®æç¹ã§ãã¹ããå®è¡ãããã¨ã¯ãã¾ãæå³ãããã¾ããã
-%
-%@z
-
@x
Install the package:
@y
&InstallThePackage;
@z
-% @x
-% Using --disable-shared means that the
-% libgcc_eh.a file isn't created and installed. The
-% Glibc package depends on this library as it uses
-% -lgcc_eh within its build system. This dependency
-% can be satisfied by creating a symlink to libgcc.a,
-% since that file will end up containing the objects normally contained in
-% libgcc_eh.a:
-% @y
-%
-% --disable-shared ãªãã·ã§ã³ãæå®ãã㨠libgcc_eh.a ãçæããã¤ã³ã¹ãã¼ã«ãã¾ããã
-% Glibc ããã±ã¼ã¸ã¯ãã®ã©ã¤ãã©ãªã«ä¾åãã¦ããããã«ãã®éã« -lgcc_eh ãæå®ãããã¨ã§å©ç¨ããã¾ãã
-% ä¾åãã¦ããç¹ã¯ libgcc.a ã¸ã®ã·ã³ããªãã¯ãªã³ã¯ãçæãã¦ããã°åé¡ã¯ããã¾ããã
-% libgcc_eh.a ã«å«ã¾ãããªãã¸ã§ã¯ãããæçµçã«ã¯ libgcc.a ã®ä¸ã«ãå«ã¾ãããã¨ã«ãªãããã§ãã
-%
-% @z
-
@x
This build of GCC has installed a couple of internal system
headers. Normally one of them, limits.h, would in turn
diff --git a/src/chapter06/gcc-pass2.ch b/src/chapter06/gcc-pass2.ch
index 7a46fbbd..3ca675d1 100644
--- a/src/chapter06/gcc-pass2.ch
+++ b/src/chapter06/gcc-pass2.ch
@@ -50,17 +50,6 @@
@z
-%@x
-% Once again, change the location of GCC's default dynamic linker to
-% use the one installed in /tools.
-%@y
-%
-% ããä¸åº¦ãGCC ã®ããã©ã«ãã®ãã¤ãããã¯ãªã³ã«ã¼ã®é
ç½®ãã£ã¬ã¯ããªããæ¢ã«ã¤ã³ã¹ãã¼ã«ããã¦ãã /tools ã¨ãã¾ãã
-%
-%@z
-
@x
If building on x86_64, change the default directory name for 64-bit
libraries to lib
:
@@ -70,47 +59,6 @@
@z
-%@x
-% Our first build of GCC has installed a couple of internal system
-% headers. Normally one of them, limits.h, will in turn
-% include the corresponding system limits.h header, in
-% this case, /tools/include/limits.h. However, at the
-% time of the first build of gcc /tools/include/limits.h
-% did not exist, so the internal header that GCC installed is a partial,
-% self-contained file and does not include the extended features of the
-% system header. This was adequate for building the temporary libc, but this
-% build of GCC now requires the full internal header. Create a full version
-% of the internal header using a command that is identical to what the GCC
-% build system does in normal circumstances:
-%@y
-%
-% 第1åãã® GCC ã®ãã«ãã§ã¯ãå
é¨çãªã·ã¹ãã ãããã¼ãã¤ã³ã¹ãã¼ã«ãã¦ãã¾ãã
-% ãã®1㤠limits.h ã¯ãããã«å¯¾å¿ã¥ãã·ã¹ãã ãããã¼ limits.h ãèªã¿è¾¼ã¿ã¾ãã
-% ãã®ãã¡ã¤ã«ã¯å®éã«ã¯ /tools/include/limits.h ã¨ãªãã¾ãã
-% ããã 1 åãã® GCC ã®ãã«ãæã«ã¯ /tools/include/limits.h ã¯åå¨ãã¾ããã
-% ãããã£ã¦ GCC ãã¤ã³ã¹ãã¼ã«ããå
é¨ãããã¼ã¯ãé¨åçã§èªå·±å®çµãã (self-contained) ãã®ã®ã¿ã¨ãªããã·ã¹ãã ãããã¼ãæã¤æ¡å¼µæ©è½ã¯å«ã¾ãã¾ããã
-% ä¸æç㪠libc ãæ§ç¯ãããªãããã¯æ£ããã£ãã®ã§ããããã®æ®µéã§ã® GCC ã®ãã«ãã§ã¯ãå
é¨ãããã¼ãå®å
¨ãªå½¢ã®ãã®ã§ãªããã°ãªãã¾ããã
-% å®å
¨ãªå
é¨ãããã¼ãçæããããã«ãGCC ãã«ãã·ã¹ãã ãé常è¡ã£ã¦ããæ¹æ³ã¨åãããã«ããããã®ã以ä¸ã®ã³ãã³ããå®è¡ãã¾ãã
-%
-%@z
-
-%@x
-% Fix an issue with GCC-10.1 when building with a cross
-% compiler:
-%@y
-%
-% ã¯ãã¹ã³ã³ãã¤ã©ã¼ã使ã£ã¦ãã«ãããã«ããããGCC-10.1 ã®åé¡ãä¿®æ£ãã¾ãã
-%
-%@z
-
-@x
- Fix an issue causing failure cross-compiling libstdc++:
-@y
-
- libstdc++ ã®ã¯ãã¹ã³ã³ãã¤ã«ãã§ããªããªã£ã¦ããåé¡ãä¿®æ£ãã¾ãã
-
-@z
-
@x
Override the building rule of libgcc and libstdc++ headers, to
allow building these libraries with POSIX threads support:
@@ -149,46 +97,6 @@
&MeaningOfOption1;configure&MeaningOfOption2;
@z
-%@x --enable-languages=c,c++
-% This option ensures that both the C and C++ compilers are
-% built.
-%@y
-%
-% C 㨠C++ ã®ä¸¡ã³ã³ãã¤ã©ã¼ãçæãããã¨ãæ示ãã¾ãã
-%
-%@z
-
-%@x --disable-libstdcxx-pch
-% Do not build the pre-compiled header (PCH) for
-% libstdc++. It takes up a
-% lot of space, and we have no use for it.
-%@y
-%
-% libstdc++ ã«å¯¾ãã¦ããªã³ã³ãã¤ã«ãããã¼ (pre-compiled header; PCH) ããã«ãããªãããã«æ示ãã¾ãã
-% ãããå«ãã¦ãã¾ãã¨ãµã¤ãºãå¢ãããã¨ã«ãªããããããå©ç¨ããå¿
è¦ãããã¾ããã
-%
-%@z
-
-%@x --disable-bootstrap
-% For native builds of GCC, the default is to do a "bootstrap"
-% build. This does not just compile GCC, but compiles it several times.
-% It uses the programs compiled in a first round to compile itself a
-% second time, and then again a third time. The second and third
-% iterations are compared to make sure it can reproduce itself
-% flawlessly. This also implies that it was compiled correctly.
-% However, the LFS build method should provide a solid compiler
-% without the need to bootstrap each time.
-%@y
-%
-% GCC ã®ãã¤ãã£ããã«ããè¡ãã«ã¯ãããã©ã«ãã§ã¯ "ãã¼ãã¹ãã©ãã" ãã«ããè¡ãªãã¾ãã
-% ããã¯åã« GCC ãã³ã³ãã¤ã«ããã®ã§ã¯ãªããæ°åã®ã³ã³ãã¤ã«ãç¹°ãè¿ãã¾ãã
-% ã¤ã¾ãä¸åãã«ãã«ããããããã°ã©ã ã使ã£ã¦äºåããä¸åãã®ã³ã³ãã¤ã«ãè¡ããã®ã§ãã
-% äºåããä¸åãã¨ã³ã³ãã¤ã«ãç¹°ãè¿ãã®ã¯ãããã«ãã£ã¦èªåèªèº«ãåçæãã¦å®ç§ãªãã®ãä½ãåºãããã§ãã
-% ãã®ãã¨ã«ãã£ã¦ã³ã³ãã¤ã«ãæ£ç¢ºã«è¡ããããã¨ãæã«ç¤ºããã¨ã«ããªãã¾ãã
-% ããã LFS ã®ãã«ãã§ã¯ãä½åº¦ããã¼ãã¹ãã©ãããè¡ãå¿
è¦ã®ãªããæå
ã(solid) ã³ã³ãã¤ã©ã¼ãä½ãåºãã¾ãã
-%
-%@z
-
@x -with-build-sysroot=$LFS
Normally, using --host ensures that
a cross-compiler is used for building GCC, and that compiler knows
@@ -286,74 +194,6 @@
@z
-%@x
-% At this point, it is imperative to stop and ensure that the basic
-% functions (compiling and linking) of the new toolchain are working as
-% expected. To perform a sanity check, run the following commands:
-%@y
-%
-% ãã®æç¹ã§ãæ§ç¯ãããã¼ã«ãã§ã¼ã³ã®åºæ¬ç㪠(ã³ã³ãã¤ã«ããªã³ã¯ãªã©ã®) æ©è½ãæ£ããåä½ãã¦ãããã¨ã確èªããå¿
è¦ãããã¾ãã
-% å¥å
¨æ§æ¤æ» (sanity check) ãè¡ãããã«ä»¥ä¸ãå®è¡ãã¦ãã ããã
-%
-%@z
-
-%@x
-% If everything is working correctly, there should be no errors,
-% and the output of the last command will be of the form:
-%@y
-%
-% åé¡ãªãåä½ããå ´åã¯ã¨ã©ã¼ããªãã£ãã¨ãããã¨ã§ãæå¾ã®ã³ãã³ãããåºåãããçµæã¯ä»¥ä¸ã®ããã«ãªãã¯ãã§ãã
-%
-%@z
-
-%@x
-% Note that the dynamic linker will be /tools/lib/ld-linux.so.2
-% for 32-bit machines.
-%@y
-%
-% 32 ããããã·ã³ã«å¯¾ãããã¤ãããã¯ãªã³ã«ã¼ã¯ /tools/lib/ld-linux.so.2 ã¨ãªãã¾ãã
-%
-%@z
-
-%@x
-% If the output is not shown as above or there was no output at all,
-% then something is wrong. Investigate and retrace the steps to find out
-% where the problem is and correct it. This issue must be resolved before
-% continuing on. First, perform the sanity check again, using
-% gcc instead of cc. If this works,
-% then the /tools/bin/cc symlink is
-% missing. Install the symlink as per above.
-% Next, ensure that the PATH is correct. This
-% can be checked by running echo $PATH and verifying that
-% /tools/bin is at the head of the
-% list. If the PATH is wrong it could mean that you are not
-% logged in as user lfs or that
-% something went wrong back in
-%@y
-%
-% ã³ãã³ãã®åºåçµæãä¸ã¨ç°ãªã£ã¦ãããããããã¯ä½ãåºåãããªãã£ãå ´åã¯ãä½ãããããããã¨ãæå³ãã¾ãã
-% ã©ãã«åé¡ãããã®ã調æ»ãå試è¡ãè¡ã£ã¦è§£æ¶ãã¦ãã ããã
-% 解決ããã«ãã®å
ã«é²ã¾ãªãã§ãã ããã
-% cc ã§ã¯ãªã gcc ã使ã£ã¦å度å¥å
¨æ§æ¤æ»ãè¡ã£ã¦ã¿ã¦ãã ããã
-% ããã§è§£æ±ºãããªã /tools/bin/cc ã®ã·ã³ããªãã¯ãªã³ã¯ãæ£ãããªãã¨ãããã¨ã§ãã
-% æ£ããçæãç´ãã¦ãã ããã
-% ã¾ãç°å¢å¤æ° PATH ãæ£ãããã©ããã確èªãã¦ãã ããã
-% echo $PATH ãå®è¡ãã¦ãå®è¡ãã¹ãªã¹ãã®å
é ã /tools/bin ã§ãããã©ãã確èªãã¾ãã
-% PATH ãééã£ã¦ãããªããå®ã¯ããªã㯠lfs ã¦ã¼ã¶ã¼ã§ãã°ã¤ã³ãã¦ããªãã®ããããã¾ããã ã§ã®ä½æ¥ã«ééãããã£ãã®ããããã¾ããã
-%
-%@z
-
-%@x
-% Once all is well, clean up the test files:
-%@y
-%
-% ãã¹ã¦ãçµäºããããã¹ããã¡ã¤ã«ãåé¤ãã¾ãã
-%
-%@z
-
@x
Details on this package are located in
diff --git a/src/chapter07/createfiles.ch b/src/chapter07/createfiles.ch
index 153455c7..d50a019a 100644
--- a/src/chapter07/createfiles.ch
+++ b/src/chapter07/createfiles.ch
@@ -15,185 +15,6 @@
éè¦ãªãã¡ã¤ã«ã¨ã·ã³ããªãã¯ãªã³ã¯ã®çæ
@z
-%@x
-% Some programs use hard-wired paths to programs which do not exist yet.
-% In order to satisfy these programs, create a number of symbolic links which
-% will be replaced by real files throughout the course of this chapter after the
-% software has been installed:
-%@y
-%
-% ããã°ã©ã ã®ä¸ã«ã¯åºå®çã«ä»ã®ããã°ã©ã ã¸ã®ãã¹ãä¿æãã¦ãããã®ãããã¾ãã
-% ãã®ãã¹ã¯ä»ã®æç¹ã§ã¯ã¾ã åå¨ãã¦ãã¾ããã
-% ãã®ãããªããã°ã©ã ãæ£ããåä½ããããããã·ã³ããªãã¯ãªã³ã¯ãããã¤ãä½æãã¾ãã
-% ãã®ãªã³ã¯ã¯æ¬ç« ã®ä½æ¥ãéãã¦å種ã½ããã¦ã§ã¢ãã¤ã³ã¹ãã¼ã«ãã¦ãããã¨ã§ã ãã®å®ä½ã§ãããã¡ã¤ã«ã«ç½®ãæãããã¦ããã¾ãã
-%
-%@z
-
-%@x
-% The purpose of each link:
-%@y
-% åãªã³ã¯ã®ç®ç
-%@z
-
-%@x /bin/bash
-% Many bash scripts specify
-% /bin/bash.
-%@y
-%
-% bash ã¹ã¯ãªããã¯ããã¦ã /bin/bash ã¨ãã¦è¨è¿°ããã¾ãã
-%
-%@z
-
-%@x /bin/cat
-% This pathname is hard-coded into Glibc's configure script.
-%@y
-%
-% ãã®ãã¹å㯠Glibc ã® configure ã¹ã¯ãªããã«ã¦ãã¼ãã³ã¼ãã£ã³ã°ããã¦ãã¾ãã
-%
-%@z
-
-%@x /bin/dd
-% The path to dd will be hard-coded into the
-% /usr/bin/libtool utility.
-%@y
-%
-% dd ã¸ã®ãã¹ã /usr/bin/libtool ã¦ã¼ãã£ãªãã£ã¼ã«ãã¼ãã³ã¼ãã£ã³ã°ããã¾ãã
-%
-%@z
-
-%@x /bin/echo
-% This is to satisfy one of the tests in Glibc's test suite, which
-% expects /bin/echo.
-%@y
-%
-% Glibc ã®ãã¹ãã¹ã¤ã¼ãã®ä¸ã« /bin/echo ãç¨ãã¦ãããã®ãããããããæåãããããã§ãã
-%
-%@z
-
-%@x /usr/bin/env
-% This pathname is hard-coded into some packages build procedures.
-%
-%@y
-%
-% ãã®ãã¹ã¯ãããã±ã¼ã¸ã®ãã«ããéãã¦ãã¼ãã³ã¼ãã£ã³ã°ããããã¨ãããã¾ãã
-%
-%
-%@z
-
-%@x /usr/bin/install
-% The path to install will be hard-coded into
-% the /usr/lib/bash/Makefile.inc file.
-%@y
-%
-% install ã¸ã®ãã¹ã /usr/lib/bash/Makefile.inc ãã¡ã¤ã«å
ã«ã¦ãã¼ãã³ã¼ãã£ã³ã°ããã¾ãã
-%
-%@z
-
-%@x /bin/ln
-% The path to ln will be hard-coded into the
-% /usr/lib/perl5/&perl-version;/<target-triplet>/Config_heavy.pl
-% file.
-%@y
-%
-% ln ã¸ã®ãã¹ã /usr/lib/perl5/&perl-version;/<target-triplet>/Config_heavy.pl ãã¡ã¤ã«å
ã«ã¦ãã¼ãã³ã¼ãã£ã³ã°ããã¾ãã
-%
-%@z
-
-%@x /bin/pwd
-% Some configure scripts, particularly Glibc's,
-% have this pathname hard-coded.
-%@y
-%
-% ç¹ã« Glibc ãªã©ã® configure ã¹ã¯ãªããã«ã¦ããã®ãã¹åããã¼ãã³ã¼ãã£ã³ã°ããã¦ãã¾ãã
-%
-%@z
-
-%@x /bin/rm
-% The path to rm will be hard-coded into the
-% /usr/lib/perl5/&perl-version;/<target-triplet>/Config_heavy.pl
-% file.
-%@y
-%
-% rm ã¸ã®ãã¹ã /usr/lib/perl5/&perl-version;/<target-triplet>/Config_heavy.pl ãã¡ã¤ã«å
ã«ã¦ãã¼ãã³ã¼ãã£ã³ã°ããã¾ãã
-%
-%@z
-
-%@x /bin/stty
-% This pathname is hard-coded into Expect, therefore it is needed
-% for Binutils and GCC test suites to pass.
-%@y
-%
-% ãã®ãã¹å㯠Expect ã«ã¦ãã¼ãã³ã¼ãã£ã³ã°ããã¦ãã¾ãã
-% ãããã£ã¦ Binutils 㨠GCC ã®ãã¹ãã¹ã¤ã¼ããæåãããããã«å¿
è¦ã¨ãªãã¾ãã
-%
-%@z
-
-%@x /usr/bin/perl
-% Many Perl scripts hard-code this path to the
-% perl program.
-%@y
-%
-% perl ã³ãã³ãã«å¯¾ã㦠Perl ã¹ã¯ãªããã¯ããã¦ããã®ãã¹åãç¨ãã¦ãã¾ãã
-%
-%@z
-
-%@x /usr/lib/libgcc_s.so
-% Glibc needs this for the pthreads library to work.
-%@y
-%
-% pthreads ã©ã¤ãã©ãªãæ£å¸¸åä½ããããã« Glibc ã«ã¨ã£ã¦å¿
è¦ã¨ãªãã¾ãã
-%
-%@z
-
-%@x /usr/lib/libstdc++{,.6}
-% This is needed by several tests in Glibc's test suite, as well as
-% for C++ support in GMP.
-%@y
-%
-% Glibc ã®ãã¹ãã¹ã¤ã¼ããä¾ãã° GMP ã«ããã C++ ãµãã¼ããªã©ã«ããã¦ããããå¿
è¦ã¨ãããã®ãããã¾ãã
-%
-%@z
-
-%@x /bin/sh
-% Many shell scripts hard-code /bin/sh.
-%@y
-%
-% ã·ã§ã«ã¹ã¯ãªããã¯ããã¦ã /bin/sh ããã¼ãã³ã¼ãã£ã³ã°ããã¦ãã¾ãã
-%
-%@z
-
-%@x /usr/lib/lib{blkid,fdisk,mount,uuid}.so*, /usr/include/{blkid,libfdisk,libmount,uuid}, /usr/lib/pkgconfig/{blkid,fdisk,mount,uuid}.pc
-% These links and files allow
-% eudev
-% systemd to find the
-% util-linux libraries installed in chapter 5, without creating
-% wrong references to /tools. The uuid library is also needed for
-% building a python module.
-%@y
-%
-% ãã®ãªã³ã¯ããã¡ã¤ã«ã«ããã
-% eudev
-% systemd
-% ã第 5 ç« ã«ã¦ã¤ã³ã¹ãã¼ã«ãã util-linux ã®ã©ã¤ãã©ãªãæ¢ãåºããããã«ãã¾ãã
-% ãã㧠/tools ã¸ã®èª¤ã£ãåç
§ã¯ä½ããªãããã«ãã¦ãã¾ãã
-% ã¾ã python ã¢ã¸ã¥ã¼ã«ããã«ãã§ããããã«ãããã uuid ã©ã¤ãã©ãªãå¿
è¦ã¨ãªãã¾ãã
-%
-%@z
-
-%@x /tools/lib/locale/locale-archive
-% Some programs built in chapter 5 look for installed
-% locale descriptions in this file. The locale descriptions will be
-% installed in /usr/lib/locale/locale-archive
-% after building the final glibc. The symlink allows those programs
-% to use the installed locales.
-%@y
-%
-% 第 5 ç« ã«ã¦ãã«ãããããã°ã©ã ã®ä¸ã«ã¯ãã¤ã³ã¹ãã¼ã«æ¸ã®ãã®ãã¡ã¤ã«å
ã®ãã±ã¼ã«è¨è¿°ãæ¤ç´¢ãããã®ãããã¾ãã
-% ãã®ãã±ã¼ã«è¨è¿°ã¯ãæçµç㪠glibc ããã«ããããå¾ã¯ /usr/lib/locale/locale-archive ã«ã¤ã³ã¹ãã¼ã«ããã¾ãã
-% 以ä¸ã®ã·ã³ããªãã¯ãªã³ã¯ãä½æãããã¨ã§ãç¾å¨ã¤ã³ã¹ãã¼ã«ããã¦ãããã±ã¼ã«è¨è¿°ããããã£ãããã°ã©ã ãå©ç¨ã§ããããã«ãã¾ãã
-%
-%@z
-
@x
Historically, Linux maintains a list of the mounted file systems in the
file /etc/mtab. Modern kernels maintain this list
@@ -268,9 +89,14 @@
url="http://refspecs.linuxfoundation.org/lsb.shtml"/>) only recommends that,
besides the group root with a
Group ID (GID) of 0, a group bin
- with a GID of 1 be present. All other group names and GIDs can be chosen
- freely by the system administrator since well-written programs do not depend
- on GID numbers, but rather use the group's name.
+ with a GID of 1 be present. The GID of 5 is widely used for
+ tty group, and the number 5 is
+ also used in systemd
+ /etc/fstab for the
+ devpts filesystem.
+ All other group names and GIDs can be chosen freely by the system
+ administrator since well-written programs do not depend on GID numbers,
+ but rather use the group's name.
@y
ä½æããã°ã«ã¼ãã¯ä½ãã®æ¨æºã«åºã¥ãããã®ã§ã¯ããã¾ããã
@@ -279,12 +105,36 @@
Linux Standard Base ( åç
§) ã§ã¯ root ã°ã«ã¼ãã®ã°ã«ã¼ãID (GID) 㯠0ãbin ã°ã«ã¼ãã® GID 㯠1 ãå®ãã¦ããã«ããã¾ããã
+ GID 5 㯠tty ã°ã«ã¼ãã«å¯¾ãã¦åºãç¨ãããã¦ãã¾ãã
+ ã¾ãæ°å¤ 5 㯠devpts ãã¡ã¤ã«ã·ã¹ãã ã«å¯¾ã㦠systemd
+ /etc/fstab ã«ããã¦ãç¨ãããã¦ãã¾ãã
ä»ã®ã°ã«ã¼ãã¨ãã® GID ã¯ã·ã¹ãã 管çè
ãèªç±ã«åã決ãããã¨ãã§ãã¾ãã
ã¨ããã®ãé常ã®ããã°ã©ã ã§ããã° GID ã®å¤ã«ä¾åãããã¨ã¯ãªããããã¾ã§ã°ã«ã¼ãåãç¨ãã¦ããã°ã©ãã³ã°ããã¦ããããã§ãã
@z
@x
+ The ID 65534 is used by the kernel for NFS and separate user
+ namespaces for unmapped users and groups (those exist on the NFS server
+ or the parent user namespace, but do not exist
on the local
+ machine or in the separate namespace). We assign
+ nobody and
+ nogroup for it to avoid an
+ unnamed ID. But other distros may treat this ID differently, so any
+ portable program should not depend on this assignment.
+@y
+
+ ID 65534 㯠NFS ã®ã«ã¼ãã«ãå©ç¨ãããããããã¦ããªãã¦ã¼ã¶ã¼ãã°ã«ã¼ãã«å¯¾ããã¦ã¼ã¶ã¼åå空éãåãåãã¾ã
+ ï¼ãã㯠NFS ãµã¼ãã¼ä¸ã親ã®ã¦ã¼ã¶ã¼ç©ºéã«åå¨ãã¾ããããã¼ã«ã«ãã·ã³ãåé¢ãããåå空éã«ã¯åå¨ãã¾ããï¼ã
+ æªå²ãå½ã¦ã® ID ãé¿ããããã«ããã® ID ã nobody 㨠nogroup ã«ç¨ãããã¨ã«ãã¾ãã
+ ä»ã®ãã£ã¹ããªãã¥ã¼ã·ã§ã³ã«ããã¦ã¯ããã® ID ãç°ãªãç¨ãæ¹ããã¦ããå ´åãããããã移æ¤æ§ãèæ
®ããããã°ã©ã ã§ã¯ãããã§ã®å²ãå½ã¦ã«ä¾åããªãããã«ãã¦ãã ããã
+
+@z
+
+@x
Some tests in need a regular
user. We add this user here and delete this account at the end of that
chapter.
diff --git a/src/chapter08/coreutils.ch b/src/chapter08/coreutils.ch
index d4aa96ab..84d3e2d1 100644
--- a/src/chapter08/coreutils.ch
+++ b/src/chapter08/coreutils.ch
@@ -55,14 +55,6 @@
@z
@x
-Fix a problem with autoconf-2.70 in an included gnulib .m4 file:
-@y
-
-autoconf-2.70 ã«å«ã¾ãã¦ãã gnulib .m4 ãã¡ã¤ã«ã®åé¡ãä¿®æ£ãã¾ãã
-
-@z
-
-@x
Now prepare Coreutils for compilation:
@y
&PreparePackage1;Coreutils&PreparePackage2;
diff --git a/src/chapter08/gcc.ch b/src/chapter08/gcc.ch
index 2d22f2a6..75f02903 100644
--- a/src/chapter08/gcc.ch
+++ b/src/chapter08/gcc.ch
@@ -168,41 +168,13 @@
@z
@x
- Eight tests related to analyzer are known to fail.
+ In g++, four tests related to PR100400 are known to be reported
+ as both XPASS and FAIL. It's because the test file for this known issue
+ is not well written.
@y
- ã¢ãã©ã¤ã¶ã¼ã«é¢ãããã¹ãã 8 ã¤å¤±æãã¾ãã
-
-@z
-
-@x
- One test named asan_test.C is known to
- fail.
-@y
-
- asan_test.C ã¨ãããã¹ãã 1 ã¤å¤±æãã¾ãã
-
-@z
-
-@x
- In libstdc++, one test named 49745.cc is
- known to fail because the header dependencies in glibc have
- changed.
-@y
-
- libstdc++ ã«ãã㦠49745.cc ã¨ãããã¹ãã 1 ã¤å¤±æãã¾ãã
- ãã㯠glibc å
ãããã¼ã®ä¾åé¢ä¿ãå¤æ´ããã¦ããããã§ãã
-
-@z
-
-@x
- In libstdc++, one numpunct test and six tests related to get_time are
- known to fail. These are all because the locale definitions in glibc have
- changed but libstdc++ does not currently support those changes.
-@y
-
- libstdc++ ã«ããã¦ã¯ãnumpunct ã®ãã¹ã 1 ã¤ã¨ get_time ã«é¢é£ãããã¹ãã 6 ã¤å¤±æãã¾ãã
- ãã®çç±ã¯ãglibc ã«ããããã±ã¼ã«å®ç¾©ãå¤æ´ããã¦ããããã§ãããlibstdc++ ã¯ãã®å¤æ´ã«å¯¾å¿ãã¦ããªãããã§ãã
+ g++ ã«ããã¦ã¯ PR100400 ã«é¢é£ãããã¹ã 4 ã¤ã XPASS ããã³ FAIL ã¨ãã¦åºåããã¾ãã
+ ãã®åé¡ã¯ãã¹ããã¡ã¤ã«ãé©åã«è¨è¿°ããã¦ããªãããã«çºçãã¾ãã
@z
@@ -234,11 +206,10 @@
@z
@x
- Install the package and remove an unneeded directory:
+ Install the package:
@y
&InstallThePackage;
- ä¸è¦ãªãã£ã¬ã¯ããªã¯åé¤ãã¾ãã
@z
diff --git a/src/chapter08/procps.ch b/src/chapter08/procps.ch
index 0695c94e..1c3c197b 100644
--- a/src/chapter08/procps.ch
+++ b/src/chapter08/procps.ch
@@ -51,19 +51,6 @@
&CompileThePackage;
@z
-%@x
-% The test suite needs some custom modifications for LFS.
-% Remove a test that fails when scripting does not use a tty device and
-% fix two others.
-% To run the test suite, run the following commands:
-%@y
-%
-% LFS ã«ããã¦ãã¹ãã¹ã¤ã¼ããå®è¡ããã«ã¯å¤å°ã®ä¿®æ£ãå¿
è¦ã§ãã
-% tty ããã¤ã¹ãå©ç¨ããªãã¹ã¯ãªããã1ã¤å¤±æããããããããé¤å¤ãããã¨ã«ãããã®ä»ã«ã 2 ã¤ã®ãã¹ããä¿®æ£ãã¾ãã
-% ãã¹ãã¹ã¤ã¼ããå®è¡ããããã«ä»¥ä¸ã®ã³ãã³ããå®è¡ãã¾ãã
-%
-%@z
-
@x
To run the test suite, run:
@y
@@ -73,12 +60,24 @@
@z
@x
- Five tests related to pkill are known to fail due to a problem
- with tests that were not updated.
+
+ One test named free with commit
+ may fail if some applications with a custom memory allocator (for
+ example, JVM and Web browsers) are running on the host distro.
@y
+
- pkill ã«é¢é£ãããã¹ãã 5 ã¤å¤±æãã¾ãã
- ããã¯ãã¹ããæ´æ°ããã¦ããªãããã«çºçãã¾ãã
+ ãã¹ããã£ã¹ããªãã¥ã¼ã·ã§ã³ä¸ã«ããã¦ãç¹å®ã®ã¢ããªã±ã¼ã·ã§ã³ï¼ãã¨ãã° JVM ã ã¦ã§ããã©ã¦ã¶ã¼ï¼ãç¬èªã®ã¡ã¢ãªå²ãå½ã¦ãè¡ã£ã¦ããå ´åã«ãfree with commit ã¨ããååã®ãã¹ãã失æãã¾ãã
@z
diff --git a/src/chapter08/util-linux.ch b/src/chapter08/util-linux.ch
index 0018d60d..f0b0467a 100644
--- a/src/chapter08/util-linux.ch
+++ b/src/chapter08/util-linux.ch
@@ -75,19 +75,6 @@
@z
@x
- There is one test that fails in the chroot environment and
- causes the tests to hang forever. The problem does not occur outside
- of the chroot environment.
- To work around the problem, delete the test:
-@y
-
- chroot ç°å¢å
ã«ããã¦ã¯ããã¹ãã 1 ã¤å¤±æãã¦ããã¹ãããã³ã°ããã¦ãã¾ãã¾ãã
- ãã®åé¡ã¯ chroot ç°å¢ããæãåºãã°çºçãã¾ããã
- ãããåé¿ããããããã®ãã¹ãã¯åé¤ãã¾ãã
-
-@z
-
-@x
The hardlink tests will fail if the host's kernel
does not have the option CONFIG_CRYPTO_USER_API_HASH set.
@y
diff --git a/src/chapter09/introduction.ch b/src/chapter09/introduction.ch
index 99c1b090..ed85a59d 100644
--- a/src/chapter09/introduction.ch
+++ b/src/chapter09/introduction.ch
@@ -67,18 +67,19 @@
@x
The init program is controlled by the
/etc/inittab file and is organized into run levels that
- can be run by the user:
+ can be run by the user. In LFS, they are used as follows:
@y
init ããã°ã©ã 㯠/etc/inittab ãã¡ã¤ã«ã«ããå¶å¾¡ããã¾ãã
ããã¦ã¦ã¼ã¶ã¼ãè¨å®å¯è½ãªã©ã³ã¬ãã«ãè¨å®ãã¾ãã
+ LFS ã«ããã¦ã¯ä»¥ä¸ã®ãã®ãå©ç¨ããã¾ãã
@z
@x
0 — halt
1 — Single user mode
-2 — Multiuser, without networking
+2 — User definable
3 — Full multiuser mode
4 — User definable
5 — Full multiuser mode with display manager
@@ -86,7 +87,7 @@
@y
0 — åæ¢ (halt)
1 — ã·ã³ã°ã«ã¦ã¼ã¶ã¼ã¢ã¼ã
-2 — ãã«ãã¦ã¼ã¶ã¼ããããã¯ã¼ã¯ãªã
+2 — ã¦ã¼ã¶ã¼å®ç¾©
3 — ãã«ãã«ãã¦ã¼ã¶ã¼ã¢ã¼ã
4 — ã¦ã¼ã¶ã¼å®ç¾©
5 — ãã«ãã«ãã¦ã¼ã¶ã¼ã¢ã¼ãããã£ã¹ãã¬ã¤ããã¼ã¸ã£ã¼ãã
diff --git a/src/chapter09/usage.ch b/src/chapter09/usage.ch
index a5e719c5..008e2ff9 100644
--- a/src/chapter09/usage.ch
+++ b/src/chapter09/usage.ch
@@ -55,7 +55,7 @@
generally not used. See init(8) for more details), and
each one of those corresponds to the actions the computer is supposed to
perform when it starts up. The default run-level is 3. Here are the
- descriptions of the different run-levels as they are implemented:
+ descriptions of the different run-levels as they are implemented in LFS:
@y
SysVinit (ãã以éã¯init
ã¨è¡¨ç¾ãã¾ã) ã¯ã©ã³ã¬ãã«ã¨ããä»çµã¿ã«ããåä½ãã¾ãã
@@ -63,7 +63,7 @@
(å®éã«ã¯ã©ã³ã¬ãã«ã¯ãã以ä¸ããã®ã§ãããç¹æ®ãªå ´åã§ãã£ã¦æ®éã¯å©ç¨ããã¾ããã
詳ãã㯠init(8) ãåç
§ãã¦ãã ããã)
åã¬ãã«ã¯ãã³ã³ãã¥ã¼ã¿ã¼ã®èµ·åæã«ãããå¦çåä½ã«å¯¾å¿ã¥ãã¦ãããããã©ã«ãã®ã©ã³ã¬ãã«ã¯ 3 ã¨ãªã£ã¦ãã¾ãã
- ã©ã³ã¬ãã«ã®è©³ç´°ã以ä¸ã«èª¬æãã¾ãã
+ LFS ã«ããã¦å®è£
ãããã©ã³ã¬ãã«ã®è©³ç´°ã以ä¸ã«èª¬æãã¾ãã
@z
diff --git a/src/chapter10/kernel.ch b/src/chapter10/kernel.ch
index 589dd969..6a51b3e1 100644
--- a/src/chapter10/kernel.ch
+++ b/src/chapter10/kernel.ch
@@ -188,6 +188,16 @@
ä¸ã®è¨å®é
ç®ã®èª¬æ
@z
+@x Compile the kernel with warnings as errors
+ This may cause building failure if the compiler and/or
+ configuration are different from those of the kernel
+ developers.
+@y
+
+ ãããè¨å®ããã¨ãã«ã¼ãã«éçºè
ãæ¡ç¨ããã³ã³ãã¤ã©ã¼ãè¨å®ã¨ç°ãªãå ´åã«ãã«ã¼ãã«ãã«ãã¨ã©ã¼ã¨ãªãå ´åãããã¾ãã
+
+@z
+
@x Enable kernel headers through /sys/kernel/kheaders.tar.xz
This will require cpio building the kernel.
cpio is not installed by LFS.
diff --git a/src/general.ch b/src/general.ch
index 43245013..2e28cf4f 100644
--- a/src/general.ch
+++ b/src/general.ch
@@ -47,9 +47,9 @@
]]>
-
-
-
+
+
+
@z
diff --git a/src/packages.ch b/src/packages.ch
index 72ba907a..3b2cc382 100644
--- a/src/packages.ch
+++ b/src/packages.ch
@@ -52,9 +52,9 @@
@z
@x
-
+
@y
-
+
@z
@x
diff --git a/version.ac b/version.ac
index 498bd52a..a970ee3e 100644
--- 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.1-92])
+m4_define([lfs_version], [r11.1-117])