Changes in / [ec008670:cfb2026a]


Ignore:
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • .gitignore

    rec008670 rcfb2026a  
    11/BOOK/render-output
    22/render/
    3 *~

  • BOOK/Makefile

    rec008670 rcfb2026a  
    1 TOP             := $(shell pwd)
     1TOP             := $(PWD)
    22RENDERDIR       := $(TOP)/../render
    33
    … …  
    5454        @echo "Rendering the top-level index..."
    5555        $(Q)xsltproc --nonet --output $(HTMLDIR)/index.html \
    56           $(TOP)/stylesheets/top-index.xsl \
    57           $(TOP)/index.xml
     56          $(PWD)/stylesheets/top-index.xsl \
     57          $(PWD)/index.xml
    5858        @$(MAKE) --no-print-directory tidy-f TIDY_FILE=$(HTMLDIR)/index.html
    5959
    … …  
    6767          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
    6868          -o $(VALIDATEDIR)/$(arch)-full.xml \
    69           $(TOP)/$(arch)-index.xml
     69          $(PWD)/$(arch)-index.xml
    7070
    7171ARCHS_P_XML := $(ARCHS:%=%-profiled-xml)
    … …  
    7878        $(Q)xsltproc --nonet --stringparam profile.condition html \
    7979          --output $(PROFILEDIR)/$(arch)-html.xml \
    80           $(TOP)/stylesheets/lfs-xsl/profile.xsl \
     80          $(PWD)/stylesheets/lfs-xsl/profile.xsl \
    8181          $(VALIDATEDIR)/$(arch)-full.xml
    8282
    … …  
    9393          -stringparam rootid "$(ROOT_ID)" \
    9494          -stringparam base.dir $(HTMLDIR)/$(arch)/ \
    95           $(TOP)/stylesheets/clfs-chunked.xsl \
     95          $(PWD)/stylesheets/clfs-chunked.xsl \
    9696          $(PROFILEDIR)/$(arch)-html.xml
    9797
    9898        @echo "Copying CSS code and images for $(arch)..."
    9999        $(Q)mkdir -p $(HTMLDIR)/$(arch)/stylesheets
    100         $(Q)cp $(TOP)/stylesheets/lfs-xsl/*.css $(HTMLDIR)/$(arch)/stylesheets
     100        $(Q)cp $(PWD)/stylesheets/lfs-xsl/*.css $(HTMLDIR)/$(arch)/stylesheets
    101101        $(Q)sed -i -e "s@../stylesheets@stylesheets@g" $(HTMLDIR)/$(arch)/*.html
    102102        $(Q)mkdir -p $(HTMLDIR)/$(arch)/images
    103         $(Q)cp $(TOP)/images/*.png $(HTMLDIR)/$(arch)/images
     103        $(Q)cp $(PWD)/images/*.png $(HTMLDIR)/$(arch)/images
    104104        $(Q)sed -i -e "s@../images@images@g" $(HTMLDIR)/$(arch)/*.html
    105105
    … …  
    117117        $(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \
    118118          --output $(NOCHUNKDIR)/CLFS-$(arch).html \
    119           $(TOP)/stylesheets/clfs-nochunks.xsl \
     119          $(PWD)/stylesheets/clfs-nochunks.xsl \
    120120          $(PROFILEDIR)/$(arch)-html.xml
    121121
    … …  
    133133        $(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \
    134134          --output $(FODIR)/$(arch).fo \
    135           $(TOP)/stylesheets/clfs-pdf.xsl \
     135          $(PWD)/stylesheets/clfs-pdf.xsl \
    136136          $(PROFILEDIR)/$(arch)-html.xml
    137137        $(Q)sed -i -e 's/span="inherit"/span="all"/' $(FODIR)/$(arch).fo
    … …  
    156156        $(Q)xmllint --xinclude --noout --nonet \
    157157          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
    158           $(TOP)/$(arch)-index.xml
     158          $(PWD)/$(arch)-index.xml
    159159
    160160ARCHS_TROUBLE := $(ARCHS:%=%-trouble)
    … …  
    168168          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
    169169          -o $(TROUBLEDIR)/dump-$(arch) \
    170           $(TOP)/$(arch)-index.xml
     170          $(PWD)/$(arch)-index.xml
    171171        $(Q)xmllint --xinclude --noout --nonet \
    172172          --relaxng $(TOP)/schema/docbook/4.5/rng/docbook.rng \
    … …  
    183183        $(Q)xsltproc --xinclude --nonet \
    184184          --output $(DUMPDIR)/$(arch)/ \
    185           $(TOP)/stylesheets/dump-commands.xsl \
    186           $(TOP)/$(arch)-index.xml
     185          $(PWD)/stylesheets/dump-commands.xsl \
     186          $(PWD)/$(arch)-index.xml
    187187
    188188ARCHS_DLLIST := $(ARCHS:%=%-dllist)
    … …  
    195195        $(Q)xsltproc --xinclude --nonet \
    196196          --output $(DLLISTDIR)/$(arch).list \
    197           $(TOP)/stylesheets/wget.xsl \
    198           $(TOP)/$(arch)-index.xml
     197          $(PWD)/stylesheets/wget.xsl \
     198          $(PWD)/$(arch)-index.xml
    199199
    200200FG_GREEN := $(shell echo -e '\e[0;32m')

  • BOOK/boot/64/e2fsprogs.xml

    rec008670 rcfb2026a  
    3535    xpointer="xpointer(//*[@os='c'])"/>
    3636
    37 <screen os="aa"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
    38   ../configure --prefix=/tools --enable-elf-shlibs \
     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 \
    3940    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    4041    --disable-libblkid --disable-libuuid --disable-fsck \
    … …  
    7778    xpointer="xpointer(//*[@os='ae'])"/>
    7879
    79 
    8080  </sect2>
    8181

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

    rec008670 rcfb2026a  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    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>
     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>
    3332
    3433    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4847    xpointer="xpointer(//*[@os='h'])"/>
    4948
     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
    5057  </sect2>
    5158

  • BOOK/boot/common/e2fsprogs.xml

    rec008670 rcfb2026a  
    3535    xpointer="xpointer(//*[@os='c'])"/>
    3636
    37 <screen os="aa"><userinput>PKG_CONFIG=true \
    38   ../configure --prefix=/tools \
     37<screen os="aa"><userinput>LDFLAGS="-Wl,-rpath-link,/tools/lib" \
     38  PKG_CONFIG=true ../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 
    8079  </sect2>
    8180

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

    rec008670 rcfb2026a  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    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>
     29<screen os="b"><userinput>./configure --build=${CLFS_HOST} \
     30    --host=${CLFS_TARGET} --enable-login-utils \
     31    --disable-makeinstall-chown</userinput></screen>
    3332
    3433    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4241    xpointer="xpointer(//*[@os='g'])"/>
    4342
    44 <screen os="h"><userinput>make install</userinput></screen>
     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
     48cp -v ${CLFS}/usr/lib/lib{blkid,uuid}* /tools/lib
     49cp -v ${CLFS}/lib/lib{blkid,uuid}* /tools/lib
     50ln -sfv libblkid.so.&util-linux-blkid-id; /tools/lib/libblkid.so
     51ln -sfv libuuid.so.&util-linux-uuid-id; /tools/lib/libuuid.so
     52install -dv /tools/include/{blkid,uuid}
     53cp -av ${CLFS}/usr/include/blkid/* /tools/include/blkid/
     54cp -av ${CLFS}/usr/include/uuid/* /tools/include/uuid/</userinput></screen>
    4555
    4656  </sect2>

  • BOOK/boot/multilib/e2fsprogs.xml

    rec008670 rcfb2026a  
    4141    xpointer="xpointer(//*[@os='c'])"/>
    4242
    43 <screen os="aa"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
    44   ../configure --prefix=/tools --enable-elf-shlibs \
     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 \
    4546    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    4647    --disable-libblkid --disable-libuuid --disable-fsck \

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

    rec008670 rcfb2026a  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    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 \
     29<screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --build=${CLFS_HOST} \
     30    --host=${CLFS_TARGET} --libdir=/lib64 --enable-login-utils \
    3431    --disable-makeinstall-chown</userinput></screen>
    3532
    … …  
    5047    xpointer="xpointer(//*[@os='h'])"/>
    5148
     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
     54cp -v ${CLFS}/usr/lib64/lib{blkid,uuid}* /tools/lib64
     55cp -v ${CLFS}/lib64/lib{blkid,uuid}* /tools/lib64
     56ln -sfv libblkid.so.&util-linux-blkid-id; /tools/lib64/libblkid.so
     57ln -sfv libuuid.so.&util-linux-uuid-id; /tools/lib64/libuuid.so
     58install -dv /tools/include/{blkid,uuid}
     59cp -av ${CLFS}/usr/include/blkid/* /tools/include/blkid/
     60cp -av ${CLFS}/usr/include/uuid/* /tools/include/uuid/</userinput></screen>
     61
    5262  </sect2>
    5363

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

    rec008670 rcfb2026a  
    4646    xpointer="xpointer(//*[@os='c'])"/>
    4747
    48 <screen os="aa"><userinput>CC="${CC} ${BUILD32}" PKG_CONFIG=true \
    49   ../configure --prefix=/tools --enable-elf-shlibs \
     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 \
    5051    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    5152    --disable-libblkid --disable-libuuid --disable-fsck \

  • BOOK/boot/ppc64/e2fsprogs.xml

    rec008670 rcfb2026a  
    5454    xpointer="xpointer(//*[@os='c'])"/>
    5555
    56 <screen os="aa"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
    57   ../configure --prefix=/tools --enable-elf-shlibs \
     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 \
    5859    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    5960    --disable-libblkid --disable-libuuid --disable-fsck \

  • BOOK/general.ent

    rec008670 rcfb2026a  
    11<?xml version="1.0" encoding="ISO-8859-1"?>
    22
    3 <!ENTITY month "06"> <!-- Use two digits -->
    4 <!ENTITY month_name "June">
    5 <!ENTITY day "04"> <!-- Use two digits -->
     3<!ENTITY month "05"> <!-- Use two digits -->
     4<!ENTITY month_name "May">
     5<!ENTITY day "19"> <!-- Use two digits -->
    66<!ENTITY year "2011"> <!-- Use four digits -->
    77

  • BOOK/introduction/common/changelog.xml

    rec008670 rcfb2026a  
    3636    </listitem>
    3737-->
    38 
    39     <listitem>
    40       <para>May 30, 2011</para>
    41       <itemizedlist>
    42         <listitem>
    43           <para>[jciccone] - Updated the Kernel to 2.6.39.</para>
    44         </listitem>
    45       </itemizedlist>
    46     </listitem>
    4738
    4839    <listitem>

  • BOOK/packages.ent

    rec008670 rcfb2026a  
    293293<!ENTITY linux-dl-version "2.6">
    294294
    295 <!ENTITY linux-version "2.6.39">
    296 <!ENTITY linux-size "74,316 KB">
     295<!ENTITY linux-version "2.6.38.3">
     296<!ENTITY linux-size "73,048 KB">
    297297<!ENTITY linux-url "&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.bz2">
    298 <!ENTITY linux-md5 "1aab7a741abe08d42e8eccf20de61e05">
     298<!ENTITY linux-md5 "d3071407a33a7bd2ffb47181f200f22c">
    299299<!ENTITY linux-home "http://www.kernel.org">
    300300
    … …  
    498498
    499499<!ENTITY zlib-version "1.2.5">
    500 <!ENTITY zlib-size "476 KB">
    501 <!ENTITY zlib-url "http://zlib.net/zlib-&zlib-version;.tar.bz2">
    502 <!ENTITY zlib-md5 "be1e89810e66150f5b0327984d8625a0">
     500<!ENTITY zlib-size "532 KB">
     501<!ENTITY zlib-url "&sourceforge;libpng/zlib-&zlib-version;.tar.gz">
     502<!ENTITY zlib-md5 "c735eab2d659a96e5a594c9e8541ad63">
    503503<!ENTITY zlib-home "http://www.zlib.net">
Note: See TracChangeset for help on using the changeset viewer.