Changeset caca15f

Timestamp:

06/01/2020 09:45:53 AM (3 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, arm, cross-chap5, ml-11.0, multilib, s6-init, trunk, xry111/arm64, xry111/clfs-ng, xry111/git-transition, xry111/glibc-2.34, xry111/glibc-2.37, xry111/kcfg-revise, xry111/lfs-next, xry111/pip3, xry111/queue-11.3, xry111/rust-wip-20221008, xry111/tester-nohack, xry111/usr-move

Children:

4f3e4e3

Parents:

264dfd9

Message:

Fixes due to the new layout

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/cross-chap5@11885 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:

• chapter05/chapter05.xml (modified) (1 diff)
• chapter06/bzip2.xml (modified) (1 diff)

chapter05/chapter05.xml

@@ -45 +45 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libstdc++-pass2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl.xml"/>

chapter06/bzip2.xml

@@ -91 +91 @@
 <screen><userinput remap="install">cp -v bzip2-shared /bin/bzip2
 cp -av libbz2.so* /lib
-rm -v /usr/bin/{bunzip2,bzcat,bzip2}</userinput></screen>
+ln -sv ../../lib/libbz2.so.1.0 $LFS/usr/lib/libbz2.so
+rm -v /usr/bin/{bunzip2,bzcat,bzip2}
+ln -sv bzip2 /bin/bunzip2
+ln -sv bzip2 /bin/bzcat</userinput></screen>
 
   </sect2>