Changeset 373b6ea for BOOK


Ignore:
Timestamp:
Jan 1, 2010, 3:08:07 PM (15 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
012dfcb
Parents:
129802d (diff), 52b24ce (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:

Merged Upstream with Local Repo.

Location:
BOOK
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r129802d r373b6ea  
    3131  --exec-prefix="" --sysconfdir=/etc \
    3232  --libexecdir=/lib/udev --libdir=/usr/lib \
    33   --disable-extras</userinput></screen>
     33  --disable-extras --disable-introspection</userinput></screen>
    3434
    3535    <para os="c">Compile the package:</para>

  • BOOK/introduction/common/changelog.xml

    r129802d r373b6ea  
    5757          <para>[jciccone] - Stopped Cloog-PPL from setting LD_LIBRARY_PATH to
    5858                fix segfault issues.</para>
     59        </listitem>
     60        <listitem>
     61          <para>[Jonathan] Updated Module-init-tools to 3.11.1.</para>
     62        </listitem>
     63        <listitem>
     64          <para>[Jonathan] Updated Psmisc to 22.9.</para>
     65        </listitem>
     66        <listitem>
     67          <para>[Jonathan] Updated Rsyslog to 4.4.2.</para>
     68        </listitem>
     69        <listitem>
     70          <para>[Jonathan] Updated Dhcpcd to 5.1.4.</para>
     71        </listitem>
     72        <listitem>
     73          <para>[Jonathan] Updated Udev to 149.</para>
    5974        </listitem>
    6075      </itemizedlist>

  • BOOK/network/common/dhcpcd.xml

    r129802d r373b6ea  
    3131    <para os="b">Prepare DHCPCD for compilation:</para>
    3232
    33 <screen os="c"><userinput>make PREFIX=/usr BINDIR=/sbin SYSCONFDIR=/etc \
    34     DBDIR=/var/lib/dhcpcd LIBEXECDIR=/usr/lib/dhcpcd</userinput></screen>
     33<screen os="c"><userinput>./configure --prefix=/usr --sbindir=/sbin \
     34    --sysconfdir=/etc --dbdir=/var/lib/dhcpcd --libexecdir=/usr/lib/dhcpcd</userinput></screen>
    3535
    36     <para os="d">This package does not come with a test suite.</para>
     36    <para os="d">Compile the package:</para>
    3737
    38     <para os="e">Install the package:</para>
     38<screen os="e"><userinput>make</userinput></screen>
    3939
    40 <screen os="f"><userinput>make PREFIX=/usr BINDIR=/sbin SYSCONFDIR=/etc \
    41     DBDIR=/var/lib/dhcpcd LIBEXECDIR=/usr/lib/dhcpcd install</userinput></screen>
     40    <para os="f">This package does not come with a test suite.</para>
     41
     42    <para os="g">Install the package:</para>
     43
     44<screen os="h"><userinput>make install</userinput></screen>
    4245
    4346  </sect2>

  • BOOK/network/multilib/dhcpcd.xml

    r129802d r373b6ea  
    3030    xpointer="xpointer(//*[@os='b'])"/>
    3131
    32 <screen os="c"><userinput>make CC="gcc ${BUILD64}" PREFIX=/usr BINDIR=/sbin SYSCONFDIR=/etc \
    33     DBDIR=/var/lib/dhcpcd LIBEXECDIR=/usr/lib/dhcpcd</userinput></screen>
     32<screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --sbindir=/sbin \
     33    --sysconfdir=/etc --dbdir=/var/lib/dhcpcd --libexecdir=/usr/lib/dhcpcd</userinput></screen>
    3434
    3535    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    … …  
    4141    xpointer="xpointer(//*[@os='e'])"/>
    4242
    43 <screen os="f"><userinput>make CC="gcc ${BUILD64}" PREFIX=/usr BINDIR=/sbin SYSCONFDIR=/etc \
    44     DBDIR=/var/lib/dhcpcd LIBEXECDIR=/usr/lib/dhcpcd install</userinput></screen>
     43    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     44    href="../common/dhcpcd.xml"
     45    xpointer="xpointer(//*[@os='f'])"/>
     46
     47    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     48    href="../common/dhcpcd.xml"
     49    xpointer="xpointer(//*[@os='g'])"/>
     50
     51    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     52    href="../common/dhcpcd.xml"
     53    xpointer="xpointer(//*[@os='h'])"/>
    4554
    4655  </sect2>

  • BOOK/packages.ent

    r129802d r373b6ea  
    9191<!ENTITY dejagnu-home "&gnu-software;dejagnu">
    9292
    93 <!ENTITY dhcpcd-version "5.0.7">
    94 <!ENTITY dhcpcd-size "61 KB">
     93<!ENTITY dhcpcd-version "5.1.4">
     94<!ENTITY dhcpcd-size "64 KB">
    9595<!ENTITY dhcpcd-url "http://roy.marples.name/downloads/dhcpcd/dhcpcd-&dhcpcd-version;.tar.bz2">
    96 <!ENTITY dhcpcd-md5 "1c85790576deb6106879430b24e1fa9c">
     96<!ENTITY dhcpcd-md5 "d18afc66efbea9a28e541e9b10fd284f">
    9797<!ENTITY dhcpcd-home "http://roy.marples.name/projects/dhcpcd">
    9898
    … …  
    291291<!ENTITY man-pages-home "http://www.win.tue.nl/~aeb/linux/man">
    292292
    293 <!ENTITY module-init-tools-version "3.10">
    294 <!ENTITY module-init-tools-size "864 KB">
     293<!ENTITY module-init-tools-version "3.11.1">
     294<!ENTITY module-init-tools-size "200 KB">
    295295<!ENTITY module-init-tools-url "http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-&module-init-tools-version;.tar.bz2">
    296 <!ENTITY module-init-tools-md5 "fcde0344ad07c4ae2ae6b40918fd092d">
     296<!ENTITY module-init-tools-md5 "28dfcb9e24cdbeb12b99ac1eb8af7dea">
    297297<!ENTITY module-init-tools-home "http://www.kerneltools.org/KernelTools.org">
    298298
    … …  
    346346<!ENTITY procps-home "http://procps.sourceforge.net">
    347347
    348 <!ENTITY psmisc-version "22.8">
    349 <!ENTITY psmisc-size "304 KB">
     348<!ENTITY psmisc-version "22.9">
     349<!ENTITY psmisc-size "312 KB">
    350350<!ENTITY psmisc-url "&sourceforge;psmisc/psmisc-&psmisc-version;.tar.gz">
    351 <!ENTITY psmisc-md5 "32c493bb484ce605a1cabba1aa084bca">
     351<!ENTITY psmisc-md5 "c242530de46b951ab10a2237a6048a9c">
    352352<!ENTITY psmisc-home "http://psmisc.sourceforge.net">
    353353
    … …  
    359359<!ENTITY readline-home "http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html">
    360360
    361 <!ENTITY rsyslog-version "4.4.1">
    362 <!ENTITY rsyslog-size "1,951 KB">
     361<!ENTITY rsyslog-version "4.4.2">
     362<!ENTITY rsyslog-size "1,956 KB">
    363363<!ENTITY rsyslog-url "http://download.rsyslog.com/rsyslog/rsyslog-&rsyslog-version;.tar.gz">
    364 <!ENTITY rsyslog-md5 "2f298222850a098834bbf8c651a9963c">
     364<!ENTITY rsyslog-md5 "a8ada67b6cd5c00fbeb3a4b687b17359">
    365365<!ENTITY rsyslog-home "http://www.rsyslog.com/">
    366366
    … …  
    408408<!ENTITY texinfo-home "&gnu-software;texinfo">
    409409
    410 <!ENTITY udev-version "146">
    411 <!ENTITY udev-size "518 KB">
     410<!ENTITY udev-version "149">
     411<!ENTITY udev-size "532 KB">
    412412<!ENTITY udev-url "&kernel;linux/utils/kernel/hotplug/udev-&udev-version;.tar.bz2">
    413 <!ENTITY udev-md5 "b2a8acefda4fa8a70d45642035abd718">
     413<!ENTITY udev-md5 "b218bd15939e8afc6368e1907a48bb26">
    414414<!ENTITY udev-home "http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html">
    415415
Note: See TracChangeset for help on using the changeset viewer.