Changeset bc2e3fa for BOOK/boot


Ignore:
Timestamp:
Dec 7, 2006, 11:23:24 PM (17 years ago)
Author:
Jim Gifford <clfs@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
1e184e11
Parents:
8473983
Message:

Reverting of Sysroot Changes

Location:
BOOK/boot
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • BOOK/boot/common/createfiles.xml

    r8473983 rbc2e3fa  
    1616  the next chapter after the software has been installed.</para>
    1717
    18 <screen><userinput>cd ${CLFS}/bin
    19 ln -sf ../tools/bin/{bash,cat,grep,pwd,rm,stty} .
    20 ln -sf bash sh
    21 cd ${CLFS}/usr/lib
    22 ln -sv ../../tools/lib/libgcc_s.so{,.1} .
    23 ln -sv ../../tools/lib/libstd*so* .</userinput></screen>
     18<screen><userinput>ln -sv /tools/bin/{bash,cat,grep,pwd,rm,stty} ${CLFS}/bin
     19ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
     20ln -sv /tools/lib/libstd* ${CLFS}/usr/lib
     21ln -sv bash ${CLFS}/bin/sh</userinput></screen>
    2422
    2523</sect1>

  • BOOK/boot/common/e2fsprogs.xml

    r8473983 rbc2e3fa  
    8282    xpointer="xpointer(//*[@os='k'])"/>
    8383
    84 <screen os="l"><userinput>make DESTDIR=${CLFS} install-libs</userinput></screen>
     84    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     85    href="../../final-system/common/e2fsprogs.xml"
     86    xpointer="xpointer(//*[@os='l'])"/>
    8587
    8688    <para os="ad">Create needed symlinks for a bootable system:</para>

  • BOOK/boot/common/module-init-tools.xml

    r8473983 rbc2e3fa  
    4242    xpointer="xpointer(//*[@os='j'])"/>
    4343
    44 <screen os="k"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     44<screen os="k"><userinput>make DESTDIR="${CLFS}" install</userinput></screen>
    4545
    4646  </sect2>

  • BOOK/boot/common/sysvinit.xml

    r8473983 rbc2e3fa  
    3030    -e "s@/dev/initctl@${CLFS}&amp;@g" \
    3131    -e 's@\(mknod \)-m \([0-9]* \)\(.* \)p@\1\3p; chmod \2\3@g' \
    32     -e "s@/usr/lib@${CLFS}/tools/lib@" \
     32    -e "s@/usr/lib@/tools/lib@" \
    3333    src/Makefile.orig > src/Makefile</userinput></screen>
    3434
    … …  
    4444    xpointer="xpointer(//*[@os='e'])"/>
    4545
    46 <screen os="ad"><userinput>make -C src install INSTALL=install ROOT=${CLFS}</userinput></screen>
     46<screen os="ad"><userinput>make -C src install INSTALL="install" ROOT="${CLFS}"</userinput></screen>
    4747
    4848  </sect2>

  • BOOK/boot/mips64/createfiles.xml

    r8473983 rbc2e3fa  
    1515  xpointer="xpointer(//*[@os='a'])"/>
    1616
    17 <screen><userinput>cd ${CLFS}/bin
    18 ln -sf ../tools/bin/{bash,cat,grep,pwd,rm,stty} .
    19 ln -sf bash sh
    20 cd ${CLFS}/usr/lib
    21 ln -sv ../../tools/lib/libgcc_s.so{,.1} .
    22 ln -sv ../../tools/lib/libstd*so* .
    23 cd ${CLFS}/usr/lib32
    24 ln -sv ../../tools/lib32/libgcc_s.so{,.1} .
    25 ln -sv ../../tools/lib32/libstd*so* .
    26 cd ${CLFS}/usr/lib64
    27 ln -sv ../../tools/lib64/libgcc_s.so{,.1} .
    28 ln -sv ../../tools/lib64/libstd*so* .</userinput></screen>
     17<screen><userinput>ln -sv /tools/bin/{bash,cat,pwd,stty} ${CLFS}/bin
     18ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
     19ln -sv /tools/lib32/libgcc_s.so{,.1} ${CLFS}/usr/lib32
     20ln -sv /tools/lib64/libgcc_s.so{,.1} ${CLFS}/usr/lib64
     21ln -sv /tools/lib/libstd* ${CLFS}/usr/lib
     22ln -sv /tools/lib32/libstd* ${CLFS}/usr/lib32
     23ln -sv /tools/lib64/libstd* ${CLFS}/usr/lib64
     24ln -sv bash ${CLFS}/bin/sh</userinput></screen>
    2925
    3026</sect1>

  • BOOK/boot/multilib/createfiles.xml

    r8473983 rbc2e3fa  
    1515  xpointer="xpointer(//*[@os='a'])"/>
    1616
    17 <screen><userinput>cd ${CLFS}/bin
    18 ln -sf ../tools/bin/{bash,cat,grep,pwd,rm,stty} .
    19 ln -sf bash sh
    20 cd ${CLFS}/usr/lib
    21 ln -sv ../../tools/lib/libgcc_s.so{,.1} .
    22 ln -sv ../../tools/lib/libstd*so* .
    23 ln -sv ../../tools/lib64/libgcc_s.so{,.1} .
    24 ln -sv ../../tools/lib64/libstd*so* .</userinput></screen>
     17<screen><userinput>ln -sv /tools/bin/{bash,cat,pwd,stty} ${CLFS}/bin
     18ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
     19ln -sv /tools/lib64/libgcc_s.so{,.1} ${CLFS}/usr/lib64
     20ln -sv /tools/lib/libstd* ${CLFS}/usr/lib
     21ln -sv /tools/lib64/libstd* ${CLFS}/usr/lib64
     22ln -sv bash ${CLFS}/bin/sh</userinput></screen>
    2523
    2624</sect1>

  • BOOK/boot/multilib/e2fsprogs.xml

    r8473983 rbc2e3fa  
    4343
    4444<screen os="aa"><userinput>CC="${CC} ${BUILD64}" ../configure --prefix=/tools \
    45 --enable-elf-shlibs --disable-evms --with-cc="${CC} ${BUILD64} -fPIC" --with-linker=${LD} \
     45--enable-elf-shlibs --disable-evms --with-cc="${CC} ${BUILD64}" --with-linker=${LD} \
    4646--host=${CLFS_TARGET}</userinput></screen>
    4747

  • BOOK/boot/ppc/yaboot-build.xml

    r8473983 rbc2e3fa  
    6767    xpointer="xpointer(//*[@os='i'])"/>
    6868
    69 <screen><userinput>make CROSS=${CLFS_TARGET}- ROOT=${CLFS} PREFIX=/tools install</userinput></screen>
     69<screen><userinput>make CROSS=${CLFS_TARGET}- ROOT=/tools PREFIX="" install</userinput></screen>
    7070
    7171  </sect2>

  • BOOK/boot/ppc64/yaboot-build.xml

    r8473983 rbc2e3fa  
    7575    xpointer="xpointer(//*[@os='j0'])"/>
    7676
    77 <screen><userinput>make CROSS=${CLFS_TARGET}- ROOT=${CLFS} PREFIX=/tools install 2&gt;&amp;1 | tee instlog</userinput></screen>
     77<screen><userinput>make CROSS=${CLFS_TARGET}- ROOT=/tools PREFIX= install 2&gt;&amp;1 | tee instlog</userinput></screen>
    7878
    7979    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • BOOK/boot/sparc/elftoaout.xml

    r8473983 rbc2e3fa  
    3737    <para>Install the package:</para>
    3838
    39 <screen><userinput>install -v -m 0755 -s elftoaout ${CLFS}/cross-tools/bin</userinput></screen>
     39<screen><userinput>install -v -m 0755 -s elftoaout /cross-tools/bin</userinput></screen>
    4040
    4141  </sect2>

  • BOOK/boot/x86/grub.xml

    r8473983 rbc2e3fa  
    3535  xpointer="xpointer(//*[@os='f'])"/>
    3636
    37 <screen os="g"><userinput>make DESTDIR=${CLFS} install
    38 mkdir -pv ${CLFS} /boot/grub
    39 cp -v ${CLFS}/usr/lib/grub/*/stage{1,2} ${CLFS}/boot/grub</userinput></screen>
     37  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     38  href="../../bootable/x86/grub.xml"
     39  xpointer="xpointer(//*[@os='g'])"/>
    4040
    4141  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • BOOK/boot/x86_64-64/bin86.xml

    r8473983 rbc2e3fa  
    4848      output is not for a native system.</para>
    4949
    50 <screen os="f"><userinput>install -v -m 755 -s as/as86 ${CLFS}/cross-tools/bin/${CLFS_TARGET}-as86
    51 install -v -m 755 -s ld/ld86 ${CLFS}/cross-tools/bin/${CLFS_TARGET}-ld86</userinput></screen>
     50<screen os="f"><userinput>install -v -m 755 -s as/as86 /cross-tools/bin/${CLFS_TARGET}-as86
     51install -v -m 755 -s ld/ld86 /cross-tools/bin/${CLFS_TARGET}-ld86</userinput></screen>
    5252
    5353  </sect2>

  • BOOK/boot/x86_64-64/lilo-build.xml

    r8473983 rbc2e3fa  
    3434      when it runs:</para>
    3535
    36 <screen os="d"><userinput>make -k lilo.static</userinput></screen>
     36<screen os="d"><userinput>make lilo-static</userinput></screen>
    3737
    3838    <para os="e">Install only the parts we need:</para>
    3939
    40 <screen os="f"><userinput>install -v -m755 lilo-static ${CLFS}/tools/bin
    41 install -v -m755 keytab-lilo.pl ${CLFS}/tools/bin</userinput></screen>
     40<screen os="f"><userinput>install -v -m755 lilo-static /tools/bin
     41install -v -m755 keytab-lilo.pl /tools/bin</userinput></screen>
    4242
    4343  </sect2>
Note: See TracChangeset for help on using the changeset viewer.