Changeset 43100c0


Ignore:
Timestamp:
Feb 3, 2014, 3:21:44 AM (10 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
4340580
Parents:
849369d (diff), 961afdcd (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

Files:
1 added
2 deleted
17 edited

Legend:

Unmodified
Added
Removed

  • BOOK/boot/common/pwdgroup.xml

    r849369d r43100c0  
    3838  <variablelist os="c">
    3939 
    40     <title>Additional users you may want to add:</title>
     40    <title>Additional users you may want to add if not already included:</title>
    4141
    4242    <varlistentry>
    … …  
    122122  <variablelist os="d">
    123123
    124     <title>Additional groups you may want to add</title>
     124    <title>Additional groups you may want to add if not already included:</title>
    125125
    126126    <varlistentry>

  • BOOK/chroot/common/pwdgroup.xml

    r849369d r43100c0  
    2828<screen><userinput>cat &gt; /etc/passwd &lt;&lt; "EOF"
    2929<literal>root:x:&uid-root;:&gid-root;:root:/root:/bin/bash</literal>
     30<literal>bin:x:&uid-bin;:*gid-bin;:/dev/null:/bin/false</literal>
     31<literal>daemon:x:&uid-daemon;:&gid-daemon;:/dev/null:/bin/false</literal>
    3032<literal>messagebus:x:&uid-messagebus;:&gid-messagebus;:D-Bus Message Daemon User:/dev/null:/bin/false</literal>
     33<literal>nobody:x:&uid-nobody;:&gid-nobody;:Unprivileged User:/dev/null:/bin/false</literal>
    3134EOF</userinput></screen>
    3235
    … …  
    5962usb:x:&gid-usb;:
    6063cdrom:x:&gid-cdrom;:
     64adm:x:&gid-adm;:
    6165messagebus:x:&gid-messagebus;:
    62 systemd-journal:x:&gid-systemd-journal;</literal>
     66systemd-journal:x:&gid-systemd-journal;:
     67mail:x:&gid-mail;:
     68wheel:x:&gid-wheel;:
     69nogroup:x:&gid-nogroup;:</literal>
    6370EOF</userinput></screen>
    6471

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

    r849369d r43100c0  
    2525  <sect2 role="installation">
    2626    <title>Installation of Diffutils</title>
     27
     28    <para os="s1">"Fix a file so locale files are installed:"</para>
     29
     30<screen os="s2"><userinput>sed -i 's:= @mkdir_p@:= /bin/mkdir -p:' po/Makefile.in.in</userinput></screen>
    2731
    2832    <para os="a">Prepare Diffutils for compilation:</para>

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

    r849369d r43100c0  
    3333<screen os="d"><userinput>make</userinput></screen>
    3434
    35     <para os="e">To test the results, issue:
    36     <userinput>make check</userinput>.</para>
     35    <para os="e">To test the results, issue:</para>
     36
     37<screen os="e2"><userinput remap="test">make check</userinput></screen>
    3738
    3839    <para os="f">Install the package:</para>

  • BOOK/final-system/common/iana-etc.xml

    r849369d r43100c0  
    2626    <title>Installation of Iana-Etc</title>
    2727
    28     <note os="p1">
    29       <para>This package has the option of downloading updated data when internet access is available. If /etc/resolv.conf has a nameserver entry and internet access is available at this step, then apply the IANA get patch and get the updated data:
    30 <screen><command>patch -Np1 -i ../&iana-etc-get_fix-patch;</command>
    31 <command>make get</command></screen>
    32 Do not apply the following patch.</para>
    33     </note>
     28    <para os="p2">The following patch updates the services and protocol xml files:</para>
    3429
    35     <para os="p2">The following patch updates the services and protocol files:</para>
    36 
    37 <screen os="p3"><userinput>patch -Np1 -i ../&iana-etc-numbers_update-patch;</userinput></screen>
     30<screen os="p3"><userinput>xzcat ../&iana-etc-numbers_update-patch; | patch -Np1 -i -</userinput></screen>
    3831
    3932    <para os="a">The following command converts the raw data provided by IANA into
    … …  
    4134    <filename>/etc/services</filename> data files:</para>
    4235
    43 <screen os="b"><userinput>make</userinput></screen>
     36<screen os="b"><userinput>make get &amp;&amp;
     37make</userinput></screen>
    4438
    4539    <para os="c">This package does not come with a test suite.</para>

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

    r849369d r43100c0  
    2929    href="bzip2.xml"
    3030    xpointer="xpointer(//*[@os='s2'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     33    href="../common/bzip2.xml"
     34    xpointer="xpointer(//*[@os='s3'])"/>
     35
     36    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     37    href="../common/bzip2.xml"
     38    xpointer="xpointer(//*[@os='s4'])"/>
    3139
    3240    <para os="m1">We need to change the default lib path

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

    r849369d r43100c0  
    3030    href="bzip2.xml"
    3131    xpointer="xpointer(//*[@os='s2'])"/>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../common/bzip2.xml"
     35    xpointer="xpointer(//*[@os='s3'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../common/bzip2.xml"
     39    xpointer="xpointer(//*[@os='s4'])"/>
    3240
    3341    <para os="m1">We need to change the default lib path

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

    r849369d r43100c0  
    3030    href="../common/bzip2.xml"
    3131    xpointer="xpointer(//*[@os='s2'])"/>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../common/bzip2.xml"
     35    xpointer="xpointer(//*[@os='s3'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../common/bzip2.xml"
     39    xpointer="xpointer(//*[@os='s4'])"/>
    3240
    3341    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r849369d r43100c0  
    2121  <sect2 role="installation">
    2222    <title>Installation of Diffutils</title>
     23
     24    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     25    href="../common/diffutils.xml"
     26    xpointer="xpointer(//*[@os='s1'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/diffutils.xml"
     30    xpointer="xpointer(//*[@os='s2'])"/>
    2331
    2432    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r849369d r43100c0  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    29     --libdir=/usr/lib64</userinput></screen>
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure \
     29    --prefix=/usr --libdir=/usr/lib64</userinput></screen>
    3030
    3131  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4040    href="../common/expat.xml"
    4141    xpointer="xpointer(//*[@os='e'])"/>
     42
     43  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     44    href="../common/expat.xml"
     45    xpointer="xpointer(//*[@os='e2'])"/>
    4246
    4347  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r849369d r43100c0  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
    30     --libdir=/usr/lib32</userinput></screen>
     29<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
     30    ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
    3131
    3232  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4141    href="../common/expat.xml"
    4242    xpointer="xpointer(//*[@os='e'])"/>
     43
     44  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     45    href="../common/expat.xml"
     46    xpointer="xpointer(//*[@os='e2'])"/>
    4347
    4448  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r849369d r43100c0  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr \
    30     --libdir=/usr/lib</userinput></screen>
     29<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" ./configure \
     30    --prefix=/usr --libdir=/usr/lib</userinput></screen>
    3131
    3232  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4141    href="../common/expat.xml"
    4242    xpointer="xpointer(//*[@os='e'])"/>
     43
     44  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     45    href="../common/expat.xml"
     46    xpointer="xpointer(//*[@os='e2'])"/>
    4347
    4448  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/general.ent

    r849369d r43100c0  
    11<?xml version="1.0" encoding="ISO-8859-1"?>
    22
    3 <!ENTITY month "01"> <!-- Use two digits -->
    4 <!ENTITY month_name "January">
    5 <!ENTITY day "29"> <!-- Use two digits -->
     3<!ENTITY month "02"> <!-- Use two digits -->
     4<!ENTITY month_name "February">
     5<!ENTITY day "02"> <!-- Use two digits -->
    66<!ENTITY year "2014"> <!-- Use four digits -->
    77

  • BOOK/introduction/common/changelog.xml

    r849369d r43100c0  
    3838
    3939    <listitem>
     40      <para>02 February 2014</para>
     41      <itemizedlist>
     42        <listitem>
     43          <para>[William Harrington] - Remove note in Iana-etc page and update iana-etc update numbers patch for proper operation with current iana-etc format.</para>
     44        </listitem>
     45      </itemizedlist>
     46    </listitem>
     47
     48    <listitem>
    4049      <para>29 January 2014</para>
    4150      <itemizedlist>

  • BOOK/materials/common/patches.xml

    r849369d r43100c0  
    6363        url="&patches-root;&gcc-branch_update-patch;"/></para>
    6464        <para>MD5 sum: <literal>&gcc-branch_update-patch-md5;</literal></para>
    65       </listitem>
    66     </varlistentry>
    67 
    68     <varlistentry>
    69       <term>Iana-Etc Get Fix Patch - <token>&iana-etc-get_fix-patch-size;</token>:</term>
    70       <listitem>
    71         <para>Download: <ulink
    72         url="&patches-root;&iana-etc-get_fix-patch;"/></para>
    73         <para>MD5 sum: <literal>&iana-etc-get_fix-patch-md5;</literal></para>
    7465      </listitem>
    7566    </varlistentry>

  • BOOK/patches.ent

    r849369d r43100c0  
    3232<!ENTITY gcc-branch_update-patch-size "258 KB">
    3333
    34 <!ENTITY iana-etc-get_fix-patch "iana-etc-&iana-etc-version;-get_fix-1.patch">
    35 <!ENTITY iana-etc-get_fix-patch-md5 "73aee2dc34cf4d990cc22fe323d89f27">
    36 <!ENTITY iana-etc-get_fix-patch-size "1.1 KB">
    37 
    38 <!ENTITY iana-etc-numbers_update-date "20120610">
    39 <!ENTITY iana-etc-numbers_update-patch "iana-etc-&iana-etc-version;-numbers_update-&iana-etc-numbers_update-date;-2.patch">
    40 <!ENTITY iana-etc-numbers_update-patch-md5 "826fb780d13caafb7cb99b9c346f2102">
    41 <!ENTITY iana-etc-numbers_update-patch-size "3,760 KB">
     34<!ENTITY iana-etc-numbers_update-date "20140202">
     35<!ENTITY iana-etc-numbers_update-patch "iana-etc-&iana-etc-version;-numbers_update-&iana-etc-numbers_update-date;-1.patch.xz">
     36<!ENTITY iana-etc-numbers_update-patch-md5 "ba775a859b515c1cc5d88251df0a0f8b">
     37<!ENTITY iana-etc-numbers_update-patch-size "288 KB">
    4238
    4339<!ENTITY iputils-fixes-patch "iputils-&iputils-version;-fixes-1.patch">

  • BOOK/users_groups.ent

    r849369d r43100c0  
    4040<!ENTITY gid-mail "30">
    4141<!ENTITY gid-news "31">
     42<!ENTITY gid-wheel "39">
    4243<!ENTITY gid-users "1000">
    4344<!ENTITY gid-nogroup "65533">
Note: See TracChangeset for help on using the changeset viewer.