From 7e1a1f861768d858011bf1edd6eab6bb79c25552 Mon Sep 17 00:00:00 2001 From: Krejzi Date: Fri, 15 Aug 2014 10:29:35 +0000 Subject: Merged trunk. git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10691 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- appendices/dependencies.xml | 2 +- chapter01/changelog.xml | 68 +++++++++++++++++++++++++++++++++++++++++++++ chapter01/whatsnew.xml | 4 +++ chapter06/util-linux.xml | 5 ++-- chapter06/vim.xml | 18 +----------- general.ent | 4 +-- packages.ent | 20 ++++++------- patches.ent | 18 ++++++------ 8 files changed, 98 insertions(+), 41 deletions(-) diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index a78c4be66..695a5727f 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -297,7 +297,7 @@ Bash, Binutils, Coreutils, GCC, Gettext, Glibc, - Grep, M4, Make, and Sed + Grep, M4, Make, Perl, and Sed diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index ef4c694f0..f20e03cb4 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -35,6 +35,74 @@ --> + + 2014-08-15 + + + [krejzi] - Merged LFS SVN-20140814. + + + + + + 2014-08-14 + + + [bdubbs] - Update to tzdata2014f. Fixes + #3653. + + + [bdubbs] - Update to linux-3.16.1. Fixes + #3643. + + + [bdubbs] - Update to iproute2-3.16.0. Fixes + #3651. + + + [bdubbs] - Update bison dependencies. Fixes + #3652. + + + + + + 2014-08-12 + + + [bdubbs] - Update patches for bash, readline, and mpfr. Fixes + #3648, + #3649, and + #3650. + + + + + + 2014-08-10 + + + [ken] - Remove --enable-multibyte from vim, it is the + default. Addresses part of + #3647. + + + [ken] - Util-Linux-2.25 needs a filename in ADJTIME_PATH, + fixes #3656. + + + + + + 2014-08-08 + + + [Chris] - Install Util-linux documentation in a versioned + directory. + + + + 2014-08-07 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index a184c73c7..96cc63f3c 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -270,6 +270,10 @@ bash-4.2-fixes-12.patch + + mpfr-3.1.2-upstream_fixes-1.patch + + perl-5.18.2-libc-1.patch diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml index 87f70f0ea..dbcea0791 100644 --- a/chapter06/util-linux.xml +++ b/chapter06/util-linux.xml @@ -57,7 +57,8 @@ Prepare Util-linux for compilation: -./configure ADJTIME_PATH=/var/lib/hwclock +./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ + --docdir=/usr/share/doc/util-linx-&util-linux-version; Compile the package: @@ -110,7 +111,7 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check" libblkid.{a,so}, libmount.{a,so}, libuuid.{a,so} /etc/terminal-colors.d, /usr/include/blkid, /usr/include/libmount, - /usr/include/uuid, /usr/share/doc/util-linux/getopt, /var/lib/hwclock + /usr/include/uuid, /usr/share/doc/util-linux-&util-linux-version;/getopt, /var/lib/hwclock diff --git a/chapter06/vim.xml b/chapter06/vim.xml index 5d1e512fc..c0df3dcb3 100644 --- a/chapter06/vim.xml +++ b/chapter06/vim.xml @@ -50,23 +50,7 @@ Prepare Vim for compilation: -./configure --prefix=/usr --enable-multibyte - - - The meaning of the configure options: - - - --enable-multibyte - - This switch enables support for editing files in multibyte - character encodings. This is needed if using a locale with a - multibyte character set. This switch is also helpful to be able - to edit text files initially created in Linux distributions like - Fedora that use UTF-8 as a default character set. - - - - +./configure --prefix=/usr Compile the package: diff --git a/general.ent b/general.ent index 629e100ec..9b4db837e 100644 --- a/general.ent +++ b/general.ent @@ -1,6 +1,6 @@ - + - + diff --git a/packages.ent b/packages.ent index a4a119159..a93a3e27d 100644 --- a/packages.ent +++ b/packages.ent @@ -327,10 +327,10 @@ - - + + - + @@ -387,13 +387,13 @@ - - + + - + - + - - - + + + @@ -51,13 +51,13 @@ - - - + + + - - - + + + -- cgit v1.2.3-54-g00ecf