diff options
Diffstat (limited to 'chapter06')
| -rw-r--r-- | chapter06/bash.xml | 4 | ||||
| -rw-r--r-- | chapter06/coreutils.xml | 6 | ||||
| -rw-r--r-- | chapter06/file.xml | 6 | ||||
| -rw-r--r-- | chapter06/findutils.xml | 5 | ||||
| -rw-r--r-- | chapter06/grep.xml | 3 | ||||
| -rw-r--r-- | chapter06/gzip.xml | 4 | ||||
| -rw-r--r-- | chapter06/ncurses.xml | 12 | ||||
| -rw-r--r-- | chapter06/sed.xml | 3 | ||||
| -rw-r--r-- | chapter06/tar.xml | 3 | ||||
| -rw-r--r-- | chapter06/xz.xml | 6 |
10 files changed, 4 insertions, 48 deletions
diff --git a/chapter06/bash.xml b/chapter06/bash.xml index e07ee308a..d462d2631 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -74,10 +74,6 @@ <screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen> - <para>Move the executable to where it is expected:</para> - -<screen><userinput remap="install">mv $LFS/usr/bin/bash $LFS/bin/bash</userinput></screen> - <para>Make a link for the programs that use <command>sh</command> for a shell:</para> diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index fe036755e..af75e60cf 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -83,11 +83,7 @@ not necessary in this temporary environment, we must do so because some programs harcode executable locations:</para> -<screen><userinput remap="install">mv -v $LFS/usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} $LFS/bin -mv -v $LFS/usr/bin/{false,ln,ls,mkdir,mknod,mv,pwd,rm} $LFS/bin -mv -v $LFS/usr/bin/{rmdir,stty,sync,true,uname} $LFS/bin -mv -v $LFS/usr/bin/{head,nice,sleep,touch} $LFS/bin -mv -v $LFS/usr/bin/chroot $LFS/usr/sbin +<screen><userinput remap="install">mv -v $LFS/usr/bin/chroot $LFS/usr/sbin mkdir -pv $LFS/usr/share/man/man8 mv -v $LFS/usr/share/man/man1/chroot.1 $LFS/usr/share/man/man8/chroot.8 sed -i 's/"1"/"8"/' $LFS/usr/share/man/man8/chroot.8</userinput></screen> diff --git a/chapter06/file.xml b/chapter06/file.xml index b44a639be..dc6024177 100644 --- a/chapter06/file.xml +++ b/chapter06/file.xml @@ -90,12 +90,6 @@ popd</userinput></screen> <screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen> - <para>Move a shared library into its final location in the LFS system, - and recreate the symlink for it:</para> - -<screen><userinput remap="install">mv -v $LFS/usr/lib/libmagic.so.* $LFS/lib -ln -sfv ../../lib/$(readlink /usr/lib/libmagic.so) $LFS/usr/lib/libmagic.so</userinput></screen> - </sect2> <sect2 role="content"> diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml index ce3bbe00f..ff08a51cd 100644 --- a/chapter06/findutils.xml +++ b/chapter06/findutils.xml @@ -57,11 +57,6 @@ <screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen> - <para>Move the executable to its final expected location:</para> - -<screen><userinput remap="install">mv -v $LFS/usr/bin/find $LFS/bin -sed -i 's|find:=${BINDIR}|find:=/bin|' $LFS/usr/bin/updatedb</userinput></screen> - </sect2> <sect2 role="content"> diff --git a/chapter06/grep.xml b/chapter06/grep.xml index 494b8616d..1bccd7486 100644 --- a/chapter06/grep.xml +++ b/chapter06/grep.xml @@ -46,8 +46,7 @@ <para>Prepare Grep for compilation:</para> <screen><userinput remap="configure">./configure --prefix=/usr \ - --host=$LFS_TGT \ - --bindir=/bin</userinput></screen> + --host=$LFS_TGT</userinput></screen> <para>Compile the package:</para> diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml index 7ce2a6b1c..d75f26928 100644 --- a/chapter06/gzip.xml +++ b/chapter06/gzip.xml @@ -55,10 +55,6 @@ <screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen> - <para>Move the executable to its final expected location:</para> - -<screen><userinput remap="install">mv -v $LFS/usr/bin/gzip $LFS/bin</userinput></screen> - </sect2> <sect2 role="content"> diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml index 36513603c..79b38e2b4 100644 --- a/chapter06/ncurses.xml +++ b/chapter06/ncurses.xml @@ -148,18 +148,6 @@ echo "INPUT(-lncursesw)" > $LFS/usr/lib/libncurses.so</userinput></screen> </variablelist> - <para>Move the shared libraries to the - <filename class="directory">/lib</filename> directory, where they are - expected to reside:</para> - -<screen><userinput remap="install">mv -v $LFS/usr/lib/libncursesw.so.6* $LFS/lib</userinput></screen> - - <para>Because the libraries have been moved, one symlink points to - a non-existent file. Recreate it:</para> - -<screen><userinput remap="install">ln -sfv ../../lib/$(readlink $LFS/usr/lib/libncursesw.so) $LFS/usr/lib/libncursesw.so</userinput></screen> - - </sect2> <sect2 role="content"> diff --git a/chapter06/sed.xml b/chapter06/sed.xml index d079f836d..b3e39c215 100644 --- a/chapter06/sed.xml +++ b/chapter06/sed.xml @@ -46,8 +46,7 @@ <para>Prepare Sed for compilation:</para> <screen><userinput remap="configure">./configure --prefix=/usr \ - --host=$LFS_TGT \ - --bindir=/bin</userinput></screen> + --host=$LFS_TGT</userinput></screen> <para>Compile the package:</para> diff --git a/chapter06/tar.xml b/chapter06/tar.xml index 8a82cff5c..4e0ae5c44 100644 --- a/chapter06/tar.xml +++ b/chapter06/tar.xml @@ -47,8 +47,7 @@ <screen><userinput remap="configure">./configure --prefix=/usr \ --host=$LFS_TGT \ - --build=$(build-aux/config.guess) \ - --bindir=/bin</userinput></screen> + --build=$(build-aux/config.guess)</userinput></screen> <para>Compile the package:</para> diff --git a/chapter06/xz.xml b/chapter06/xz.xml index f8d397d1b..e277f9517 100644 --- a/chapter06/xz.xml +++ b/chapter06/xz.xml @@ -59,12 +59,6 @@ <screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen> - <para>Make sure that all essential files are in the correct directory:</para> - -<screen><userinput remap="install">mv -v $LFS/usr/bin/{lzma,unlzma,lzcat,xz,unxz,xzcat} $LFS/bin -mv -v $LFS/usr/lib/liblzma.so.* $LFS/lib -ln -svf ../../lib/$(readlink $LFS/usr/lib/liblzma.so) $LFS/usr/lib/liblzma.so</userinput></screen> - </sect2> <sect2 role="content"> |