From 5e2cb652195321c7f63b5d22077e583b75118178 Mon Sep 17 00:00:00 2001 From: Gerard Beekmans Date: Sat, 25 May 2002 00:19:47 +0000 Subject: first set of commits for keep-chap5-chap6-seperate git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@1896 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 7 +++++++ chapter05/bash-inst.xml | 9 +++------ chapter05/binutils-inst.xml | 6 +++--- chapter05/bzip2-inst.xml | 5 +---- chapter05/chapter05.xml | 7 +++---- chapter05/diffutils-inst.xml | 2 +- chapter05/fileutils-inst.xml | 6 ++---- chapter05/gawk-inst.xml | 4 ++-- chapter05/gcc-inst.xml | 12 +++++------- chapter05/grep-inst.xml | 4 ++-- chapter05/gzip-inst.xml | 6 ++---- chapter05/installasuser.xml | 8 ++++---- chapter05/introduction.xml | 6 ++++++ chapter05/make-inst.xml | 8 ++++---- chapter05/patch-inst.xml | 2 +- chapter05/sed-inst.xml | 2 +- chapter05/shellutils-inst.xml | 7 ++----- chapter05/tar-inst.xml | 5 ++--- chapter05/texinfo-inst.xml | 2 +- chapter05/textutils-inst.xml | 5 ++--- chapter06/bzip2-inst.xml | 2 -- chapter06/changingowner.xml | 11 ++++------- chapter06/chapter06.xml | 26 +++++++++++++++----------- chapter06/chroot.xml | 8 ++++---- chapter06/chrootcmd.xml | 6 ++++-- chapter06/glibc-exp.xml | 10 ---------- chapter06/glibc-inst.xml | 6 ++---- chapter06/grep-inst.xml | 1 - chapter06/introduction.xml | 8 ++++++++ chapter06/makedev-inst.xml | 3 ++- chapter06/man-inst.xml | 3 ++- chapter06/man.xml | 1 + chapter06/psmisc-inst.xml | 3 +-- entities/bash.ent | 1 - entities/chapter05.ent | 4 +--- entities/chapter06.ent | 4 ++++ entities/findutils.ent | 4 ++++ entities/kernel.ent | 8 ++++---- entities/man.ent | 1 + entities/utillinux.ent | 3 +++ 40 files changed, 114 insertions(+), 112 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index a146946d5..bde9484f9 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -27,6 +27,13 @@ +May 23rd, 2002 [gerard]: Implemented the +keep_chap5_and_chap6_sep lfs-hint. Highlights of the change: added +findutils and util-linux to chapter 5, installed everything from chapter 5 +into $LFS/static and re-ordered the +installation of packages in chapter 6 to prevent hard-wiring the wrong path +(files from $LFS/static). + May 23rd, 2002 [gerard]: Appendix A - E2fsprogs: Added some more descriptions. diff --git a/chapter05/bash-inst.xml b/chapter05/bash-inst.xml index c72100cf4..83113b2e2 100644 --- a/chapter05/bash-inst.xml +++ b/chapter05/bash-inst.xml @@ -21,10 +21,9 @@ following commands as user root: commands: ./configure --enable-static-link \ -    --prefix=$LFS/usr --bindir=$LFS/bin --with-curses && +    --prefix=$LFS/static --with-curses && make && -make install && -ln -sf bash $LFS/bin/sh +make install If the make install phase ends with something along the lines of @@ -46,9 +45,7 @@ chapter 6, so you can ignore it. When we tested it with the latest Debian version, the last two commands were executed because the install process didn't return with a -value larger than 0. But you would do good to check if you have the -$LFS/bin/sh symlink on your LFS -partition. If not, run the last two commands manually now. +value larger than 0. diff --git a/chapter05/binutils-inst.xml b/chapter05/binutils-inst.xml index 813621471..26d1fb232 100644 --- a/chapter05/binutils-inst.xml +++ b/chapter05/binutils-inst.xml @@ -13,9 +13,9 @@ warned. mkdir ../binutils-build && cd ../binutils-build && -../binutils-&binutils-version;/configure --prefix=$LFS/usr --disable-nls && -make tooldir=$LFS/usr LDFLAGS=-all-static && -make tooldir=$LFS/usr install +../binutils-&binutils-version;/configure --prefix=$LFS/static --disable-nls && +make tooldir=$LFS/static LDFLAGS=-all-static && +make tooldir=$LFS/static install diff --git a/chapter05/bzip2-inst.xml b/chapter05/bzip2-inst.xml index 50ee61126..8bccdeaf3 100644 --- a/chapter05/bzip2-inst.xml +++ b/chapter05/bzip2-inst.xml @@ -4,10 +4,7 @@ Install Bzip2 by running the following commands: make CC="gcc -static" && -make PREFIX=$LFS/usr install && -mv $LFS/usr/bin/{bzcat,bunzip2,bzip2,bzip2recover} $LFS/bin && -cp $LFS/usr/bin/{bzless,bzmore} $LFS/bin && -rm $LFS/usr/bin/{bzless,bzmore} +make PREFIX=$LFS/static install Although it's not strictly a part of a basic LFS system it's worth mentioning that a patch for Tar can be downloaded which enables the tar diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml index efe68d07a..0a1508b96 100644 --- a/chapter05/chapter05.xml +++ b/chapter05/chapter05.xml @@ -4,18 +4,18 @@ &c5-introduction; &c5-whystatic; +&c5-creatingstaticdir; &c5-installasuser; -&c5-creatingdirs; &c5-bash; &c5-binutils; &c5-bzip2; &c5-diffutils; &c5-fileutils; +&c5-findutils; &c5-gawk; &c5-gcc; &c5-grep; &c5-gzip; -&c5-kernel; &c5-make; &c5-patch; &c5-sed; @@ -23,8 +23,7 @@ &c5-tar; &c5-texinfo; &c5-textutils; -&c5-pwdgroup; -&c5-proc; +&c5-utillinux; diff --git a/chapter05/diffutils-inst.xml b/chapter05/diffutils-inst.xml index a4af5074d..f5f59fd15 100644 --- a/chapter05/diffutils-inst.xml +++ b/chapter05/diffutils-inst.xml @@ -4,7 +4,7 @@ Install Diffutils by running the following commands: CPPFLAGS=-Dre_max_failures=re_max_failures2 \ -./configure --prefix=$LFS/usr --disable-nls && +./configure --prefix=$LFS/static --disable-nls && make LDFLAGS=-static && make install diff --git a/chapter05/fileutils-inst.xml b/chapter05/fileutils-inst.xml index 29121fec8..1cfb30977 100644 --- a/chapter05/fileutils-inst.xml +++ b/chapter05/fileutils-inst.xml @@ -28,11 +28,9 @@ sed -e 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \ Install Fileutils by running the following commands: -./configure --disable-nls \ -    --prefix=$LFS/usr --bindir=$LFS/bin && +./configure --disable-nls --prefix=$LFS/static && make LDFLAGS=-static && -make install && -ln -sf ../../bin/install $LFS/usr/bin +make install Once you have installed Fileutils, you can test whether the segmentation fault problem has been avoided by running diff --git a/chapter05/gawk-inst.xml b/chapter05/gawk-inst.xml index 0d858adc8..7b0862fd5 100644 --- a/chapter05/gawk-inst.xml +++ b/chapter05/gawk-inst.xml @@ -18,8 +18,8 @@ sed -e '/^datadir/s/awk/gawk/' \ -e '/^libexecdir/s%/awk%%' awklib/Makefile.in.backup \     > awklib/Makefile.in && CPPFLAGS=-Dre_max_failures=re_max_failures2 \ -./configure --prefix=$LFS/usr --disable-nls \ -    --libexecdir=$LFS/usr/bin && +./configure --prefix=$LFS/static --disable-nls \ +    --libexecdir=$LFS/static/bin && make LDFLAGS=-static && make install diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml index e27dd0e95..ad9f79f51 100644 --- a/chapter05/gcc-inst.xml +++ b/chapter05/gcc-inst.xml @@ -17,15 +17,13 @@ been warned. patch -Np1 -i ../gcc-&gcc-patch-version;.patch && mkdir ../gcc-build && cd ../gcc-build && -../gcc-&gcc-version;/configure --prefix=/usr --enable-languages=c,c++ \ +../gcc-&gcc-version;/configure --prefix=/static --enable-languages=c,c++ \    --disable-nls --disable-shared --enable-threads=posix && make BOOT_LDFLAGS=-static bootstrap && -make prefix=$LFS/usr install && -ln -sf ../usr/bin/cpp $LFS/lib && -ln -sf ../bin/cpp $LFS/usr/lib && -ln -sf gcc $LFS/usr/bin/cc && -rmdir $LFS/usr/*-gnu/include && -rmdir $LFS/usr/*-gnu +make prefix=$LFS/static install && +ln -s gcc $LFS/static/bin/cc && +rmdir $LFS/static/*-gnu/include && +rmdir $LFS/static/*-gnu diff --git a/chapter05/grep-inst.xml b/chapter05/grep-inst.xml index 8e9a711cd..18fe41068 100644 --- a/chapter05/grep-inst.xml +++ b/chapter05/grep-inst.xml @@ -4,8 +4,8 @@ Install Grep by running the following commands: CPPFLAGS=-Dre_max_failures=re_max_failures2 \ -./configure --prefix=$LFS/usr --bindir=$LFS/bin \ -    --disable-nls --disable-perl-regexp && +./configure --prefix=$LFS/static --disable-nls \ +    --disable-perl-regexp && make LDFLAGS=-static && make install diff --git a/chapter05/gzip-inst.xml b/chapter05/gzip-inst.xml index 98f35df93..38467f7ee 100644 --- a/chapter05/gzip-inst.xml +++ b/chapter05/gzip-inst.xml @@ -3,11 +3,9 @@ Install Gzip by running the following commands: -./configure --prefix=$LFS/usr && +./configure --prefix=$LFS/static && make LDFLAGS=-static && -make install && -cp $LFS/usr/bin/{gunzip,gzip} $LFS/bin && -rm $LFS/usr/bin/{gunzip,gzip} +make install diff --git a/chapter05/installasuser.xml b/chapter05/installasuser.xml index 4544e735a..85d2013e0 100644 --- a/chapter05/installasuser.xml +++ b/chapter05/installasuser.xml @@ -16,11 +16,11 @@ commands as root will create a new user "lfs": useradd -s /bin/bash -m lfs && passwd lfs -Now it's time to change the permissions on your LFS partitions -so user "lfs" will have write access to it. Run the following command -as root to change the ownership of the LFS partition to user "lfs": +Now we need to give proper permissions to the $LFS/static directory so user "lfs" can write +to it: -chown -R lfs $LFS +chown -R lfs $LFS/static Now you can login as user "lfs". You can do this two ways: either the normal way through the console or the display manager, or with diff --git a/chapter05/introduction.xml b/chapter05/introduction.xml index 62707dde6..d59d7d0d3 100644 --- a/chapter05/introduction.xml +++ b/chapter05/introduction.xml @@ -19,6 +19,12 @@ example of such a dependency is that you need a compiler to install a compiler, and you're going to need a shell to install a shell and that compiler. +All the files from this chapter will be installed under the $LFS/static directory. By doing it this way, +we keep the installation from this chapter seperate from the final +installation in the next chapter. Everything done here is only temporarily +so we don't want it to pollute the to-be LFS system. + The key to learning what makes Linux tick is to know exactly what packages are used for and why a user or the system needs them. Descriptions of the package content are provided after the Installation subsection of each diff --git a/chapter05/make-inst.xml b/chapter05/make-inst.xml index 24f5b96d7..0be34b03c 100644 --- a/chapter05/make-inst.xml +++ b/chapter05/make-inst.xml @@ -3,16 +3,16 @@ Install Make by running the following commands: -./configure --prefix=$LFS/usr --disable-nls && +./configure --prefix=$LFS/static --disable-nls && make LDFLAGS=-static && make install During the make install phase you will see this warning: -
chgrp: changing group of `/mnt/lfs/usr/bin/make': Operation not permitted -/mnt/lfs/usr/bin/make needs to be owned by group kmem and setgid; +
chgrp: changing group of `/mnt/lfs/static/bin/make': Operation not permitted +/mnt/lfs/static/bin/make needs to be owned by group kmem and setgid; otherwise the `-l' option will probably not work. You may need special -privileges to complete the installation of /mnt/lfs/usr/bin/make.
+privileges to complete the installation of /mnt/lfs/static/bin/make.
You can safely ignore this warning. make doesn't need to be owned by group kmem and setgid for the -l option to work (which diff --git a/chapter05/patch-inst.xml b/chapter05/patch-inst.xml index 89512820a..4528b7f2b 100644 --- a/chapter05/patch-inst.xml +++ b/chapter05/patch-inst.xml @@ -4,7 +4,7 @@ Install Patch by running the following commands: CPPFLAGS=-D_GNU_SOURCE \ -./configure --prefix=$LFS/usr && +./configure --prefix=$LFS/static && make LDFLAGS=-static && make install diff --git a/chapter05/sed-inst.xml b/chapter05/sed-inst.xml index 38ed00dc7..1f30b36e8 100644 --- a/chapter05/sed-inst.xml +++ b/chapter05/sed-inst.xml @@ -4,7 +4,7 @@ Install Sed by running the following commands: CPPFLAGS=-Dre_max_failures=re_max_failures2 \ -./configure --prefix=$LFS/usr --bindir=$LFS/bin && +./configure --prefix=$LFS/static && make LDFLAGS=-static && make install diff --git a/chapter05/shellutils-inst.xml b/chapter05/shellutils-inst.xml index ec819ca95..943df5434 100644 --- a/chapter05/shellutils-inst.xml +++ b/chapter05/shellutils-inst.xml @@ -3,13 +3,10 @@ Install Sh-utils by running the following commands: -./configure --prefix=$LFS/usr \ +./configure --prefix=$LFS/static \     --disable-nls && make LDFLAGS=-static && -make install && -mv $LFS/usr/bin/{basename,date,echo,false,hostname} $LFS/bin && -mv $LFS/usr/bin/{pwd,sleep,stty,test,true,uname} $LFS/bin && -mv $LFS/usr/bin/chroot $LFS/usr/sbin +make install During the make install stage you will see the following warning: diff --git a/chapter05/tar-inst.xml b/chapter05/tar-inst.xml index 1b2f62b8b..b87930ac6 100644 --- a/chapter05/tar-inst.xml +++ b/chapter05/tar-inst.xml @@ -12,9 +12,8 @@ for gzip files). Install Tar by running the following commands: -./configure --prefix=$LFS/usr \ -    --disable-nls --libexecdir=$LFS/usr/bin \ -    --bindir=$LFS/bin && +./configure --prefix=$LFS/static \ +    --disable-nls --libexecdir=$LFS/static/bin && make LDFLAGS=-static && make install diff --git a/chapter05/texinfo-inst.xml b/chapter05/texinfo-inst.xml index c7482ab00..0e36b6b96 100644 --- a/chapter05/texinfo-inst.xml +++ b/chapter05/texinfo-inst.xml @@ -3,7 +3,7 @@ Install Texinfo by running the following commands: -./configure --prefix=$LFS/usr \ +./configure --prefix=$LFS/static \     --disable-nls && make LDFLAGS=-static && make install diff --git a/chapter05/textutils-inst.xml b/chapter05/textutils-inst.xml index ee81169b3..4dd4c9606 100644 --- a/chapter05/textutils-inst.xml +++ b/chapter05/textutils-inst.xml @@ -3,11 +3,10 @@ Install Textutils by running the following commands: -./configure --prefix=$LFS/usr \ +./configure --prefix=$LFS/static \     --disable-nls && make LDFLAGS=-static && -make install && -mv $LFS/usr/bin/{cat,head} $LFS/bin +make install diff --git a/chapter06/bzip2-inst.xml b/chapter06/bzip2-inst.xml index 112b3fa63..8839c3a6d 100644 --- a/chapter06/bzip2-inst.xml +++ b/chapter06/bzip2-inst.xml @@ -5,14 +5,12 @@ make -f Makefile-libbz2_so && make && -rm /usr/bin/bz* && make PREFIX=/usr install && cp bzip2-shared /bin/bzip2 && ln -s libbz2.so.1.0 libbz2.so && cp -a libbz2.so* /lib && ln -sf ../../lib/libbz2.so /usr/lib&& rm /usr/bin/{bunzip2,bzcat,bzip2} && -rm /bin/{bzless,bzmore} && mv /usr/bin/{bzip2recover,bzless,bzmore} /bin && ln -sf bzip2 /bin/bunzip2 && ln -sf bzip2 /bin/bzcat diff --git a/chapter06/changingowner.xml b/chapter06/changingowner.xml index ed50198b7..94bac26ec 100644 --- a/chapter06/changingowner.xml +++ b/chapter06/changingowner.xml @@ -6,19 +6,16 @@ all files and directories that were installed in chapter 5 back to root. Run the following commands to do so: -chown 0:0 / /proc && -chown -R 0:0 /{bin,boot,dev,etc,home,lib,mnt,opt,root,sbin,tmp,usr,var} +chown -R 0:0 / Depending on the filesystem you created on the LFS partition, you may have a /lost+found directory. If so, run: chown 0:0 /lost+found -These commands will change the ownership of the root partition and -the /proc directory to root, plus everything under -the directories mentioned in the second line. In these commands, 0:0 is -used instead of the usual root:root, because the username root can't be -resolved because glibc is not yet installed. +These commands will change the ownership of the root partition to +root. In these commands, 0:0 is used instead of the usual root:root, because +the username root can't be resolved because glibc is not yet installed. diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index 5f0ce67bb..3ab34012e 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -4,42 +4,50 @@ &c6-introduction; &c6-aboutdebug; -&c6-bashprofile; &c6-chroot; &c6-changingowner; +&c6-creatingdirs; +&c6-pwdgroup; &c6-mtablink; +&c6-mountproc; +&c6-createfiles; +&c6-kernel; &c6-glibc; &c6-makedev; +&c6-gcc; &c6-manpages; &c6-findutils; &c6-gawk; &c6-ncurses; &c6-vim; -&c6-gcc; &c6-bison; &c6-less; &c6-groff; -&c6-man; +&c6-textutils; +&c6-sed; +&c6-flex; +&c6-binutils; +&c6-fileutils; +&c6-shellutils; +&c6-gettext; +&c6-nettools; &c6-perl; &c6-m4; &c6-texinfo; &c6-autoconf; &c6-automake; &c6-bash; -&c6-flex; &c6-file; &c6-libtool; &c6-bin86; -&c6-binutils; &c6-bzip2; &c6-ed; -&c6-gettext; &c6-kbd; &c6-diffutils; &c6-e2fsprogs; -&c6-fileutils; &c6-grep; &c6-gzip; +&c6-man; &c6-lilo; &c6-make; &c6-modutils; @@ -49,14 +57,10 @@ &c6-procps; &c6-psmisc; &c6-reiserfs; -&c6-sed; -&c6-shellutils; -&c6-nettools; &c6-shadowpwd; &c6-sysklogd; &c6-sysvinit; &c6-tar; -&c6-textutils; &c6-utillinux; &c6-bootscripts; &c6-configure; diff --git a/chapter06/chroot.xml b/chapter06/chroot.xml index 1bf864b03..0c0dfbf95 100644 --- a/chapter06/chroot.xml +++ b/chapter06/chroot.xml @@ -13,10 +13,10 @@ actually /mnt/lfs but the shell doesn't know that). &c6-chrootcmd; The -i option will clear all environment variables for as long as you -are in the chroot'ed environment and only the HOME and TERM variables -are set. The TERM=$TERM construction will set the TERM variable inside -chroot to the same value as outside chroot which is needed for programs -like vim and less to operate properly. If you need other variables +are in the chroot'ed environment and only the HOME, TERM, PS1 and PATH +variables are set. The TERM=$TERM construction will set the TERM variable +inside chroot to the same value as outside chroot which is needed for +programs like vim and less to operate properly. If you need other variables present, such as CFLAGS or CXXFLAGS, you need to set them again. Now that we are inside a chroot'ed environment, we can continue to diff --git a/chapter06/chrootcmd.xml b/chapter06/chrootcmd.xml index 358ef1b40..eefa87e5b 100644 --- a/chapter06/chrootcmd.xml +++ b/chapter06/chrootcmd.xml @@ -1,2 +1,4 @@ -chroot $LFS /usr/bin/env -i HOME=/root \ -    TERM=$TERM /bin/bash --login +chroot $LFS /static/bin/env -i HOME=/root TERM=$TERM \ +    PS1='\u:\w\$ ' \ +    PATH=/bin:/usr/bin:/sbin:/usr/sbin:/static/bin \ +    /static/bin/bash --login diff --git a/chapter06/glibc-exp.xml b/chapter06/glibc-exp.xml index db8657eff..db07d76ff 100644 --- a/chapter06/glibc-exp.xml +++ b/chapter06/glibc-exp.xml @@ -1,16 +1,6 @@ Command explanations -mknod -m 0666 /dev/null c 1 3: Glibc needs a -null device to compile properly. All other devices will be created in the -next section. - -touch /etc/ld.so.conf One of the final steps -of the Glibc installation is running ldconfig to update the dynamic loader -cache. If this file doesn't exist, the installation will abort with an error -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). - sed 's%\$(PERL)%/usr/bin/perl%' malloc/Makefile.backup > malloc/Makefile: This sed command searches through malloc/Makefile.backup and diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml index ae8781b8b..7593b56ca 100644 --- a/chapter06/glibc-inst.xml +++ b/chapter06/glibc-inst.xml @@ -22,9 +22,7 @@ is putting your system at very high risk. Install Glibc by running the following commands: -mknod -m 0666 /dev/null c 1 3 && -touch /etc/ld.so.conf && -cp malloc/Makefile malloc/Makefile.backup && +cp malloc/Makefile malloc/Makefile.backup && sed 's%\$(PERL)%/usr/bin/perl%' \     malloc/Makefile.backup > malloc/Makefile && cp login/Makefile login/Makefile.backup && @@ -37,7 +35,7 @@ echo "cross-compiling = no" > configparms && make && make install && make localedata/install-locales && -exec /bin/bash --login +exec /static/bin/bash --login An alternative to running make localedata/install-locales is to only install those locales diff --git a/chapter06/grep-inst.xml b/chapter06/grep-inst.xml index 69a616a33..17885b7f5 100644 --- a/chapter06/grep-inst.xml +++ b/chapter06/grep-inst.xml @@ -5,7 +5,6 @@ ./configure --prefix=/usr --bindir=/bin && make && -rm /bin/egrep /bin/fgrep && make install diff --git a/chapter06/introduction.xml b/chapter06/introduction.xml index fc8f68e3b..2a59f604c 100644 --- a/chapter06/introduction.xml +++ b/chapter06/introduction.xml @@ -18,5 +18,13 @@ faster, but may also cause some compilation problems. If you run into problems after having used optimization, always try it without optimizing to see if the problem persists. +Please refrain from installing more than one package at a time, even +if it may safe you time (especially with dual CPU machines). If you install +the wrong package at the wrong time, it may hard-wire program paths to +$LFS/static which will cause the +programs to stop working once the static directory is removed. The order +packages are installed in this chapter have to be followed exactly to be +sure nothing is hard-wiring the static paths. + diff --git a/chapter06/makedev-inst.xml b/chapter06/makedev-inst.xml index d5b9c3b2d..6797a057d 100644 --- a/chapter06/makedev-inst.xml +++ b/chapter06/makedev-inst.xml @@ -6,7 +6,8 @@ won't create a directory for you to cd into. Create the device files by running the following commands: -cp MAKEDEV-&makedev-version; /dev/MAKEDEV && +rm /dev/null && +cp MAKEDEV-&makedev-version; /dev/MAKEDEV && cd /dev && chmod 754 MAKEDEV diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml index ac945c018..f67465b91 100644 --- a/chapter06/man-inst.xml +++ b/chapter06/man-inst.xml @@ -3,7 +3,8 @@ Run the following commands to install man: -./configure -default && +PATH=$PATH:/usr/bin:/bin \ +    ./configure -default && make && make install && mv /usr/share/misc/man.conf /etc diff --git a/chapter06/man.xml b/chapter06/man.xml index c8a1e20ee..7e0edc3fd 100644 --- a/chapter06/man.xml +++ b/chapter06/man.xml @@ -6,6 +6,7 @@ Estimated required disk space: &man-compsize; &c6-man-inst; +&c6-man-exp; &aa-man-desc; &aa-man-dep; diff --git a/chapter06/psmisc-inst.xml b/chapter06/psmisc-inst.xml index 43dc13e58..32193ace9 100644 --- a/chapter06/psmisc-inst.xml +++ b/chapter06/psmisc-inst.xml @@ -3,8 +3,7 @@ Install Psmisc by running the following commands: -./configure --prefix=/usr \ -    --exec-prefix=/ && +./configure --prefix=/usr --exec-prefix=/ && make && make install diff --git a/entities/bash.ent b/entities/bash.ent index 0f14e439d..e46dbc665 100644 --- a/entities/bash.ent +++ b/entities/bash.ent @@ -4,7 +4,6 @@ - diff --git a/entities/chapter05.ent b/entities/chapter05.ent index 6af94dd1e..3e1177151 100644 --- a/entities/chapter05.ent +++ b/entities/chapter05.ent @@ -1,7 +1,5 @@ + - - - diff --git a/entities/chapter06.ent b/entities/chapter06.ent index 1a9c479d5..add3caac8 100644 --- a/entities/chapter06.ent +++ b/entities/chapter06.ent @@ -4,7 +4,11 @@ + + + + diff --git a/entities/findutils.ent b/entities/findutils.ent index 7c512b202..4d4d78478 100644 --- a/entities/findutils.ent +++ b/entities/findutils.ent @@ -1,6 +1,10 @@ + + + + diff --git a/entities/kernel.ent b/entities/kernel.ent index 1a06e14fc..92ab513c0 100644 --- a/entities/kernel.ent +++ b/entities/kernel.ent @@ -1,9 +1,9 @@ - - - - + + + + diff --git a/entities/man.ent b/entities/man.ent index b26af9d67..0e215f040 100644 --- a/entities/man.ent +++ b/entities/man.ent @@ -2,6 +2,7 @@ + diff --git a/entities/utillinux.ent b/entities/utillinux.ent index 2f976c1b1..5259ac969 100644 --- a/entities/utillinux.ent +++ b/entities/utillinux.ent @@ -1,5 +1,8 @@ + + + -- cgit v1.2.3-54-g00ecf