From 71bbe67154812a63d55689259d1467b853a25b48 Mon Sep 17 00:00:00 2001 From: Zack Winkles Date: Mon, 7 Jun 2004 18:52:47 +0000 Subject: Updated patch names to the new naming scheme used by the patches project git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3760 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter06/bash.xml | 2 +- chapter06/coreutils.xml | 2 +- chapter06/flex.xml | 2 +- chapter06/gcc.xml | 2 +- chapter06/inetutils.xml | 4 ++-- chapter06/mktemp.xml | 2 +- chapter06/net-tools.xml | 2 +- chapter06/readline.xml | 2 +- chapter06/sysklogd.xml | 2 +- chapter06/util-linux.xml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) (limited to 'chapter06') diff --git a/chapter06/bash.xml b/chapter06/bash.xml index f2fcf435a..002a043ff 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -32,7 +32,7 @@ GCC, Glibc, Grep, Make, Ncurses, Sed. way it is expected at times. Fix this behavior with the following patch: -patch -Np1 -i ../bash-&bash-version;-gnu-fixes-2.patch +patch -Np1 -i ../bash-&bash-version;-gnu_fixes-2.patch Now prepare Bash for compilation: diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index 983db0db8..af5251262 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -39,7 +39,7 @@ architectures: Prevent Coreutils from installing binaries that will be later be installed by other programs: -patch -Np1 -i ../coreutils-&coreutils-version;-dupes-1.patch +patch -Np1 -i ../coreutils-&coreutils-version;-suppress_hostname_uptime_kill_su-1.patch Now prepare Coreutils for compilation: diff --git a/chapter06/flex.xml b/chapter06/flex.xml index ce0f86e5a..5fcfbb3f8 100644 --- a/chapter06/flex.xml +++ b/chapter06/flex.xml @@ -31,7 +31,7 @@ GCC, Gettext, Glibc, Grep, M4, Make, Sed Flex contains several known bugs. Fix these with the following patch: -patch -Np1 -i ../flex-&flex-version;-debian-fixes-2.patch +patch -Np1 -i ../flex-&flex-version;-debian_fixes-2.patch The GNU autotools detects that the Flex source code has been modified by the patch, and tries to update the man pages to include those changes, but this breaks on many diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index 669bf3eaa..662e95dfe 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -44,7 +44,7 @@ compilers. Instructions for building these can be found at First apply only the No-Fixincludes patch (and not the Specs patch) also used in the previous chapter: -patch -Np1 -i ../gcc-&gcc-short-version;-no-fixincludes-1.patch +patch -Np1 -i ../gcc-&gcc-short-version;-no_fixincludes-1.patch Now apply a sed substitution that will suppress the installation of libiberty.a. We want to use the version of diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml index cd9914cff..2b282aa93 100644 --- a/chapter06/inetutils.xml +++ b/chapter06/inetutils.xml @@ -31,13 +31,13 @@ Diffutils, GCC, Glibc, Grep, Make, Ncurses, Sed Inetutils has issues with the Linux 2.6 kernel series - fix these isues by applying the following patch: -patch -Np1 -i ../inetutils-&inetutils-version;-kernel-headers-1.patch +patch -Np1 -i ../inetutils-&inetutils-version;-kernel_headers-1.patch We are not going to install all the programs that come with Inetutils. However, the Inetutils build system will insist on installing all the man pages anyway. The following patch will correct this situation: -patch -Np1 -i ../inetutils-&inetutils-version;-no-server-man-pages-1.patch +patch -Np1 -i ../inetutils-&inetutils-version;-no_server_man_pages-1.patch Now prepare Inetutils for compilation: diff --git a/chapter06/mktemp.xml b/chapter06/mktemp.xml index 07944e904..2b3a2582b 100644 --- a/chapter06/mktemp.xml +++ b/chapter06/mktemp.xml @@ -30,7 +30,7 @@ files in shell scripts. program, which has functionality much the same as mktemp. Patch mktemp to include a tempfile wrapper: -patch -Np1 -i ../mktemp-&mktemp-version;-add-tempfile-1.patch +patch -Np1 -i ../mktemp-&mktemp-version;-add_tempfile-1.patch Now prepare Mktemp for compilation: diff --git a/chapter06/net-tools.xml b/chapter06/net-tools.xml index 1c3b45b72..de02cbc44 100644 --- a/chapter06/net-tools.xml +++ b/chapter06/net-tools.xml @@ -46,7 +46,7 @@ fix by applying the following patch: Net-tools has issues with the Linux 2.6 kernel series - fix these issues by applying the following patch: -patch -Np1 -i ../net-tools-&net-tools-version;-kernel-headers-1.patch +patch -Np1 -i ../net-tools-&net-tools-version;-kernel_headers-1.patch Now prepare Net-tools for compilation (if you intend to accept the defaults, you can skip all the questions by running yes "" | diff --git a/chapter06/readline.xml b/chapter06/readline.xml index 5884b1d05..2694912dc 100644 --- a/chapter06/readline.xml +++ b/chapter06/readline.xml @@ -32,7 +32,7 @@ GCC, Glibc, Grep, Make, Ncurses, Sed way it is expected at times. Fix this behavior with the following patch: -patch -Np1 -i ../readline-&readline-version;-gnu-fixes-1.patch +patch -Np1 -i ../readline-&readline-version;-gnu_fixes-1.patch Now prepare Readline for compilation: diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml index deb95e22a..097cd077a 100644 --- a/chapter06/sysklogd.xml +++ b/chapter06/sysklogd.xml @@ -31,7 +31,7 @@ as those given by the kernel when unusual things happen. Sysklogd has issues with the Linux 2.6 kernel series - fix these isues by applying the following patch: -patch -Np1 -i ../sysklogd-&sysklogd-version;-kernel-headers-1.patch +patch -Np1 -i ../sysklogd-&sysklogd-version;-kernel_headers-1.patch There is also a race condition in the signal handling logic, and this sometimes confuses the sysklogd initscript. diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml index ac1413644..64658f402 100644 --- a/chapter06/util-linux.xml +++ b/chapter06/util-linux.xml @@ -48,7 +48,7 @@ mkdir -p /var/lib/hwclock Util-linux has issues with the Linux 2.6 kernel series - fix these isues by applying the following patch: -patch -Np1 -i ../util-linux-&util-linux-version;-kernel-headers-1.patch +patch -Np1 -i ../util-linux-&util-linux-version;-kernel_headers-1.patch Prepare Util-linux for compilation: -- cgit v1.2.3-54-g00ecf