Ignore:
Timestamp:
Apr 20, 2014, 8:57:39 AM (11 years ago)
Author:
Chris Staub <chris@…>
Children:
0be79ea
Parents:
88ef769 (diff), 578ca586 (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' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/temp-system/common/coreutils.xml

    r88ef769 r03e6a40  
    3333EOF</userinput></screen>
    3434
     35    <para os="p1">Apply a patch to prevent Coreutils from generating manpages :</para>
     36
     37<screen os="p2"><userinput>patch -Np1 -i ../&coreutils-noman-patch;</userinput></screen>
     38
    3539    <para os="bd">Prepare Coreutils for compilation:</para>
    3640
    … …  
    5155
    5256    </variablelist>
    53 
    54     <para os="s1">Apply a sed to allow completion of the build:</para>
    55 
    56 <screen os="s2"><userinput>cp -v Makefile{,.orig}
    57 sed -e 's/^#run_help2man\|^run_help2man/#&amp;/' \
    58   -e 's/^\##run_help2man/run_help2man/' Makefile.orig > Makefile</userinput></screen>
    5957
    6058   <para os="bf">Compile the package:</para>
Note: See TracChangeset for help on using the changeset viewer.