Changeset 6757dcab


Ignore:
Timestamp:
Mar 30, 2014, 8:40:00 PM (8 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
d560b4d
Parents:
31e77c0 (diff), ca8dde0 (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:
4 added
3 deleted
12 edited

Legend:

Unmodified
Added
Removed
  • BOOK/bootable/x86/kernel.xml

    r31e77c0 r6757dcab  
    4747    <screen role="nodump">General setup  ---&gt;
    4848  [*] open by fhandle syscalls
     49  [ ] Auditing support
    4950  [*] Control Group support
    5051Processor type and features  ---&gt;
     
    6364  Pseudo filesystems  ---&gt;
    6465    [*] Tmpfs POSIX Access Control Lists
    65     [*] Tmpfs extended attributes</screen></note>
     66    [*] Tmpfs extended attributes
     67Firmware Drivers ---&gt;
     68  EFI (Extensible Firmware Interface) Support ---&gt;
     69    &lt;*&gt; EFI Variable Support via sysfs
     70-*- Enable the block layer ---&gt;
     71  Partition Types ---&gt;
     72    [*] Advanced partition selection
     73    [*]   EFI GUID Partition support
     74Kernel Hacking ---&gt;
     75  [*] Collect scheduler debugging info
     76  [*] Collect scheduler statistics</screen></note>
    6677
    6778    <note os="kd"><para>While "The IPv6 Protocol" is not strictly required, it
    68     is highly recommended by the Systemd developers.</para></note>
     79    is highly recommended by the Systemd developers. "EFI Variable support" and
     80    "EFI GUID Partition support" are for UEFI systems. "Collect scheduler
     81    debugging info" and "Collect scheduler statistics" is for systemd-bootchart.
     82    </para></note>
    6983
    7084    <para os="h">Configure the kernel via a menu-driven interface.
  • BOOK/final-system/common/bash.xml

    r31e77c0 r6757dcab  
    2525    <title>Installation of Bash</title>
    2626
    27 <!-- Bash branch update area
    2827    <para os="p1">The following patch contains updates from the maintainer. The
    2928    maintainer of Bash only releases these patches to fix serious issues:</para>
    3029
    3130<screen os="p2"><userinput>patch -Np1 -i ../&bash-branch_update-patch;</userinput></screen>
    32 -->
    3331
    3432    <para os="a">Prepare Bash for compilation:</para>
  • BOOK/final-system/common/readline.xml

    r31e77c0 r6757dcab  
    2626    <title>Installation of Readline</title>
    2727
    28 <!-- Readline branch update patch area
    2928    <para os="p1">The following patch contains updates from the maintainer. The
    3029    maintainer of Readline only releases these patches to fix serious issues:</para>
    3130
    3231<screen os="p2"><userinput>patch -Np1 -i ../&readline-branch_update-patch;</userinput></screen>
    33 -->
    3432
    3533    <para os="a">Prepare Readline for compilation:</para>
  • BOOK/final-system/multilib/bash.xml

    r31e77c0 r6757dcab  
    2222    <title>Installation of Bash</title>
    2323
    24 <!-- Bash branch update area
    2524    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2625    href="../common/bash.xml"
     
    3029    href="../common/bash.xml"
    3130    xpointer="xpointer(//*[@os='p2'])"/>
    32 -->
    3331
    3432    <para os="m1">The following sed points configure towards the correct
  • BOOK/final-system/multilib/readline-64bit.xml

    r31e77c0 r6757dcab  
    2222    <title>Installation of Readline</title>
    2323
    24 <!-- Readline branch update area
    2524    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2625    href="readline.xml"
     
    3029    href="readline.xml"
    3130    xpointer="xpointer(//*[@os='p2'])"/>
    32 -->
    3331
    3432    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/final-system/multilib/readline-n32.xml

    r31e77c0 r6757dcab  
    2323    <title>Installation of Readline</title>
    2424
    25 <!--
    2625    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2726    href="readline.xml"
     
    3130    href="readline.xml"
    3231    xpointer="xpointer(//*[@os='p2'])"/>
    33 -->
    3432
    3533    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/final-system/multilib/readline.xml

    r31e77c0 r6757dcab  
    2323    <title>Installation of Readline</title>
    2424
    25 <!--
    2625    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2726    href="../common/readline.xml"
     
    3130    href="../common/readline.xml"
    3231    xpointer="xpointer(//*[@os='p2'])"/>
    33 -->
    3432
    3533    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/introduction/common/changelog.xml

    r31e77c0 r6757dcab  
    5757          <para>[William Harrington] - Update DHCPCD to 6.3.2.</para>
    5858        </listitem>
     59        <listitem>
     60          <para>[William Harrington] - Update VIM 7.4 patch to level 229.</para>
     61        </listitem>
     62        <listitem>
     63          <para>[William Harrington] - Update Bash 4.3 patch to level 8.</para>
     64        </listitem>
     65        <listitem>
     66          <para>[William Harrington] - Update Readline 6.3 patch to level 3.</para>
     67        </listitem>
     68        <listitem>
     69          <para>[William Harrington] - Update GCC 4.8.2 branch update patch to
     70          revision 208943.</para>
     71        </listitem>
    5972      </itemizedlist>
    6073    </listitem>
  • BOOK/materials/common/patches.xml

    r31e77c0 r6757dcab  
    1919  <variablelist role="materials">
    2020
    21 <!-- Bash branch update area
    2221    <varlistentry>
    2322      <term>Bash Branch Update Patch - <token>&bash-branch_update-patch-size;</token>:</term>
     
    2827      </listitem>
    2928    </varlistentry>
    30 -->
    3129
    3230<!-- Binutils branch update area
     
    131129    </varlistentry>
    132130
    133 <!-- Readline branc update area
    134131    <varlistentry>
    135132      <term>Readline Branch Update - <token>&readline-branch_update-patch-size;</token>:</term>
     
    140137      </listitem>
    141138    </varlistentry>
    142 -->
    143139
    144140    <varlistentry>
  • BOOK/patches.ent

    r31e77c0 r6757dcab  
    55<!-- Start of Common Patches -->
    66
    7 <!-- Bash branch update area
    8 <!ENTITY bash-branch_update-patch "bash-&bash-version;-branch_update-7.patch">
    9 <!ENTITY bash-branch_update-patch-md5 "4dfb1ce9b5d0040eae06e66157ab213a">
    10 <!ENTITY bash-branch_update-patch-size "58 KB">
    11 -->
     7<!ENTITY bash-branch_update-patch "bash-&bash-version;-branch_update-1.patch">
     8<!ENTITY bash-branch_update-patch-md5 "a0ae18e2dc5c9c5e125e0ea3fa6febbe">
     9<!ENTITY bash-branch_update-patch-size "9.002 KB">
    1210
    1311<!-- Binutils branch update area
     
    3028
    3129<!-- GCC branch update area -->
    32 <!ENTITY gcc-branch_update-patch "gcc-&gcc-version;-branch_update-1.patch">
    33 <!ENTITY gcc-branch_update-patch-md5 "7739dbf68ba5736cbf4676f30b358e74">
    34 <!ENTITY gcc-branch_update-patch-size "258 KB">
     30<!ENTITY gcc-branch_update-patch "gcc-&gcc-version;-branch_update-2.patch">
     31<!ENTITY gcc-branch_update-patch-md5 "30b9b9e35cb742edf380b0c05c9a5879">
     32<!ENTITY gcc-branch_update-patch-size "1,964 KB">
    3533
    3634<!ENTITY iana-etc-numbers_update-date "20140202">
     
    6361<!ENTITY perl-libc-patch-size "1.657 KB">
    6462
    65 <!-- Readline branch update area
    66 <!ENTITY readline-branch_update-patch "readline-&readline-version;-branch_update-3.patch">
    67 <!ENTITY readline-branch_update-patch-md5 "af788f5b1cfc5db9efc9e0fa0268a574">
    68 <!ENTITY readline-branch_update-patch-size "4.9 KB">
    69 -->
     63<!ENTITY readline-branch_update-patch "readline-&readline-version;-branch_update-1.patch">
     64<!ENTITY readline-branch_update-patch-md5 "dbb0a021abfd0a0012b62c66e6943802">
     65<!ENTITY readline-branch_update-patch-size "1.920 KB">
    7066
    7167<!ENTITY systemd-compat-patch "systemd-&systemd-version;-compat-1.patch">
     
    7975<!-- Vim branch update patch area -->
    8076
    81 <!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-1.patch">
    82 <!ENTITY vim-branch_update-patch-md5 "b5fdb7f4e4cc27932a9183c8e289029d">
    83 <!ENTITY vim-branch_update-patch-size "460 KB">
     77<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-2.patch">
     78<!ENTITY vim-branch_update-patch-md5 "aa2e7384582ddd94ce7e5d91bebce78f">
     79<!ENTITY vim-branch_update-patch-size "2,740 KB">
    8480
    8581<!-- Start of multilib patches -->
  • BOOK/temp-system/common/bash.xml

    r31e77c0 r6757dcab  
    2323    <title>Installation of Bash</title>
    2424
    25 <!-- Bash branch update area
    2625    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2726    href="../../final-system/common/bash.xml"
     
    3130    href="../../final-system/common/bash.xml"
    3231    xpointer="xpointer(//*[@os='p2'])"/>
    33 -->
    3432
    3533    <para os="t1">When Bash is cross-compiled, it cannot test for the presence
  • BOOK/temp-system/multilib/bash.xml

    r31e77c0 r6757dcab  
    2323    <title>Installation of Bash</title>
    2424
    25 <!-- Bash branch update area
    2625    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2726    href="../common/bash.xml"
     
    3130    href="../common/bash.xml"
    3231    xpointer="xpointer(//*[@os='p2'])"/>
    33 -->
    3432
    3533    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.