From bed61bb6ad1626d1675b589ef8daa56b270a5ed3 Mon Sep 17 00:00:00 2001 From: Timothy Bauscher Date: Sun, 22 Sep 2002 14:22:43 +0000 Subject: [PATCH] Applied Alex's grammatic-fixes patch. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2128 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- appendixa/gcc-desc.xml | 4 ++-- appendixa/kernel-desc.xml | 17 +++++++------- chapter01/changelog.xml | 7 ++++-- chapter06/glibc-exp.xml | 6 ++--- chapter06/kernel-exp-headers.xml | 27 ++++++++++++++--------- chapter06/kernel-exp.xml | 38 +++++++++++++++----------------- chapter06/kernel-inst.xml | 14 +++++------- chapter06/shellutils-exp.xml | 2 +- index.xml | 4 ++-- 9 files changed, 62 insertions(+), 57 deletions(-) diff --git a/appendixa/gcc-desc.xml b/appendixa/gcc-desc.xml index 17aa68099..04a59e522 100644 --- a/appendixa/gcc-desc.xml +++ b/appendixa/gcc-desc.xml @@ -72,8 +72,8 @@ string of text to the screen) from scratch every time he creates a program. libsupc++ -libsup++ provides support for the c++ programming language. Among other -things, libsup++ contains routines for exception handling. +libsupc++ provides support for the c++ programming language. Among other +things, libsupc++ contains routines for exception handling. diff --git a/appendixa/kernel-desc.xml b/appendixa/kernel-desc.xml index aeb0dd4e7..d08bd8f2b 100644 --- a/appendixa/kernel-desc.xml +++ b/appendixa/kernel-desc.xml @@ -11,16 +11,17 @@ The Linux kernel is at the core of every Linux system. It's what makes Linux tick. When a computer is turned on and boots a Linux system, the very first piece of Linux software that gets loaded is the kernel. The -kernel initializes the system's hardware components such as serial -ports, parallel ports, sound cards, network cards, IDE controllers, SCSI -controllers and a lot more. In a nutshell the kernel makes the hardware -available so that the software can run. +kernel initializes the system's hardware components: serial ports, parallel +ports, sound cards, network cards, IDE controllers, SCSI controllers and a +lot more. In a nutshell the kernel makes the hardware available so that the +software can run. linux kernel headers -These are the files we copy to /usr/include/{linux,asm} in chapter -5. They should match those which glibc was compiled against and so -should not be replaced when upgrading the kernel. -They are essential for compiling many programs. +These are the files we copy to +/usr/include/{linux,asm} in chapter 5. They should +match those which glibc was compiled against and therefore should +not be replaced when upgrading the kernel. They are +essential for compiling many programs. diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 1ca7ba7c4..8be9c5cda 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -59,8 +59,11 @@ -September 21st, 2002 [timothy]: Chapter 02: -Applied Bill Maltby's grammatic-fixes patch. +September 22nd, 2002 [timothy]: Chapter 06: Applied Alex's +grammatic-fixes patch. + +September 21st, 2002 [timothy]: Chapter 02: Applied Bill +Maltby's grammatic-fixes patch. September 21st, 2002 [timothy]: Chapter 06 - Zlib: mv shared lib to /lib. diff --git a/chapter06/glibc-exp.xml b/chapter06/glibc-exp.xml index 3eb7b17b0..9ee0c2232 100644 --- a/chapter06/glibc-exp.xml +++ b/chapter06/glibc-exp.xml @@ -2,11 +2,11 @@ Command explanations patch -Np1 -i ../glibc-&glibc-patch-version;.patch: -This patch converts all occurances of $(PERL) to +This patch converts all occurrences of $(PERL) to /usr/bin/perl in the malloc/Makefile file. This is done because Glibc can't autodetect the location of perl because perl has yet to be installed. The -patch also replaces all occurances of root with +patch also replaces all occurrences of root with 0 in the login/Makefile file. This is done because Glibc itself isn't installed yet and therefore username to userid resolving isn't working yet, so a chown root @@ -24,7 +24,7 @@ that it can't read the file, so we simply create an empty file (the empty file will have Glibc default to using /lib and /usr/lib which is fine). --disable-profile: This disables the building -of libraries with profiling information. This command may be ommitted if +of libraries with profiling information. This command may be omitted if you plan to do profiling. --enable-add-ons: This enables the add-on that diff --git a/chapter06/kernel-exp-headers.xml b/chapter06/kernel-exp-headers.xml index 525fe0f6b..4e42a1549 100644 --- a/chapter06/kernel-exp-headers.xml +++ b/chapter06/kernel-exp-headers.xml @@ -1,11 +1,11 @@ Why we copy the kernel headers and don't symlink them -In the past it was common practice for people to symlink the -/usr/include/linux and asm directories to /usr/src/linux/include/linux -and asm respectively. This is a bad idea as -this extract from a post by Linus Torvalds to the Linux Kernel -Mailing List points out: +In the past it was common practice to symlink the +/usr/include/{linux,asm} directories +to /usr/src/linux/include/{linux,asm}. +This was a bad practice, as the following extract from a +post by Linus Torvalds to the Linux Kernel Mailing List points out: I would suggest that people who compile new kernels should: @@ -25,11 +25,16 @@ has that broken symlink, and people still remember that the linux sources should go into "/usr/src/linux" even though that hasn't been true in a _loong_ time. -The relevant part here is where he states that the headers should -be the ones which glibc was compiled against. These are -the headers which should remain accessible and so by copying them, we ensure -that we follow these guidelines. Also note that as long as you don't have -those symlinks, it is perfectly fine to have the kernel sources -in /usr/src/linux. +The essential part is where Linus states that the header files should be +the ones which glibc was compiled against. These are +the headers that should be used when you later compile other packages, as they +are the ones that match the object-code library files. By copying the headers, +we ensure that they remain available if later you upgrade your kernel. + +Note, by the way, that it is perfectly all right to have the kernel sources +in /usr/src/linux, as long as you don't +have the /usr/include/{linux,asm} +symlinks. + diff --git a/chapter06/kernel-exp.xml b/chapter06/kernel-exp.xml index cb9352c25..ed087d4f0 100644 --- a/chapter06/kernel-exp.xml +++ b/chapter06/kernel-exp.xml @@ -1,38 +1,36 @@ Command explanations -ln -s /static/bin/pwd /bin/pwd: The kernel -source hard-wires the path to pwd to be -/bin/pwd so we create a temporary symlink to deal with -it. +ln -s /static/bin/pwd /bin/pwd: In the kernel +source, the path to the pwd program is hard-wired as +/bin/pwd, so we create a temporary symlink to account +for that. At the end we remove it again. -make mrproper: This will ensure that the kernel -tree is absolutely clean. We do this because the kernel team recommend -that this is done prior to each kernel compilation, -and that we shouldn't rely on the source tree being automatically clean -after untarring. +make mrproper: This ensures that the kernel +tree is absolutely clean. The kernel team recommends that this command be +issued prior to each kernel compilation, and that you +shouldn't rely on the source tree being clean after untarring. make include/linux/version.h and make symlinks: This creates the -include/linux/version.h, as well as the include/asm symlink. +include/linux/version.h file and the platform-specific +include/asm symlink. mkdir /usr/include/asm , cp include/asm/* /usr/include/asm and -cp include/asm-generic /usr/include: -This copies the platform-specific assembler kernel header files to +cp -R include/asm-generic /usr/include: +These commands copy the platform-specific assembler kernel header files to /usr/include/asm and /usr/include/asm-generic +class="directory">/usr/include/asm-generic. cp -R include/linux /usr/include: This command copies the cross-platform kernel header files to -/usr/include +/usr/include. -touch /usr/include/linux/autoconf.h: Some -kernel header files include this autoconf.h file, but -outside the Linux source tree, that file has no meaning so we just create -an empty one so we don't get compile errors whenever it happens to be a -dependency of another kernel header file. +touch /usr/include/linux/autoconf.h: This +creates an empty autoconf.h file. As we do not yet +configure the kernel, we have to create this file ourselves for those few +kernel header files that make use of it, to avoid compilation failures. diff --git a/chapter06/kernel-inst.xml b/chapter06/kernel-inst.xml index ceee8cf51..9f5ba999f 100644 --- a/chapter06/kernel-inst.xml +++ b/chapter06/kernel-inst.xml @@ -1,14 +1,12 @@ -Installation of the Linux Kernel +Installation of the kernel headers -We won't be compiling a new kernel image yet. We'll do that after we -have finished the installation of the basic system software in this -chapter. But because certain software needs the kernel header files, we're -going to unpack the kernel archive now and set it up so that we can -compile the packages that need the kernel. +We won't be compiling a new kernel yet -- we'll do that when we have +finished the installation of all the packages. But as some packages need the +kernel header files, we're going to unpack the kernel archive now, set it up, +and copy the header files to where they will be found by these packages. -The kernel configuration file is created by running the following -command: +The kernel headers are copied by running the following commands: ln -s /static/bin/pwd /bin/pwd && make mrproper && diff --git a/chapter06/shellutils-exp.xml b/chapter06/shellutils-exp.xml index 872f025f6..76718e781 100644 --- a/chapter06/shellutils-exp.xml +++ b/chapter06/shellutils-exp.xml @@ -2,7 +2,7 @@ Command explanations patch -Np1 -i ../sh-utils-&sh-utils-hostname-patch-version;.patch: This patch -supresses the build of the hostname program which we will be installed +suppresses the build of the hostname program which we will be installed later with the net-tools package. The hostname program from the net-tools package is a much better version (and in some cases even required since it supports options that are needed by some programs such as XFree86). diff --git a/index.xml b/index.xml index 3c208fdba..9f6802244 100644 --- a/index.xml +++ b/index.xml @@ -4,8 +4,8 @@ - - + +