From 3d2cea91bd05ac1a9868b0d7fe24bc9ffad404c3 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Wed, 28 May 2014 03:34:38 +0000 Subject: Update to man-pages-3.67. Reformatted version check script to fit pdf pages properly. Added a note about adding the parent directory to the es and pt keymaps for proper keymap loading. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10569 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 21 +++++++++++++++++++++ chapter07/usage.xml | 8 ++++++-- general.ent | 4 ++-- packages.ent | 6 +++--- prologue/hostreqs.xml | 43 ++++++++++++++++++++++++++++++------------- 5 files changed, 62 insertions(+), 20 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 1a84906f7..986257407 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -35,6 +35,27 @@ --> + + 2014-05-27 + + + [bdubbs] - Update to man-pages-3.67. Fixes + #3588. + + + [bdubbs] - Reformatted version check script to fit + pdf pages properly. Fixes + #3590. + + + [bdubbs] - Added a note about adding the + parent directory to the es and pt keymaps for proper + keymap loading. Fixes + #3591. + + + + 2014-05-19 diff --git a/chapter07/usage.xml b/chapter07/usage.xml index 885032365..ef2d5ac3a 100644 --- a/chapter07/usage.xml +++ b/chapter07/usage.xml @@ -396,9 +396,13 @@ EOF This variable specifies the arguments for the loadkeys program, typically, the name of keymap - to load, e.g., es. If this variable is not set, the + to load, e.g., it. If this variable is not set, the bootscript will not run the loadkeys program, - and the default kernel keymap will be used. + and the default kernel keymap will be used. Note that for the + keymaps es and pt, the parent directory should also be specified + (e.g. qwerty/es or query/pt) to ensure the proper keymap is + loaded. + diff --git a/general.ent b/general.ent index e29107d4d..de0679351 100644 --- a/general.ent +++ b/general.ent @@ -1,6 +1,6 @@ - + - + diff --git a/packages.ent b/packages.ent index ade924a32..8b8a82c14 100644 --- a/packages.ent +++ b/packages.ent @@ -453,10 +453,10 @@ - - + + - + diff --git a/prologue/hostreqs.xml b/prologue/hostreqs.xml index 0a73e0132..14b010b6a 100644 --- a/prologue/hostreqs.xml +++ b/prologue/hostreqs.xml @@ -176,26 +176,39 @@ if [ -e /usr/bin/awk ]; then echo "/usr/bin/awk -> `readlink -f /usr/bin/awk`"; else echo "awk not found"; fi -gcc --version | head -n1 -g++ --version | head -n1 -ldd --version | head -n1 | cut -d" " -f2- # glibc version -grep --version | head -n1 -gzip --version | head -n1 +gcc - -version | head -n1 +g++ - -version | head -n1 +ldd - -version | head -n1 | cut -d" " -f2- # glibc version +grep - -version | head -n1 +gzip - -version | head -n1 cat /proc/version -m4 --version | head -n1 -make --version | head -n1 -patch --version | head -n1 +m4 - -version | head -n1 +make - -version | head -n1 +patch - -version | head -n1 echo Perl `perl -V:version` -sed --version | head -n1 -tar --version | head -n1 -xz --version | head -n1 +sed - -version | head -n1 +tar - -version | head -n1 +xz - -version | head -n1 echo 'main(){}' > dummy.c && g++ -o dummy dummy.c if [ -x dummy ] then echo "g++ compilation OK"; else echo "g++ compilation failed"; fi -rm -f dummy.c dummy +rm -f dummy.c dummy + +EOF + +bash version-check.sh + + Also check for some library consistency: +cat > library-check.sh << "EOF" +#!/bin/bash for lib in lib{gmp,mpfr,mpc}.la; do echo $lib: $(if find /usr/lib* -name $lib| grep -q $lib;then :;else echo not;fi) found @@ -203,7 +216,11 @@ done unset lib EOF -bash version-check.sh +bash library-check.sh + +The files identified by this script should be all present +or all absent, but not only one or two present. + -- cgit v1.2.3-54-g00ecf