Changeset 271d1f96


Ignore:
Timestamp:
Jun 4, 2011, 8:28:21 AM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Children:
193eb68
Parents:
0230c0a (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 simp

Conflicts:

BOOK/Makefile

Files:
13 edited

Legend:

Unmodified
Added
Removed

  • .gitignore

    r0230c0a r271d1f96  
    11/BOOK/render-output
    22/render/
     3*~

  • BOOK/Makefile

    r0230c0a r271d1f96  
    1 TOP             := $(PWD)
     1TOP             := $(shell pwd)
    22RENDERDIR       := $(TOP)/../render
    33
    … …  
    6868        @echo "Rendering the top-level index..."
    6969        $(Q)xsltproc --nonet --output $(HTMLDIR)/index.html \
    70           $(PWD)/stylesheets/top-index.xsl \
    71           $(PWD)/index.xml
     70          $(TOP)/stylesheets/top-index.xsl \
     71          $(TOP)/index.xml
    7272        @$(MAKE) --no-print-directory tidy-f TIDY_FILE=$(HTMLDIR)/index.html
    7373
    … …  
    8181          --relaxng $(TOP)/schema/clfs/0.1/rng/clfs.rng \
    8282          -o $(VALIDATEDIR)/$(arch)-full.xml \
    83           $(PWD)/$(arch)-index.xml \
     83          $(TOP)/$(arch)-index.xml \
    8484          2>&1 | grep -v " validates$$"; \
    8585          if test $${?} -ne 0; then true; else false; fi
    … …  
    9696          --stringparam clfs.multilib "$($(arch)_ML)" \
    9797          --output $(DBXMLDIR)/$(arch)-db.xml \
    98           $(PWD)/stylesheets/clfs-profile.xsl \
     98          $(TOP)/stylesheets/clfs-profile.xsl \
    9999          $(VALIDATEDIR)/$(arch)-full.xml
    100100
    … …  
    109109          --stringparam profile.condition html \
    110110          --output $(PROFILEDIR)/$(arch)-html.xml \
    111           $(PWD)/stylesheets/lfs-xsl/profile.xsl \
     111          $(TOP)/stylesheets/lfs-xsl/profile.xsl \
    112112          $(DBXMLDIR)/$(arch)-db.xml
    113113
    … …  
    136136          -stringparam rootid "$(ROOT_ID)" \
    137137          -stringparam base.dir $(HTMLDIR)/$(arch)/ \
    138           $(PWD)/stylesheets/clfs-chunked.xsl \
     138          $(TOP)/stylesheets/clfs-chunked.xsl \
    139139          $(PROFILEDIR)/$(arch)-html.xml
    140140
    141141        @echo "Copying CSS code and images for $(arch)..."
    142142        $(Q)mkdir -p $(HTMLDIR)/$(arch)/stylesheets
    143         $(Q)cp $(PWD)/stylesheets/lfs-xsl/*.css $(HTMLDIR)/$(arch)/stylesheets
     143        $(Q)cp $(TOP)/stylesheets/lfs-xsl/*.css $(HTMLDIR)/$(arch)/stylesheets
    144144        $(Q)sed -i -e "s@../stylesheets@stylesheets@g" $(HTMLDIR)/$(arch)/*.html
    145145        $(Q)mkdir -p $(HTMLDIR)/$(arch)/images
    146         $(Q)cp $(PWD)/images/*.png $(HTMLDIR)/$(arch)/images
     146        $(Q)cp $(TOP)/images/*.png $(HTMLDIR)/$(arch)/images
    147147        $(Q)sed -i -e "s@../images@images@g" $(HTMLDIR)/$(arch)/*.html
    148148
    … …  
    161161        $(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \
    162162          --output $(NOCHUNKDIR)/CLFS-$(arch).html \
    163           $(PWD)/stylesheets/clfs-nochunks.xsl \
     163          $(TOP)/stylesheets/clfs-nochunks.xsl \
    164164          $(PROFILEDIR)/$(arch)-html.xml
    165165
    … …  
    178178        $(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \
    179179          --output $(FODIR)/$(arch).fo \
    180           $(PWD)/stylesheets/clfs-pdf.xsl \
     180          $(TOP)/stylesheets/clfs-pdf.xsl \
    181181          $(PROFILEDIR)/$(arch)-html.xml
    182182        $(Q)sed -i -e 's/span="inherit"/span="all"/' $(FODIR)/$(arch).fo
    … …  
    201201        $(Q)xmllint --xinclude --noout --nonet \
    202202          --relaxng $(TOP)/schema/clfs/0.1/rng/clfs.rng \
    203           $(PWD)/$(arch)-index.xml \
     203          $(TOP)/$(arch)-index.xml \
    204204          2>&1 | grep -v " validates$$"; \
    205205          if test $${?} -ne 0; then true; else false; fi
    … …  
    215215          --relaxng $(TOP)/schema/clfs/0.1/rng/clfs.rng \
    216216          -o $(TROUBLEDIR)/dump-$(arch) \
    217           $(PWD)/$(arch)-index.xml \
     217          $(TOP)/$(arch)-index.xml \
    218218          2>&1 | grep -v " validates$$"; \
    219219          if test $${?} -ne 0; then true; else false; fi
    … …  
    234234        $(Q)xsltproc --xinclude --nonet \
    235235          --output $(DUMPDIR)/$(arch)/ \
    236           $(PWD)/stylesheets/dump-commands.xsl \
    237           $(PWD)/$(arch)-index.xml
     236          $(TOP)/stylesheets/dump-commands.xsl \
     237          $(TOP)/$(arch)-index.xml
    238238
    239239ARCHS_DLLIST := $(ARCHS:%=%-dllist)
    … …  
    246246        $(Q)xsltproc --xinclude --nonet \
    247247          --output $(DLLISTDIR)/$(arch).list \
    248           $(PWD)/stylesheets/wget.xsl \
    249           $(PWD)/$(arch)-index.xml
     248          $(TOP)/stylesheets/wget.xsl \
     249          $(TOP)/$(arch)-index.xml
    250250
    251251FG_GREEN := $(shell echo -e '\e[0;32m')

  • BOOK/boot/64/e2fsprogs.xml

    r0230c0a r271d1f96  
    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

    r0230c0a r271d1f96  
    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

    r0230c0a r271d1f96  
    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

    r0230c0a r271d1f96  
    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

    r0230c0a r271d1f96  
    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

    r0230c0a r271d1f96  
    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

    r0230c0a r271d1f96  
    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

    r0230c0a r271d1f96  
    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 \

  • BOOK/general.ent

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

  • BOOK/introduction/common/changelog.xml

    r0230c0a r271d1f96  
    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>
    3847
    3948    <listitem>

  • BOOK/packages.ent

    r0230c0a r271d1f96  
    268268<!ENTITY linux-dl-version "2.6">
    269269
    270 <!ENTITY linux-version "2.6.38.3">
    271 <!ENTITY linux-size "73,048 KB">
     270<!ENTITY linux-version "2.6.39">
     271<!ENTITY linux-size "74,316 KB">
    272272<!ENTITY linux-url "&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.bz2">
    273 <!ENTITY linux-md5 "d3071407a33a7bd2ffb47181f200f22c">
     273<!ENTITY linux-md5 "1aab7a741abe08d42e8eccf20de61e05">
    274274<!ENTITY linux-home "http://www.kernel.org">
    275275
    … …  
    467467
    468468<!ENTITY zlib-version "1.2.5">
    469 <!ENTITY zlib-size "532 KB">
    470 <!ENTITY zlib-url "&sourceforge;libpng/zlib-&zlib-version;.tar.gz">
    471 <!ENTITY zlib-md5 "c735eab2d659a96e5a594c9e8541ad63">
     469<!ENTITY zlib-size "476 KB">
     470<!ENTITY zlib-url "http://zlib.net/zlib-&zlib-version;.tar.bz2">
     471<!ENTITY zlib-md5 "be1e89810e66150f5b0327984d8625a0">
    472472<!ENTITY zlib-home "http://www.zlib.net">
Note: See TracChangeset for help on using the changeset viewer.