Changeset 2d90b8e


Ignore:
Timestamp:
Feb 10, 2014, 9:42:33 PM (9 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
84ed6d5
Parents:
14ac7cb (diff), 49c681d (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 'systemd' of git.cross-lfs.org:cross-lfs into systemd

Location:
BOOK
Files:
18 edited

Legend:

Unmodified
Added
Removed
  • BOOK/chroot/x86/before-chroot.xml

    r14ac7cb r2d90b8e  
    3535    <command>config.guess</command>:</para>
    3636
    37 <screen><userinput>build-aux/config.guess</userinput></screen>
     37<screen><userinput>lib/config.guess</userinput></screen>
    3838
    3939    <para>If the output of that command does not equal what is in
     
    5555    directory:</para>
    5656
    57 <screen><userinput>setarch linux32 build-aux/config.guess</userinput></screen>
     57<screen><userinput>setarch linux32 lib/config.guess</userinput></screen>
    5858
    5959    <para>If the output of the command above equals what is in
     
    125125    directory:</para>
    126126
    127 <screen os="uui"><userinput>build-aux/config.guess</userinput></screen>
     127<screen os="uui"><userinput>lib/config.guess</userinput></screen>
    128128
    129129    <para os="uuj">The output of the above command should be the same as the
  • BOOK/final-system/64/gcc.xml

    r14ac7cb r2d90b8e  
    136136    xpointer="xpointer(//*[@os='z'])"/>
    137137
     138    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     139    href="../common/gcc.xml"
     140    xpointer="xpointer(//*[@os='aa'])"/>
     141
     142    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     143    href="../common/gcc.xml"
     144    xpointer="xpointer(//*[@os='ab'])"/>
     145
    138146  </sect2>
    139147
  • BOOK/final-system/common/gcc.xml

    r14ac7cb r2d90b8e  
    106106<screen os="z"><userinput>ln -sv gcc /usr/bin/cc</userinput></screen>
    107107
     108    <para os="aa">Finally, move a misplaced file:</para>
     109
     110<screen os="ab"><userinput>mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
     111
    108112  </sect2>
    109113
  • BOOK/final-system/common/systemd.xml

    r14ac7cb r2d90b8e  
    3131    --libexecdir=/usr/lib --docdir=/usr/share/doc/systemd-&systemd-version; \
    3232    --with-rootprefix="" --with-rootlibdir=/lib \
    33     --enable-split-usr --disable-gudev</userinput></screen>
     33    --enable-split-usr --disable-gudev --with-kbd-loadkeys=/bin/loadkeys \
     34    --with-kbd-setfont=/bin/setfont</userinput></screen>
    3435
    3536    <para os="c">Compile the package:</para>
  • BOOK/final-system/mips/gcc.xml

    r14ac7cb r2d90b8e  
    130130    xpointer="xpointer(//*[@os='z'])"/>
    131131
     132    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     133    href="../common/gcc.xml"
     134    xpointer="xpointer(//*[@os='aa'])"/>
     135
     136    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     137    href="../common/gcc.xml"
     138    xpointer="xpointer(//*[@os='ab'])"/>
     139
    132140  </sect2>
    133141
  • BOOK/final-system/mips64-64/gcc.xml

    r14ac7cb r2d90b8e  
    136136    xpointer="xpointer(//*[@os='z'])"/>
    137137
     138    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     139    href="../common/gcc.xml"
     140    xpointer="xpointer(//*[@os='aa'])"/>
     141
     142    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     143    href="../common/gcc.xml"
     144    xpointer="xpointer(//*[@os='ab'])"/>
     145
    138146  </sect2>
    139147
  • BOOK/final-system/multilib/systemd-64bit.xml

    r14ac7cb r2d90b8e  
    3030    --libexecdir=/usr/lib64 --docdir=/usr/share/doc/systemd-&systemd-version; \
    3131    --with-rootprefix="" -with-rootlibdir=/lib64 \
    32     --enable-split-usr --disable-gudev</userinput></screen>
     32    --enable-split-usr --disable-gudev --with-kbd-loadkeys=/bin/loadkeys \
     33    --with-kbd-setfont=/bin/setfont</userinput></screen>
    3334
    3435    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/final-system/multilib/systemd-n32.xml

    r14ac7cb r2d90b8e  
    3535    --libexecdir=/usr/lib32 --docdir=/usr/share/doc/systemd-&systemd-version; \
    3636    --with-rootprefix="" -with-rootlibdir=/lib32 \
    37     --enable-split-usr --disable-gudev</userinput></screen>
     37    --enable-split-usr --disable-gudev --with-kbd-loadkeys=/bin/loadkeys \
     38    --with-kbd-setfont=/bin/setfont</userinput></screen>
    3839
    3940    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/final-system/multilib/systemd.xml

    r14ac7cb r2d90b8e  
    4040    --libexecdir=/usr/lib --docdir=/usr/share/doc/systemd-&systemd-version; \
    4141    --with-rootprefix="" --with-rootlibdir=/lib \
    42     --enable-split-usr --disable-gudev</userinput></screen>
     42    --enable-split-usr --disable-gudev --with-kbd-loadkeys=/bin/loadkeys \
     43    --with-kbd-setfont=/bin/setfont</userinput></screen>
    4344
    4445    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/final-system/ppc/hfsutils.xml

    r14ac7cb r2d90b8e  
    3333    <para os="a">Prepare Hfsutils for compilation:</para>
    3434
    35 <screen><userinput>./configure --prefix=/usr</userinput></screen>
     35<screen><userinput>./configure --prefix=/usr --mandir=/usr/share/man</userinput></screen>
    3636
    3737    <para os="c">Compile the package:</para>
  • BOOK/final-system/ppc64/gcc.xml

    r14ac7cb r2d90b8e  
    130130    xpointer="xpointer(//*[@os='z'])"/>
    131131
     132    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     133    href="../common/gcc.xml"
     134    xpointer="xpointer(//*[@os='aa'])"/>
     135
     136    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     137    href="../common/gcc.xml"
     138    xpointer="xpointer(//*[@os='ab'])"/>
     139
    132140  </sect2>
    133141
  • BOOK/final-system/ppc64/hfsutils.xml

    r14ac7cb r2d90b8e  
    3434    xpointer="xpointer(//*[@os='a'])"/>
    3535
    36 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
     36<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --mandir=/usr/share/man</userinput></screen>
    3737
    3838    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/general.ent

    r14ac7cb r2d90b8e  
    33<!ENTITY month "02"> <!-- Use two digits -->
    44<!ENTITY month_name "February">
    5 <!ENTITY day "03"> <!-- Use two digits -->
     5<!ENTITY day "10"> <!-- Use two digits -->
    66<!ENTITY year "2014"> <!-- Use four digits -->
    77
  • BOOK/introduction/common/changelog.xml

    r14ac7cb r2d90b8e  
    3838
    3939    <listitem>
     40      <para>03 February 2014</para>
     41      <itemizedlist>
     42        <listitem>
     43          <para>[William Harrington] - Add configure options to systemd so loadkeys and setfont is searched in /bin instead of /usr/bin.</para>
     44        </listitem>
     45      </itemizedlist>
     46    </listitem>
     47
     48    <listitem>
    4049      <para>02 February 2014</para>
    4150      <itemizedlist>
  • BOOK/introduction/ppc/changelog.xml

    r14ac7cb r2d90b8e  
    3434-->
    3535    <listitem>
     36      <para>03 February 2014</para>
     37      <itemizedlist>
     38        <listitem>
     39          <para>[William Harrington] - Add --mandir=/usr/share/man to HFSUtils configure command.</para>
     40        </listitem>
     41      </itemizedlist>
     42    </listitem>
     43
     44   <listitem>
    3645      <para>24 October 2013</para>
    3746      <itemizedlist>
  • BOOK/introduction/ppc64-64/changelog.xml

    r14ac7cb r2d90b8e  
    2020<!-- Changelog template
    2121
    22     <listitem>
     22   <listitem>
    2323      <para>Date</para>
    2424      <itemizedlist>
     
    3434-->
    3535    <listitem>
     36      <para>03 February 2014</para>
     37      <itemizedlist>
     38        <listitem>
     39          <para>[William Harrington] - Add --mandir=/usr/share/man to HFSUtils configure command.</para>
     40        </listitem>
     41      </itemizedlist>
     42    </listitem>
     43
     44
     45    <listitem>
    3646      <para>24 October 2013</para>
    3747      <itemizedlist>
  • BOOK/introduction/ppc64/changelog.xml

    r14ac7cb r2d90b8e  
    3333
    3434-->
     35
     36    <listitem>
     37      <para>03 February 2014</para>
     38      <itemizedlist>
     39        <listitem>
     40          <para>[William Harrington] - Add --mandir=/usr/share/man to HFSUtils configure command.</para>
     41        </listitem>
     42      </itemizedlist>
     43    </listitem>
     44
    3545    <listitem>
    3646      <para>08 November 2013</para>
  • BOOK/packages.ent

    r14ac7cb r2d90b8e  
    8787<!ENTITY check-home "http://check.sourceforge.net/">
    8888
    89 <!ENTITY clfs-network-scripts-version "20140124">
     89<!ENTITY clfs-network-scripts-version "20140210">
    9090<!ENTITY clfs-network-scripts-size "22 KB">
    9191<!ENTITY clfs-network-scripts-url "http://cross-lfs.org/files/clfs-network-scripts-&clfs-network-scripts-version;.tar.xz">
    92 <!ENTITY clfs-network-scripts-md5 "22726ce40c90af865b28896c5d4bc28d">
     92<!ENTITY clfs-network-scripts-md5 "1e0b109dcf6931a20b415526bff80433">
    9393<!ENTITY clfs-network-scripts-home " ">
    9494
Note: See TracChangeset for help on using the changeset viewer.