From: matsuand Date: Tue, 25 Feb 2014 04:27:55 +0000 (+0000) Subject: [LFS-SVN] SVN-20140221, Changeset 10491 対応。 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1c86177f6ad1408e486d1d9765b581d40b57d852;p=lfsbookja%2Flfsja-git.git [LFS-SVN] SVN-20140221, Changeset 10491 対応。 git-svn-id: svn+ssh://svn.osdn.net/svnroot/lfsbookja/trunk@898 d6661c75-0afd-443a-aae1-cb31083e41e8 --- diff --git a/lfsbook/configure b/lfsbook/configure index 9dd235a1..e287ea1b 100755 --- a/lfsbook/configure +++ b/lfsbook/configure @@ -3879,7 +3879,7 @@ if test "$TIDY" = no; then as_fn_error $? "tidy not found in $PATH" "$LINENO" 5 fi; -TARGETVER=svn-20140218 +TARGETVER=svn-20140221 SVNVER=`grep 'ENTITY version' ${bookdir}/general.ent | sed -e 's/^$//' | tr 'A-Z' 'a-z'` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the original XML version" >&5 diff --git a/lfsbook/src/chapter01/jchangelog.ch b/lfsbook/src/chapter01/jchangelog.ch index 03e9dba0..defea2e3 100644 --- a/lfsbook/src/chapter01/jchangelog.ch +++ b/lfsbook/src/chapter01/jchangelog.ch @@ -54,6 +54,21 @@ --> + 2014-02-25 + + + [matsuand] - + SVN-20140221, + Changeset + 10490, + 10491 + 対応。 + + + + + + 2014-02-20 diff --git a/lfsbook/src/chapter06/coreutils.ch b/lfsbook/src/chapter06/coreutils.ch index ae365d37..521de19f 100644 --- a/lfsbook/src/chapter06/coreutils.ch +++ b/lfsbook/src/chapter06/coreutils.ch @@ -203,7 +203,7 @@ timeout, touch, tr, true, truncate, tsort, tty, uname, unexpand, uniq, unlink, users, vdir, wc, who, whoami, and yes libstdbuf.so - /usr/lib/coreutils + /usr/libexec/coreutils @y [, base64, basename, cat, chcon, chgrp, chmod, chown, chroot, cksum, comm, cp, csplit, cut, date, dd, df, dir, dircolors, dirname, du, echo, @@ -216,7 +216,7 @@ timeout, touch, tr, true, truncate, tsort, tty, uname, unexpand, uniq, unlink, users, vdir, wc, who, whoami, yes libstdbuf.so - /usr/lib/coreutils + /usr/libexec/coreutils @z @x diff --git a/lfsbook/src/chapter06/gawk.ch b/lfsbook/src/chapter06/gawk.ch index 37c1f590..6d69a431 100644 --- a/lfsbook/src/chapter06/gawk.ch +++ b/lfsbook/src/chapter06/gawk.ch @@ -76,13 +76,15 @@ filefuncs.so, fnmatch.so, fork.so, inplace.so, ordchr.so, readdir.so, readfile.so, revoutput.so, revtwoway.so, rwarray.so, testext.so, and time.so - /usr/lib/{,g}awk, /usr/share/awk, /usr/share/doc/gawk-&gawk-version; + /usr/lib/gawk, /usr/libexec/awk, /usr/share/awk, + /usr/share/doc/gawk-&gawk-version; @y awk (gawk へのリンク), gawk, gawk-&gawk-version;, igawk filefuncs.so, fnmatch.so, fork.so, inplace.so, ordchr.so, readdir.so, readfile.so, revoutput.so, revtwoway.so, rwarray.so, testext.so, time.so - /usr/lib/{,g}awk, /usr/share/awk, /usr/share/doc/gawk-&gawk-version; + /usr/lib/gawk, /usr/libexec/awk, /usr/share/awk, + /usr/share/doc/gawk-&gawk-version; @z @x diff --git a/lfsbook/src/chapter06/gcc.ch b/lfsbook/src/chapter06/gcc.ch index 7cd04b16..824eebab 100644 --- a/lfsbook/src/chapter06/gcc.ch +++ b/lfsbook/src/chapter06/gcc.ch @@ -313,7 +313,8 @@ libquadmath.{a,so}, libssp.{a,so}, libssp_nonshared.a, libstdc++.{a,so}, libsupc++.a and libtsan.{a,so} - /usr/include/c++, /usr/lib/gcc, /usr/share/gcc-&gcc-version; + /usr/include/c++, /usr/lib/gcc, /usr/libexec/gcc, + /usr/share/gcc-&gcc-version; @y c++, cc (gcc へのリンク), cpp, g++, gcc, gcc-ar, gcc-nm, gcc-ranlib, gcov @@ -324,7 +325,8 @@ libquadmath.{a,so}, libssp.{a,so}, libssp_nonshared.a, libstdc++.{a,so}, libsupc++.a, libtsan.{a,so} - /usr/include/c++, /usr/lib/gcc, /usr/share/gcc-&gcc-version; + /usr/include/c++, /usr/lib/gcc, /usr/libexec/gcc, + /usr/share/gcc-&gcc-version; @z @x diff --git a/lfsbook/src/chapter06/man-db.ch b/lfsbook/src/chapter06/man-db.ch index b72657e2..67ec8772 100644 --- a/lfsbook/src/chapter06/man-db.ch +++ b/lfsbook/src/chapter06/man-db.ch @@ -423,12 +423,12 @@ accessdb, apropos (link to whatis), catman, lexgrog, man, mandb, manpath, whatis, and zsoelim libman.so, libmandb.so - /usr/lib/man-db, /usr/share/doc/man-db-&man-db-version; + /usr/lib/man-db, /usr/libexec/man-db, /usr/share/doc/man-db-&man-db-version; @y accessdb, apropos (whatis へのリンク), catman, lexgrog, man, mandb, manpath, whatis, zsoelim libman.so, libmandb.so - /usr/lib/man-db, /usr/share/doc/man-db-&man-db-version; + /usr/lib/man-db, /usr/libexec/man-db, /usr/share/doc/man-db-&man-db-version; @z @x diff --git a/lfsbook/src/chapter08/kernel.ch b/lfsbook/src/chapter08/kernel.ch index f082d99d..35c9a5b9 100644 --- a/lfsbook/src/chapter08/kernel.ch +++ b/lfsbook/src/chapter08/kernel.ch @@ -305,17 +305,22 @@ @z @x - The headers in the system's - include directory should + The headers in the system's include directory (/usr/include) should always be the ones against which Glibc was compiled, - that is, the sanitised headers from this Linux kernel tarball. - Therefore, they should never be replaced by either - the raw kernel headers or any other kernel sanitized headers. + that is, the sanitised headers installed in . Therefore, they should + never be replaced by either the raw kernel headers + or any other kernel sanitized headers. @y さらに include ディレクトリにあるヘッダーファイルは、必ず Glibc のコンパイルによって得られるものでなければならず、つまりは Linux カーネルの tarball によって提供されるものでなければなりません。 - したがってカーネルヘッダーによって上書きされてしまうのは避けなければなりません。 + class="directory">include ディレクトリ (/usr/include) にあるヘッダーファイルは、必ず Glibc のコンパイルによって得られるものでなければなりません。 + つまり によってインストールされた、健全化 (sanitizing) したものです。 + したがって生のカーネルヘッダーや他のカーネルにて健全化されたヘッダーによって上書きされてしまうのは避けなければなりません。 @z diff --git a/lfsbook/src/general.ch b/lfsbook/src/general.ch index 0b32df74..81a5ecb3 100644 --- a/lfsbook/src/general.ch +++ b/lfsbook/src/general.ch @@ -8,13 +8,13 @@ % $Date:: $ % @x - - + + @y - - - + + + @z @x diff --git a/lfsbook/src/prologue/standards.ch b/lfsbook/src/prologue/standards.ch index 24d6fc3f..090c354c 100644 --- a/lfsbook/src/prologue/standards.ch +++ b/lfsbook/src/prologue/standards.ch @@ -191,14 +191,14 @@ @x LSB Core: - At, Batch (a part of At), Cpio, Ed, Fcrontab, Initd-tools, + At, Batch (a part of At), Cpio, Fcrontab, Initd-tools, Lsb_release, PAM, Sendmail (or Postfix or Exim) @y LSB コア: - At, Batch (At の一部), Cpio, Ed, Fcrontab, Initd-tools, - Lsb_release, PAM, Sendmail (または Postfix または Exim) + At, Batch (At の一部), Cpio, Fcrontab, Initd-tools, + Lsb_release, PAM, Sendmail (Postfix または Exim) @z diff --git a/lfsbook/version.ac b/lfsbook/version.ac index a4209b63..6b885723 100644 --- a/lfsbook/version.ac +++ b/lfsbook/version.ac @@ -7,4 +7,4 @@ dnl $Date:: $ dnl dnl dnl m4-include this file to define the current LFS version -m4_define([lfs_version], [svn-20140218]) +m4_define([lfs_version], [svn-20140221])