From f0f41404fd5da28c2c1ba9839b81f2160c8fb246 Mon Sep 17 00:00:00 2001 From: Matthew Burgess Date: Tue, 26 Feb 2013 20:30:24 +0000 Subject: [PATCH] Merge latest changes from trunk to systemd branch git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10171 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 61 ++++++++++++++++++++++++++++++++++ chapter01/whatsnew.xml | 8 ++--- chapter03/patches.xml | 2 ++ chapter05/gcc-pass1.xml | 5 +++ chapter05/gcc-pass2.xml | 5 +++ chapter06/coreutils.xml | 6 ++-- chapter06/gcc.xml | 7 ++++ chapter06/groff.xml | 7 +--- chapter06/inetutils.xml | 5 +-- chapter06/iproute2.xml | 3 ++ chapter06/kbd.xml | 8 +++++ chapter06/texinfo.xml | 25 ++++++++++++-- general.ent | 4 +-- packages.ent | 72 ++++++++++++++++++++--------------------- patches.ent | 6 ++-- 15 files changed, 167 insertions(+), 57 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index d2892ba28..568004e2b 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -36,6 +36,67 @@ --> + + 2013-02-26 + + + [bdubbs] - Upgrade to File-5.13. Fixes + #3292. + + + + + + 2013-02-26 + + + [ken] - Remove the obsolete resizecons program from kbd, again. + + + + + + 2013-02-24 + + + [matthew] - Upgrade to IPRoute2-3.8.0. Fixes + #3291. + + + [matthew] - Upgrade to Linux-3.8. Fixes + #3290. + + + + + + 2013-02-19 + + + [bdubbs] - Update file name for adjusting CD-ROM + rules mode in section 7.5.1. + + + + + + 2013-02-18 + + + [bdubbs] - Upgrade to Coreutils-8.21. Fixes + #3286. + + + [bdubbs] - Upgrade to Texinfo-5.0. Fixes + #3284. + + + [bdubbs] - Upgrade to Linux-3.7.9. Fixes + #3281. + + + + 2013-02-15 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index b17f7e5b5..983e10b3c 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -190,9 +190,9 @@ TCL &tcl-version; - + Tzdata &tzdata-version; @@ -243,11 +243,11 @@ &coreutils-i18n-patch; - + D-Bus-&dbus-version; diff --git a/chapter03/patches.xml b/chapter03/patches.xml index ef7dda783..83faa250c 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -50,6 +50,7 @@ + Flex Regression Tests Patch - &flex-bison-patch-size;: diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml index b7f97a386..bf8076d1b 100644 --- a/chapter05/gcc-pass1.xml +++ b/chapter05/gcc-pass1.xml @@ -105,6 +105,11 @@ done sed -i '/k prot/agcc_cv_libc_provides_ssp=yes' gcc/configure + Do not build the .info files. They are not needed here and + are broken with the current version of makeinfo. + +sed -i 's/BUILD_INFO=info/BUILD_INFO=/' gcc/configure + The GCC documentation recommends building GCC outside of the source directory in a dedicated build directory: diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index 6c936debc..6e7631741 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -97,6 +97,11 @@ mv -v gmp-&gmp-version; gmp tar -zxf ../mpc-&mpc-version;.tar.gz mv -v mpc-&mpc-version; mpc + Again, do not build the .info files. They are not needed here and + are broken with the current version of makeinfo. + + sed -i 's/BUILD_INFO=info/BUILD_INFO=/' gcc/configure + Create a separate build directory again: mkdir -v ../gcc-build diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index e276f9544..74d8384b8 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -40,11 +40,11 @@ Installation of Coreutils - + POSIX requires that programs from Coreutils recognize character boundaries correctly even in multibyte locales. The following patch fixes this non-compliance and other internationalization-related bugs: @@ -87,7 +87,7 @@ Now the test suite is ready to be run. First, run the tests that are meant to be run as user root: -make NON_ROOT_USERNAME=nobody SUBDIRS= check-root +make NON_ROOT_USERNAME=nobody check-root We're going to run the remainder of the tests as the nobody user. Certain tests, diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index f15144dae..1ecbf524c 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -48,6 +48,13 @@ sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in + Again, do not build the .info files. They are broken with the current + version of makeinfo. + + sed -i 's/BUILD_INFO=info/BUILD_INFO=/' gcc/configure + + + As in , apply the following sed to force the build to use the compiler flag in order to ensure diff --git a/chapter06/groff.xml b/chapter06/groff.xml index 315c3230c..dcc790c4a 100644 --- a/chapter06/groff.xml +++ b/chapter06/groff.xml @@ -49,12 +49,7 @@ by echoing either A4 or letter to the /etc/papersize file. - First, fix a bug in a Makefile, that prevents a symlink to a PDF from -being created correctly: - -sed -i -e '163 s/$(DESTDIR)//' contrib/mom/Makefile.sub - - Now, prepare Groff for compilation: + Prepare Groff for compilation: PAGE=<paper_size> ./configure --prefix=/usr diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml index e773724aa..59e5862dd 100644 --- a/chapter06/inetutils.xml +++ b/chapter06/inetutils.xml @@ -119,10 +119,11 @@ Install the package: -make install +make install + Move some programs so they are available if /usr is not accessable: diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml index b912ca4db..b10288014 100644 --- a/chapter06/iproute2.xml +++ b/chapter06/iproute2.xml @@ -53,6 +53,9 @@ sed -i /ARPD/d Makefile sed -i 's/arpd.8//' man/man8/Makefile + Remove a compiler flag that causes the compilation to fail: +sed -i 's/-Werror//' Makefile + Compile the package: make DESTDIR= diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml index b16af7fa8..8178475d4 100644 --- a/chapter06/kbd.xml +++ b/chapter06/kbd.xml @@ -54,6 +54,14 @@ sed -i -e '326 s/if/while/' src/loadkeys.analyze.l + Remove the redundant resizecons program (it requires + the defunct svgalib to provide the video mode files - for normal use + setfont sizes the console appropriately) together with its + manpage. + +sed -i 's/\(RESIZECONS_PROGS=\)yes/\1no/g' configure && +sed -i 's/resizecons.8 //' man/man8/Makefile.in && + Prepare Kbd for compilation: ./configure --prefix=/usr --datadir=/lib/kbd --disable-vlock diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml index 67a9f6b72..3bac8536c 100644 --- a/chapter06/texinfo.xml +++ b/chapter06/texinfo.xml @@ -100,8 +100,8 @@ done Installed directory - info, infokey, install-info, makeinfo, pdftexi2dvi, texi2dvi, texi2pdf, and - texindex + info, infokey, install-info, makeinfo, pdftexi2dvi, + pod2texi, texi2any, texi2dvi, texi2pdf, and texindex /usr/share/texinfo @@ -168,6 +168,27 @@ done + + pod2texi + + Converts Pod to Texinfo format + + pod2texi + + + + + + texi2any + + Translate Texinfo source documentation to + various other formats + + texi2any + + + + texi2dvi diff --git a/general.ent b/general.ent index b45ea4dd1..06fc61edd 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ - - + + diff --git a/packages.ent b/packages.ent index 10a2f1e06..5f69b33b2 100644 --- a/packages.ent +++ b/packages.ent @@ -84,15 +84,15 @@ - - + + - + - - - - + + + + @@ -148,10 +148,10 @@ - - + + - + @@ -232,10 +232,10 @@ - - + + - + @@ -260,10 +260,10 @@ - - + + - + @@ -310,10 +310,10 @@ - - + + - + @@ -375,13 +375,13 @@ - - - - - + + + + + - + @@ -419,10 +419,10 @@ - - + + - + @@ -562,15 +562,15 @@ - - - - + + + + - - - - + + + + diff --git a/patches.ent b/patches.ent index 5601e86c9..003e8152e 100644 --- a/patches.ent +++ b/patches.ent @@ -15,12 +15,14 @@ - - + + +