Changeset 1718e20


Ignore:
Timestamp:
May 23, 2011, 3:04:49 PM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
cfb2026a
Parents:
30a199c (diff), 1ac2d0c (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

Conflicts:

BOOK/final-system/common/kbd.xml

Files:
6 added
3 deleted
38 edited

Legend:

Unmodified
Added
Removed

  • BOOK/cross-tools/alpha-chapter.xml

    r30a199c r1718e20  
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alpha/linux-headers.xml"/>
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
     19  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
    1920  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
    2021  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>

  • BOOK/cross-tools/common/ppl.xml

    r30a199c r1718e20  
    2525    <para os="a">Prepare PPL for compilation:</para>
    2626
    27 <screen os="b"><userinput>LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
     27<screen os="b"><userinput>CPPFLAGS="-I/cross-tools/include" \
     28    LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
    2829    ./configure --prefix=/cross-tools --enable-shared \
    2930    --enable-interfaces="c,cxx" --disable-optimization \

  • BOOK/cross-tools/mips-chapter.xml

    r30a199c r1718e20  
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
     19  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
    1920  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
    2021  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>

  • BOOK/cross-tools/mips64-64-chapter.xml

    r30a199c r1718e20  
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
    1919  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
     20  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
    2021  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
    2122  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>

  • BOOK/cross-tools/mips64-chapter.xml

    r30a199c r1718e20  
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
    1919  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
     20  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
    2021  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
    2122  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>

  • BOOK/cross-tools/ppc-chapter.xml

    r30a199c r1718e20  
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/linux-headers.xml"/>
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
     19  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
    1920  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
    2021  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>

  • BOOK/cross-tools/ppc64-chapter.xml

    r30a199c r1718e20  
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/linux-headers.xml"/>
    1919  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
     20  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
    2021  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
    2122  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>

  • BOOK/cross-tools/sparc-chapter.xml

    r30a199c r1718e20  
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/linux-headers.xml"/>
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
     19  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
    1920  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
    2021  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>

  • BOOK/cross-tools/sparc64-64-chapter.xml

    r30a199c r1718e20  
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/linux-headers.xml"/>
    1919  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
     20  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
    2021  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
    2122  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>

  • BOOK/cross-tools/sparc64-chapter.xml

    r30a199c r1718e20  
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/linux-headers.xml"/>
    1919  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
     20  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
    2021  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
    2122  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>

  • BOOK/cross-tools/x86-chapter.xml

    r30a199c r1718e20  
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/linux-headers.xml"/>
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
     19  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
    1920  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
    2021  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>

  • BOOK/cross-tools/x86_64-64-chapter.xml

    r30a199c r1718e20  
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/linux-headers.xml"/>
    1919  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
     20  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
    2021  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
    2122  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>

  • BOOK/cross-tools/x86_64-chapter.xml

    r30a199c r1718e20  
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/linux-headers.xml"/>
    1919  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
     20  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
    2021  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
    2122  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>

  • BOOK/final-system/alpha-chapter.xml

    r30a199c r1718e20  
    3030  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glib.xml"/>
    3233  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
    3334  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>

  • BOOK/final-system/common/kbd.xml

    r30a199c r1718e20  
    2626    <title>Installation of Kbd</title>
    2727
     28    <para os="p1">Apply the following patch to fix a typo in es.po:</para>
     29
     30    <screen os="p2"><userinput>patch -Np1 -i ../&kbd-espo-patch;</userinput></screen>
     31
    2832    <para os="a">Prepare Kbd for compilation:</para>
    2933
    … …  
    5660
    5761      <seglistitem>
    58         <seg>chvt, deallocvt, dumpkeys, fgconsole, getkeycodes, kbd_mode,
    59         kbdrate, loadkeys, loadunimap, mapscrn, openvt, psfaddtable
     62        <seg>chvt, deallocvt, dumpkeys, fgconsole, getkeycodes, kbdinfo,
     63        kbd_mode, kbdrate, loadkeys, loadunimap, mapscrn, openvt, psfaddtable
    6064        (link to psfxtable), psfgettable (link to psfxtable), psfstriptable
    6165        (link to psfxtable), psfxtable, resizecons, setfont, setkeycodes,
    62         setleds, setmetamode, showconsolefont, showkey, unicode_start, and
    63         unicode_stop</seg>
     66        setleds, setmetamode, setvtrgb, showconsolefont, showkey,
     67        unicode_start, and unicode_stop</seg>
    6468        <seg>/usr/share/consolefonts, /usr/share/consoletrans,
    6569        /usr/share/keymaps, /usr/share/unimaps</seg>
    … …  
    118122          <indexterm zone="ch-system-kbd getkeycodes">
    119123            <primary sortas="b-getkeycodes">getkeycodes</primary>
     124          </indexterm>
     125        </listitem>
     126      </varlistentry>
     127
     128      <varlistentry id="kbdinfo">
     129        <term><command>kbdinfo</command></term>
     130        <listitem>
     131          <para>Obtains information about the console</para>
     132          <indexterm zone="ch-system-kbd kbdinfo">
     133            <primary sortas="b-kbdinfo">kbdinfo</primary>
    120134          </indexterm>
    121135        </listitem>
    … …  
    276290      </varlistentry>
    277291
     292      <varlistentry id="setvtrgb">
     293        <term><command>setvtrgb</command></term>
     294        <listitem>
     295          <para>Sets the virtal terminal RGB colors</para>
     296          <indexterm zone="ch-system-kbd setvtrgb">
     297            <primary sortas="b-setvtrgb">setvtrgb</primary>
     298          </indexterm>
     299        </listitem>
     300      </varlistentry>
     301
    278302      <varlistentry id="showconsolefont">
    279303        <term><command>showconsolefont</command></term>

  • BOOK/final-system/common/pkg-config.xml

    r30a199c r1718e20  
    2828    <para os="a">Prepare Pkg-config for compilation:</para>
    2929
    30 <screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
     30<screen os="b"><userinput>GLIB_CFLAGS="-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include" \
     31    GLIB_LIBS="-lglib-2.0" \
     32    ./configure --prefix=/usr</userinput></screen>
     33
     34    <variablelist os="bb">
     35      <title>The meaning of the new configure option:</title>
     36
     37      <varlistentry>
     38        <term><parameter>GLIB_CFLAGS="-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include"</parameter></term>
     39        <term><parameter>GLIB_LIBS="-lglib-2.0"</parameter></term>
     40        <listitem>
     41          <para>Pkg-config no longer comes with Glib and because Pkg-config
     42        has not been installed itself it needs to be told where Glib is.</para>
     43        </listitem>
     44      </varlistentry>
     45    </variablelist>
    3146
    3247    <para os="c">Compile the package:</para>

  • BOOK/final-system/common/xz.xml

    r30a199c r1718e20  
    3636<screen os="d"><userinput>make</userinput></screen>
    3737
    38     <para os="e">Install the programs:</para>
    39 
    40 <screen os="f"><userinput>make install</userinput></screen>
    41 
    42     <para os="g">Move the <filename>xz</filename> binary, and several symlinks
     38    <para os="e">To test the results, issue:
     39    <userinput>make check</userinput>.</para>
     40
     41
     42    <para os="f">Install the programs:</para>
     43
     44<screen os="g"><userinput>make install</userinput></screen>
     45
     46    <para os="h">Move the <filename>xz</filename> binary, and several symlinks
    4347    that point to it, into the /bin directory:</para>
    4448
    45 <screen os="h"><userinput>mv -v /usr/bin/{xz,lzma,lzcat,unlzma,unxz,xzcat} /bin</userinput></screen>
    46 
    47     <para os="i">Move the static libraries to the proper location:</para>
    48 
    49 <screen os="j"><userinput>mv -v /lib/liblzma.a /usr/lib</userinput></screen>
     49<screen os="i"><userinput>mv -v /usr/bin/{xz,lzma,lzcat,unlzma,unxz,xzcat} /bin</userinput></screen>
    5050
    5151  </sect2>

  • BOOK/final-system/mips-chapter.xml

    r30a199c r1718e20  
    3030  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glib.xml"/>
    3233  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
    3334  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>

  • BOOK/final-system/mips64-64-chapter.xml

    r30a199c r1718e20  
    3030  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glib.xml"/>
    3233  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
    3334  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>

  • BOOK/final-system/mips64-chapter.xml

    r30a199c r1718e20  
    4646  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses-n32.xml"/>
    4747  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses-64bit.xml"/>
     48  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glib.xml"/>
     49  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glib-n32.xml"/>
     50  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glib-64bit.xml"/>
    4851  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/pkg-config.xml"/>
    4952  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>

  • BOOK/final-system/multilib/kbd.xml

    r30a199c r1718e20  
    2121  <sect2 role="installation">
    2222    <title>Installation of Kbd</title>
     23
     24    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     25    href="../common/kbd.xml"
     26    xpointer="xpointer(//*[@os='p1'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/kbd.xml"
     30    xpointer="xpointer(//*[@os='p2'])"/>
    2331
    2432    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/pkg-config.xml

    r30a199c r1718e20  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen os="b"><userinput>CC="gcc ${BUILD64}" \
     28<screen os="b"><userinput>GLIB_CFLAGS="-I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include" \
     29  GLIB_LIBS="-lglib-2.0" \
     30  CC="gcc ${BUILD64}" \
    2931  ./configure --prefix=/usr \
    3032    --with-pc-path=/usr/share/pkgconfig </userinput></screen>
     33
     34    <variablelist os="bb">
     35      <title>The meaning of the new configure option:</title>
     36
     37      <varlistentry>
     38        <term><parameter>GLIB_CFLAGS="-I/usr/include/glib-2.0 -I/usr/libi64/glib-2.0/include"</parameter></term>
     39        <term><parameter>GLIB_LIBS="-lglib-2.0"</parameter></term>
     40        <listitem>
     41          <para>Pkg-config no longer comes with Glib and because Pkg-config
     42        has not been installed itself it needs to be told where Glib is.</para>
     43        </listitem>
     44      </varlistentry>
     45    </variablelist>
     46
    3147
    3248    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/xz-64bit.xml

    r30a199c r1718e20  
    5656    xpointer="xpointer(//*[@os='i'])"/>
    5757
    58 <screen os="j"><userinput>mv -v /lib64/liblzma.a /usr/lib64</userinput></screen>
     58    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     59    href="xz.xml"
     60    xpointer="xpointer(//*[@os='j'])"/>
     61
     62    <screen os="k"><userinput>mv -v /lib64/liblzma.a /usr/lib64</userinput></screen>
    5963
    6064  </sect2>

  • BOOK/final-system/multilib/xz-n32.xml

    r30a199c r1718e20  
    5757    xpointer="xpointer(//*[@os='i'])"/>
    5858
    59 <screen os="j"><userinput>mv -v /lib32/liblzma.a /usr/lib32</userinput></screen>
     59    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     60    href="xz.xml"
     61    xpointer="xpointer(//*[@os='j'])"/>
     62
     63<screen os="k"><userinput>mv -v /lib32/liblzma.a /usr/lib32</userinput></screen>
    6064
    6165  </sect2>

  • BOOK/final-system/multilib/xz.xml

    r30a199c r1718e20  
    5757    xpointer="xpointer(//*[@os='i'])"/>
    5858
    59     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    60     href="../common/xz.xml"
    61     xpointer="xpointer(//*[@os='j'])"/>
     59    <para os="j">Move the static libraries to the proper location:</para>
     60
     61    <screen os="k"><userinput>mv -v /lib/liblzma.a /usr/lib</userinput></screen>
    6262
    6363  </sect2>

  • BOOK/final-system/ppc-chapter.xml

    r30a199c r1718e20  
    3030  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glib.xml"/>
    3233  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
    3334  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>

  • BOOK/final-system/ppc64-chapter.xml

    r30a199c r1718e20  
    3939  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
    4040  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses-64bit.xml"/>
     41  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glib.xml"/>
     42  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glib-64bit.xml"/>
    4143  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config.xml"/>
    4244  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>

  • BOOK/final-system/sparc-chapter.xml

    r30a199c r1718e20  
    3030  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glib.xml"/>
    3233  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
    3334  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>

  • BOOK/final-system/sparc64-64-chapter.xml

    r30a199c r1718e20  
    3030  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glib.xml"/>
    3233  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
    3334  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>

  • BOOK/final-system/sparc64-chapter.xml

    r30a199c r1718e20  
    3939  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
    4040  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses-64bit.xml"/>
     41  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glib.xml"/>
     42  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glib-64bit.xml"/>
    4143  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config.xml"/>
    4244  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>

  • BOOK/final-system/x86-chapter.xml

    r30a199c r1718e20  
    3030  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glib.xml"/>
    3233  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
    3334  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>

  • BOOK/final-system/x86_64-64-chapter.xml

    r30a199c r1718e20  
    3030  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glib.xml"/>
    3233  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
    3334  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>

  • BOOK/final-system/x86_64-chapter.xml

    r30a199c r1718e20  
    3939  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses.xml"/>
    4040  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/ncurses-64bit.xml"/>
     41  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glib.xml"/>
     42  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/glib-64bit.xml"/>
    4143  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config.xml"/>
    4244  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/util-linux.xml"/>

  • BOOK/general.ent

    r30a199c r1718e20  
    33<!ENTITY month "05"> <!-- Use two digits -->
    44<!ENTITY month_name "May">
    5 <!ENTITY day "18"> <!-- Use two digits -->
     5<!ENTITY day "19"> <!-- Use two digits -->
    66<!ENTITY year "2011"> <!-- Use four digits -->
    77

  • BOOK/introduction/common/changelog.xml

    r30a199c r1718e20  
    3636    </listitem>
    3737-->
     38
     39    <listitem>
     40      <para>May 19, 2011</para>
     41      <itemizedlist>
     42        <listitem>
     43          <para>[Jonathan] - No longer need to move liblmza.a on pure builds.</para>
     44        </listitem>
     45        <listitem>
     46          <para>[Jonathan] - Added Glib, dependancy of new Pkg-config.</para>
     47        </listitem>
     48        <listitem>
     49          <para>[Jonathan] - Updated Pkg-config to 0.26.</para>
     50        </listitem>
     51        <listitem>
     52          <para>[Jonathan] - Updated Bison to 2.5.</para>
     53        </listitem>
     54        <listitem>
     55          <para>[Jonathan] - Added M4 to cross-tools to avoid strstr issue
     56        with Bison 2.5.</para>
     57        </listitem>
     58        <listitem>
     59          <para>[Jonathan] - Moved Kbd's setvtrgb from /usr/bin to /bin.</para>
     60        </listitem>
     61        <listitem>
     62          <para>[Jonathan] - Updated package contents for Kdb.</para>
     63        </listitem>
     64        <listitem>
     65          <para>[Jonathan] - Added es.po fix for Kdb 1.15.3.</para>
     66        </listitem>
     67        <listitem>
     68          <para>[Jonathan] - Updated Kdb to 1.15.3.</para>
     69        </listitem>
     70        <listitem>
     71          <para>[Jonathan] - Fixed issue with cross PPL using
     72          the host's GMP headers.</para>
     73        </listitem>
     74      </itemizedlist>
     75    </listitem>
     76
    3877
    3978    <listitem>

  • BOOK/materials/common/patches.xml

    r30a199c r1718e20  
    101101
    102102    <varlistentry>
     103      <term>Kbd es.po Fix Patch - <token>&kbd-espo-patch-size;</token>:</term>
     104      <listitem>
     105        <para>Download: <ulink
     106        url="&patches-root;&kbd-espo-patch;"/></para>
     107        <para>MD5 sum: <literal>&kbd-espo-patch-md5;</literal></para>
     108      </listitem>
     109    </varlistentry>
     110
     111    <varlistentry>
    103112      <term>Man i18n Patch - <token>&man-i18n-patch-size;</token>:</term>
    104113      <listitem>

  • BOOK/packages.ent

    r30a199c r1718e20  
    4949<!ENTITY binutils-home "http://sources.redhat.com/binutils">
    5050
    51 <!ENTITY bison-version "2.4.3">
    52 <!ENTITY bison-size "1,616 KB">
     51<!ENTITY bison-version "2.5">
     52<!ENTITY bison-size "2,030 KB">
    5353<!ENTITY bison-url "&gnu;bison/bison-&bison-version;.tar.bz2">
    54 <!ENTITY bison-md5 "c1d3ea81bc370dbd43b6f0b2cd21287e">
     54<!ENTITY bison-md5 "9dba20116b13fc61a0846b0058fbe004">
    5555<!ENTITY bison-home "&gnu-software;bison">
    5656
    … …  
    193193<!ENTITY gettext-home "&gnu-software;gettext">
    194194
     195<!ENTITY glib-version "2.28.6">
     196<!ENTITY glib-size "6,956 KB">
     197<!ENTITY glib-url "http://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-&glib-version;.tar.bz2">
     198<!ENTITY glib-md5 "7d8fc15ae70d5111c0cf2a79d50ef717">
     199<!ENTITY glib-home "http://developer.gnome.org/glib/">
     200
    195201<!ENTITY gmp-version "5.0.2">
    196202<!ENTITY gmp-size "2,025 KB">
    … …  
    249255<!ENTITY iputils-home "http://www.linuxfoundation.org/en/Net:Iputils">
    250256
    251 <!ENTITY kbd-version "1.15.2">
    252 <!ENTITY kbd-size "1,524 KB">
     257<!ENTITY kbd-version "1.15.3">
     258<!ENTITY kbd-size "1,660 KB">
    253259<!ENTITY kbd-url "ftp://devel.altlinux.org/legion/kbd/kbd-&kbd-version;.tar.gz">
    254 <!ENTITY kbd-md5 "77d0b51454522bc6c170bbdc6e31202a">
     260<!ENTITY kbd-md5 "8143e179a0f3c25646ce5085e8777200">
    255261<!ENTITY kbd-home " ">
    256262
    … …  
    359365<!ENTITY perl-home "http://www.perl.org">
    360366
    361 <!ENTITY pkg-config-version "0.25">
    362 <!ENTITY pkg-config-size "968 KB">
     367<!ENTITY pkg-config-version "0.26">
     368<!ENTITY pkg-config-size "388 KB">
    363369<!ENTITY pkg-config-url "http://pkgconfig.freedesktop.org/releases/pkg-config-&pkg-config-version;.tar.gz">
    364 <!ENTITY pkg-config-md5 "a3270bab3f4b69b7dc6dbdacbcae9745">
     370<!ENTITY pkg-config-md5 "47525c26a9ba7ba14bf85e01509a7234">
    365371<!ENTITY pkg-config-home "http://pkgconfig.freedesktop.org/wiki/">
    366372

  • BOOK/patches.ent

    r30a199c r1718e20  
    4444<!ENTITY iputils-doc-patch-md5 "2eee5e095005bf4be426797a4aefa27b">
    4545<!ENTITY iputils-doc-patch-size "136 KB">
     46
     47<!ENTITY kbd-espo-patch "kbd-&kbd-version;-es.po_fix-1.patch">
     48<!ENTITY kbd-espo-patch-md5 "476c4066c5c663b44b67acaa4cdef62e">
     49<!ENTITY kbd-espo-patch-size "1 KB">
    4650
    4751<!ENTITY man-i18n-patch "man-&man-version;-i18n-1.patch">
Note: See TracChangeset for help on using the changeset viewer.