Changeset 991595cf for BOOK/boot


Ignore:
Timestamp:
Dec 13, 2015, 4:21:52 PM (9 years ago)
Author:
Chris Staub <chris@…>
Branches:
sysvinit
Children:
fc86858d
Parents:
dbc5b02 (diff), c7477f8e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'sysvinit' of clfs.org:cross-lfs into sysvinit

Location:
BOOK/boot
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • BOOK/boot/common/bc.xml

    rdbc5b02 r991595cf  
    2828    <para>Prepare Bc for compilation:</para>
    2929
    30 <screen><userinput>CC=gcc ./configure --prefix=/cross-tools</userinput></screen>
     30<screen><userinput>CC=gcc \
     31./configure \
     32    --prefix=/cross-tools</userinput></screen>
    3133
    3234    <variablelist>

  • BOOK/boot/common/e2fsprogs.xml

    rdbc5b02 r991595cf  
    3535    xpointer="xpointer(//*[@os='c'])"/>
    3636
    37 <screen os="aa"><userinput>../configure --prefix=/tools \
    38     --enable-elf-shlibs --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    39     --disable-libblkid --disable-libuuid --disable-fsck \
     37<screen os="aa"><userinput>../configure \
     38    --prefix=/tools \
     39    --enable-elf-shlibs \
     40    --build=${CLFS_HOST} \
     41    --host=${CLFS_TARGET} \
     42    --disable-libblkid \
     43    --disable-libuuid \
     44    --disable-fsck \
    4045    --disable-uuidd</userinput></screen>
    4146

  • BOOK/boot/common/eudev.xml

    rdbc5b02 r991595cf  
    2929   <para os="a">Prepare Eudev for compilation:</para>
    3030
    31 <screen os="b"><userinput>./configure --prefix=/tools --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    32     --disable-introspection --disable-gtk-doc-html \
    33     --disable-gudev --disable-keymap --with-firmware-path=/tools/lib/firmware \
     31<screen os="b"><userinput>./configure \
     32    --prefix=/tools \
     33    --build=${CLFS_HOST} \
     34    --host=${CLFS_TARGET} \
     35    --disable-introspection \
     36    --disable-gtk-doc-html \
     37    --disable-gudev \
     38    --disable-keymap \
     39    --with-firmware-path=/tools/lib/firmware \
    3440    --enable-libkmod</userinput></screen>
    3541

  • BOOK/boot/common/kmod.xml

    rdbc5b02 r991595cf  
    3535    xpointer="xpointer(//*[@os='a'])"/>
    3636
    37 <screen os="b"><userinput>./configure --prefix=/tools \
    38     --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-xz --with-zlib</userinput></screen>
     37<screen os="b"><userinput>./configure \
     38    --prefix=/tools \
     39    --build=${CLFS_HOST} \
     40    --host=${CLFS_TARGET} \
     41    --with-xz \
     42    --with-zlib</userinput></screen>
    3943
    4044    <variablelist os="c">

  • BOOK/boot/common/shadow.xml

    rdbc5b02 r991595cf  
    4444    <para os="e">Prepare Shadow for compilation:</para>
    4545
    46 <screen os="f"><userinput>./configure --prefix=/tools \
    47     --build=${CLFS_HOST} --host=${CLFS_TARGET} --cache-file=config.cache \
     46<screen os="f"><userinput>./configure \
     47    --prefix=/tools \
     48    --build=${CLFS_HOST} \
     49    --host=${CLFS_TARGET} \
     50    --cache-file=config.cache \
    4851    --enable-subordinate-ids=no</userinput></screen>
    4952

  • BOOK/boot/multilib/e2fsprogs.xml

    rdbc5b02 r991595cf  
    4141    xpointer="xpointer(//*[@os='c'])"/>
    4242
    43 <screen os="aa"><userinput>../configure --prefix=/tools --enable-elf-shlibs \
    44     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    45     --disable-libblkid --disable-libuuid --disable-fsck \
     43<screen os="aa"><userinput>../configure \
     44    --prefix=/tools \
     45    --enable-elf-shlibs \
     46    --build=${CLFS_HOST} \
     47    --host=${CLFS_TARGET} \
     48    --disable-libblkid \
     49    --disable-libuuid \
     50    --disable-fsck \
    4651    --disable-uuidd</userinput></screen>
    4752

  • BOOK/boot/multilib/eudev.xml

    rdbc5b02 r991595cf  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen os="b"><userinput>./configure --prefix=/tools --build=${CLFS_HOST} \
    29     --host=${CLFS_TARGET} --libdir=/tools/lib64 --with-rootlibdir=/tools/lib64 \
    30     --disable-introspection --disable-gtk-doc-html --disable-gudev \
    31     --disable-keymap --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
     28<screen os="b"><userinput>./configure \
     29    --prefix=/tools \
     30    --build=${CLFS_HOST} \
     31    --host=${CLFS_TARGET} \
     32    --libdir=/tools/lib64 \
     33    --with-rootlibdir=/tools/lib64 \
     34    --disable-introspection \
     35    --disable-gtk-doc-html \
     36    --disable-gudev \
     37    --disable-keymap \
     38    --with-firmware-path=/lib/firmware \
     39    --enable-libkmod</userinput></screen>
    3240
    3341    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/multilib/grub-build.xml

    rdbc5b02 r991595cf  
    3939    xpointer="xpointer(//*[@os='a'])"/>
    4040
    41 <screen os="ab"><userinput>./configure --prefix=/tools \
    42     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    43     --libdir=/tools/lib64 --disable-werror \
    44     --enable-grub-mkfont=no --with-bootdir=tools/boot</userinput></screen>
     41<screen os="ab"><userinput>./configure \
     42    --prefix=/tools \
     43    --build=${CLFS_HOST} \
     44    --host=${CLFS_TARGET} \
     45    --libdir=/tools/lib64 \
     46    --disable-werror \
     47    --enable-grub-mkfont=no \
     48    --with-bootdir=tools/boot</userinput></screen>
    4549
    4650    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/multilib/kmod.xml

    rdbc5b02 r991595cf  
    3535    xpointer="xpointer(//*[@os='a'])"/>
    3636
    37 <screen os="b"><userinput>./configure --prefix=/tools \
    38     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    39     --libdir=/tools/lib64 --with-xz --with-zlib</userinput></screen>
     37<screen os="b"><userinput>./configure \
     38    --prefix=/tools \
     39    --build=${CLFS_HOST} \
     40    --host=${CLFS_TARGET} \
     41    --libdir=/tools/lib64 \
     42    --with-xz \
     43    --with-zlib</userinput></screen>
    4044
    4145    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/ppc/hfsutils.xml

    rdbc5b02 r991595cf  
    4040    xpointer="xpointer(//*[@os='a'])"/>
    4141
    42 <screen><userinput>CC="${CC}" ./configure --prefix=/tools</userinput></screen>
     42<screen><userinput>CC="${CC}" \
     43./configure \
     44    --prefix=/tools</userinput></screen>
    4345
    4446    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/ppc64/e2fsprogs-libs.xml

    rdbc5b02 r991595cf  
    4747
    4848<screen os="aa"><userinput>CC="${CC} ${BUILD32}" \
    49   ../configure --prefix=/tools --enable-elf-shlibs \
    50     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    51     --disable-libblkid --disable-libuuid --disable-fsck \
    52     --disable-uuidd --cache-file=config.cache</userinput></screen>
     49../configure \
     50    --prefix=/tools \
     51    --enable-elf-shlibs \
     52    --build=${CLFS_HOST} \
     53    --host=${CLFS_TARGET} \
     54    --disable-libblkid \
     55    --disable-libuuid \
     56    --disable-fsck \
     57    --disable-uuidd \
     58    --cache-file=config.cache</userinput></screen>
    5359
    5460    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/ppc64/e2fsprogs.xml

    rdbc5b02 r991595cf  
    5454    xpointer="xpointer(//*[@os='c'])"/>
    5555
    56 <screen os="aa"><userinput>../configure --prefix=/tools --enable-elf-shlibs \
    57     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    58     --disable-libblkid --disable-libuuid --disable-fsck \
    59     --disable-uuidd --cache-file=config.cache</userinput></screen>
     56<screen os="aa"><userinput>../configure \
     57    --prefix=/tools \
     58    --enable-elf-shlibs \
     59    --build=${CLFS_HOST} \
     60    --host=${CLFS_TARGET} \
     61    --disable-libblkid \
     62    --disable-libuuid \
     63    --disable-fsck \
     64    --disable-uuidd \
     65    --cache-file=config.cache</userinput></screen>
    6066
    6167    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/boot/x86/grub-build.xml

    rdbc5b02 r991595cf  
    3838    xpointer="xpointer(//*[@os='a'])"/>
    3939
    40 <screen os="ab"><userinput>./configure --prefix=/tools \
    41     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    42     --disable-werror --enable-grub-mkfont=no --with-bootdir=tools/boot</userinput></screen>
     40<screen os="ab"><userinput>./configure \
     41    --prefix=/tools \
     42    --build=${CLFS_HOST} \
     43    --host=${CLFS_TARGET} \
     44    --disable-werror \
     45    --enable-grub-mkfont=no \
     46    --with-bootdir=tools/boot</userinput></screen>
    4347
    4448<para os="b">The meaning of the new configure option:</para>
Note: See TracChangeset for help on using the changeset viewer.