Changeset ec008670 for BOOK/boot


Ignore:
Timestamp:
Jun 4, 2011, 8:30:53 AM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
229ed25
Parents:
cfb2026a (diff), 622df7bc (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 'master' into systemd

Location:
BOOK/boot
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • BOOK/boot/64/e2fsprogs.xml

    rcfb2026a rec008670  
    3535    xpointer="xpointer(//*[@os='c'])"/>
    3636
    37 <screen os="aa"><userinput>LDFLAGS="-Wl,-rpath-link,/tools/lib" \
    38   CC="${CC} ${BUILD64}" PKG_CONFIG=true \
    39     ../configure --prefix=/tools --enable-elf-shlibs \
     37<screen os="aa"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
     38  ../configure --prefix=/tools --enable-elf-shlibs \
    4039    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    4140    --disable-libblkid --disable-libuuid --disable-fsck \
    … …  
    7877    xpointer="xpointer(//*[@os='ae'])"/>
    7978
     79
    8080  </sect2>
    8181

  • BOOK/boot/64/util-linux.xml

    rcfb2026a rec008670  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --build=${CLFS_HOST} \
    30     --host=${CLFS_TARGET} --enable-login-utils \
    31     --disable-makeinstall-chown</userinput></screen>
     29<screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
     30  ./configure --prefix=/tools --exec-prefix=/tools \
     31    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     32    --enable-login-utils --disable-makeinstall-chown</userinput></screen>
    3233
    3334    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4748    xpointer="xpointer(//*[@os='h'])"/>
    4849
    49     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    50     href="../common/util-linux.xml"
    51     xpointer="xpointer(//*[@os='i'])"/>
    52 
    53     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    54     href="../common/util-linux.xml"
    55     xpointer="xpointer(//*[@os='j'])"/>
    56 
    5750  </sect2>
    5851

  • BOOK/boot/common/e2fsprogs.xml

    rcfb2026a rec008670  
    3535    xpointer="xpointer(//*[@os='c'])"/>
    3636
    37 <screen os="aa"><userinput>LDFLAGS="-Wl,-rpath-link,/tools/lib" \
    38   PKG_CONFIG=true ../configure --prefix=/tools \
     37<screen os="aa"><userinput>PKG_CONFIG=true \
     38  ../configure --prefix=/tools \
    3939    --enable-elf-shlibs --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    4040    --disable-libblkid --disable-libuuid --disable-fsck \
    … …  
    7777<screen os="ae"><userinput>ln -sv /tools/sbin/{fsck.ext2,fsck.ext3,fsck.ext4,e2fsck} ${CLFS}/sbin</userinput></screen>
    7878
     79
    7980  </sect2>
    8081

  • BOOK/boot/common/util-linux.xml

    rcfb2026a rec008670  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>./configure --build=${CLFS_HOST} \
    30     --host=${CLFS_TARGET} --enable-login-utils \
    31     --disable-makeinstall-chown</userinput></screen>
     29<screen os="b"><userinput>PKG_CONFIG=true \
     30  ./configure --prefix=/tools --exec-prefix=/tools \
     31    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     32    --enable-login-utils --disable-makeinstall-chown</userinput></screen>
    3233
    3334    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4142    xpointer="xpointer(//*[@os='g'])"/>
    4243
    43 <screen os="h"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
    44 
    45   <para os="i">Copy Libraries and includes to /tools:</para>
    46 
    47 <screen os="j"><userinput>rm -fv ${CLFS}/usr/lib/lib{blkid,uuid}.la
    48 cp -v ${CLFS}/usr/lib/lib{blkid,uuid}* /tools/lib
    49 cp -v ${CLFS}/lib/lib{blkid,uuid}* /tools/lib
    50 ln -sfv libblkid.so.&util-linux-blkid-id; /tools/lib/libblkid.so
    51 ln -sfv libuuid.so.&util-linux-uuid-id; /tools/lib/libuuid.so
    52 install -dv /tools/include/{blkid,uuid}
    53 cp -av ${CLFS}/usr/include/blkid/* /tools/include/blkid/
    54 cp -av ${CLFS}/usr/include/uuid/* /tools/include/uuid/</userinput></screen>
     44<screen os="h"><userinput>make install</userinput></screen>
    5545
    5646  </sect2>

  • BOOK/boot/multilib/e2fsprogs.xml

    rcfb2026a rec008670  
    4141    xpointer="xpointer(//*[@os='c'])"/>
    4242
    43 <screen os="aa"><userinput>LDFLAGS="-Wl,-rpath-link,/tools/lib64" \
    44   CC="${CC} ${BUILD64}" PKG_CONFIG=true \
    45     ../configure --prefix=/tools --enable-elf-shlibs \
     43<screen os="aa"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
     44  ../configure --prefix=/tools --enable-elf-shlibs \
    4645    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    4746    --disable-libblkid --disable-libuuid --disable-fsck \

  • BOOK/boot/multilib/util-linux.xml

    rcfb2026a rec008670  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --build=${CLFS_HOST} \
    30     --host=${CLFS_TARGET} --libdir=/lib64 --enable-login-utils \
     29<screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
     30  ./configure \
     31    --prefix=/tools --exec-prefix=/tools \
     32    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     33    --libdir=/tools/lib64 --enable-login-utils \
    3134    --disable-makeinstall-chown</userinput></screen>
    3235
    … …  
    4750    xpointer="xpointer(//*[@os='h'])"/>
    4851
    49     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    50     href="../common/util-linux.xml"
    51     xpointer="xpointer(//*[@os='i'])"/>
    52 
    53 <screen os="j"><userinput>rm -fv ${CLFS}/usr/lib64/lib{blkid,uuid}.la
    54 cp -v ${CLFS}/usr/lib64/lib{blkid,uuid}* /tools/lib64
    55 cp -v ${CLFS}/lib64/lib{blkid,uuid}* /tools/lib64
    56 ln -sfv libblkid.so.&util-linux-blkid-id; /tools/lib64/libblkid.so
    57 ln -sfv libuuid.so.&util-linux-uuid-id; /tools/lib64/libuuid.so
    58 install -dv /tools/include/{blkid,uuid}
    59 cp -av ${CLFS}/usr/include/blkid/* /tools/include/blkid/
    60 cp -av ${CLFS}/usr/include/uuid/* /tools/include/uuid/</userinput></screen>
    61 
    6252  </sect2>
    6353

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

    rcfb2026a rec008670  
    4646    xpointer="xpointer(//*[@os='c'])"/>
    4747
    48 <screen os="aa"><userinput>LDFLAGS="-Wl,-rpath-link,/tools/lib" \
    49   CC="${CC} ${BUILD32}" PKG_CONFIG=true \
    50     ../configure --prefix=/tools --enable-elf-shlibs \
     48<screen os="aa"><userinput>CC="${CC} ${BUILD32}" PKG_CONFIG=true \
     49  ../configure --prefix=/tools --enable-elf-shlibs \
    5150    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    5251    --disable-libblkid --disable-libuuid --disable-fsck \

  • BOOK/boot/ppc64/e2fsprogs.xml

    rcfb2026a rec008670  
    5454    xpointer="xpointer(//*[@os='c'])"/>
    5555
    56 <screen os="aa"><userinput>LDFLAGS="-Wl,-rpath-link,/tools/lib64" \
    57   CC="${CC} ${BUILD64}" PKG_CONFIG=true \
    58     ../configure --prefix=/tools --enable-elf-shlibs \
     56<screen os="aa"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
     57  ../configure --prefix=/tools --enable-elf-shlibs \
    5958    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    6059    --disable-libblkid --disable-libuuid --disable-fsck \
Note: See TracChangeset for help on using the changeset viewer.