From 7acb4c36e5ba8475d7c0c943ca959a2cff9836a0 Mon Sep 17 00:00:00 2001 From: Alex Gronenwoud Date: Tue, 7 Oct 2003 22:22:46 +0000 Subject: Bringing order to the presentation of patches. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2938 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter06/bash-inst.xml | 2 +- chapter06/coreutils-inst.xml | 4 ++-- chapter06/ed-inst.xml | 2 +- chapter06/gawk-inst.xml | 2 +- chapter06/gcc-2953-inst.xml | 6 +++--- chapter06/gcc-inst.xml | 4 ++-- chapter06/glibc-inst.xml | 2 +- chapter06/grub-inst.xml | 2 +- chapter06/kbd-inst.xml | 2 +- chapter06/man-inst.xml | 6 +++--- chapter06/ncurses-inst.xml | 4 ++-- chapter06/procps-inst.xml | 2 +- chapter06/shadowpwd-inst.xml | 2 +- chapter06/zlib-inst.xml | 2 +- 14 files changed, 21 insertions(+), 21 deletions(-) (limited to 'chapter06') diff --git a/chapter06/bash-inst.xml b/chapter06/bash-inst.xml index 308a2dbea..339a670df 100644 --- a/chapter06/bash-inst.xml +++ b/chapter06/bash-inst.xml @@ -7,7 +7,7 @@ way it is expected at times. Fix this behaviour with the following patch: -patch -Np1 -i ../bash-&bash-patch-version;.patch +patch -Np1 -i ../&bash-patch; Prepare Bash for compilation: diff --git a/chapter06/coreutils-inst.xml b/chapter06/coreutils-inst.xml index 665caa7c6..7ef5a0a09 100644 --- a/chapter06/coreutils-inst.xml +++ b/chapter06/coreutils-inst.xml @@ -7,13 +7,13 @@ broken, in that the -p switch always returns "unknown". The following patch fixes this behaviour for Intel architectures: -patch -Np1 -i ../coreutils-&coreutils-uname-patch-version;.patch +patch -Np1 -i ../&coreutils-uname-patch; We do not want Coreutils to install its version of the hostname program, because it is inferior to the version provided by Net-tools. Prevent its installation by applying a patch: -patch -Np1 -i ../coreutils-&coreutils-hostname-patch-version;.patch +patch -Np1 -i ../&coreutils-hostname-patch; Now prepare Coreutils for compilation: diff --git a/chapter06/ed-inst.xml b/chapter06/ed-inst.xml index 0fa6d4d48..0cfe4f261 100644 --- a/chapter06/ed-inst.xml +++ b/chapter06/ed-inst.xml @@ -17,7 +17,7 @@ create temporary files. Apply the patch: -patch -Np1 -i ../ed-&ed-patch-version;.patch +patch -Np1 -i ../&ed-patch; Now prepare Ed for compilation: diff --git a/chapter06/gawk-inst.xml b/chapter06/gawk-inst.xml index 1ac6525be..b804ef845 100644 --- a/chapter06/gawk-inst.xml +++ b/chapter06/gawk-inst.xml @@ -31,7 +31,7 @@ class="directory">$prefix/share/gawk-3.1.3) is removed along with its contents on a make uninstall. -patch -Np1 -i ../gawk-&gawk-patch-version;.patch +patch -Np1 -i ../&gawk-patch; Now prepare Gawk for compilation: diff --git a/chapter06/gcc-2953-inst.xml b/chapter06/gcc-2953-inst.xml index e6531b560..3af7c987e 100644 --- a/chapter06/gcc-2953-inst.xml +++ b/chapter06/gcc-2953-inst.xml @@ -27,9 +27,9 @@ the system GCC already installed in /usr Apply the patches and make a small adjustment: -patch -Np1 -i ../gcc-&gcc-2953-patch-version;.patch -patch -Np1 -i ../gcc-&gcc-2953-no-fixinc-patch-version;.patch -patch -Np1 -i ../gcc-&gcc-2953-returntype-fix-patch-version;.patch +patch -Np1 -i ../&gcc-2953-patch;.patch +patch -Np1 -i ../&gcc-2953-no-fixinc-patch;.patch +patch -Np1 -i ../&gcc-2953-returntype-fix-patch;.patch echo timestamp > gcc/cstamp-h.in The GCC documentation recommends building GCC outside of the source diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml index 2be07056c..35e49751d 100644 --- a/chapter06/gcc-inst.xml +++ b/chapter06/gcc-inst.xml @@ -20,8 +20,8 @@ GCC-testsuite package. The full GCC package contains even more compilers. Instructions for building these can be found at . -patch -Np1 -i ../gcc-&gcc-nofixincludes-patch-version;.patch -patch -Np1 -i ../gcc-&gcc-suppress-libiberty-patch-version;.patch +patch -Np1 -i ../&gcc-nofixincludes-patch; +patch -Np1 -i ../&gcc-suppress-libiberty-patch; The second patch here suppresses the installation of libiberty from GCC, as we will use the one provided by binutils instead. Be careful diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml index 95e6db1e4..9ac69ac01 100644 --- a/chapter06/glibc-inst.xml +++ b/chapter06/glibc-inst.xml @@ -20,7 +20,7 @@ flags. Then apply the same patch we used previously: -patch -Np1 -i ../glibc-&glibc-sscanf-patch-version;.patch +patch -Np1 -i ../&glibc-sscanf-patch; The Glibc documentation recommends building Glibc outside of the source directory in a dedicated build directory: diff --git a/chapter06/grub-inst.xml b/chapter06/grub-inst.xml index 650b76c0b..66ec995b0 100644 --- a/chapter06/grub-inst.xml +++ b/chapter06/grub-inst.xml @@ -11,7 +11,7 @@ Grub. Grub needs a patch to fix a compilation problem with GCC-3.3.1 -patch -Np1 -i ../grub-&grub-patch-version;.patch +patch -Np1 -i ../&grub-patch; Prepare Grub for compilation: diff --git a/chapter06/kbd-inst.xml b/chapter06/kbd-inst.xml index 80ad275d6..e27d55b94 100644 --- a/chapter06/kbd-inst.xml +++ b/chapter06/kbd-inst.xml @@ -7,7 +7,7 @@ setvesablank and getunimap) are not installed . The patch enables the compilation of these utilities: -patch -Np1 -i ../kbd-&kbd-patch-version;.patch +patch -Np1 -i ../&kbd-patch; Now prepare Kbd for compilation: diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml index 958cce200..830ba1532 100644 --- a/chapter06/man-inst.xml +++ b/chapter06/man-inst.xml @@ -9,19 +9,19 @@ man.conf file to prevent redundant results when using programs such as whatis: -patch -Np1 -i ../man-&man-manpath-patch-version;.patch +patch -Np1 -i ../&man-manpath-patch; The second patch adds the -R option to the PAGER variable so that escape sequences are handled properly: -patch -Np1 -i ../man-&man-pager-patch-version;.patch +patch -Np1 -i ../&man-pager-patch; The third and last patch prevents a problem when man pages not formatted with more than 80 columns are used in conjunction with recent releases of groff: -patch -Np1 -i ../man-&man-80cols-patch-version;.patch +patch -Np1 -i ../&man-80cols-patch; Now prepare Man for compilation: diff --git a/chapter06/ncurses-inst.xml b/chapter06/ncurses-inst.xml index 26cc70588..251a901c8 100644 --- a/chapter06/ncurses-inst.xml +++ b/chapter06/ncurses-inst.xml @@ -5,8 +5,8 @@ First fix two tiny bugs: -patch -Np1 -i ../ncurses-&ncurses-version;-etip-2.patch -patch -Np1 -i ../ncurses-&ncurses-version;-vsscanf.patch +patch -Np1 -i ../&ncurses-etip-patch; +patch -Np1 -i ../&ncurses-vsscanf-patch; The first patch corrects the etip.h header file, and the second patch prevents some compiler warnings on the use of deprecated diff --git a/chapter06/procps-inst.xml b/chapter06/procps-inst.xml index 508b5ad42..3e8aa1035 100644 --- a/chapter06/procps-inst.xml +++ b/chapter06/procps-inst.xml @@ -6,7 +6,7 @@ First fix a locale problem that can crash w under certain locale settings: -patch -Np1 -i ../procps-&procps-patch-version;.patch +patch -Np1 -i ../&procps-patch; Now compile Procps: diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml index 9e0069145..4fc389869 100644 --- a/chapter06/shadowpwd-inst.xml +++ b/chapter06/shadowpwd-inst.xml @@ -39,7 +39,7 @@ the package incorrectly assumes it is going to be located at it to fail. The following patch (also appearing in Shadow's CVS code) fixes this problem. -patch -Np1 -i ../shadow-&shadow-patch-version;.patch +patch -Np1 -i ../&shadow-patch;.patch Now prepare Shadow for compilation: diff --git a/chapter06/zlib-inst.xml b/chapter06/zlib-inst.xml index 21cd9bc7d..bef73c94c 100644 --- a/chapter06/zlib-inst.xml +++ b/chapter06/zlib-inst.xml @@ -7,7 +7,7 @@ gzprintf() function, that, though difficult to take advantage of, should be taken care of by applying this patch: -patch -Np1 -i ../zlib-&zlib-patch-version;.patch +patch -Np1 -i ../&zlib-patch; Now prepare Zlib for compilation: -- cgit v1.2.3-54-g00ecf