Changeset 229ed25 for BOOK/cross-tools/sparc/linux-headers.xml

Timestamp:

Jan 4, 2014, 12:03:38 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f90d077

Parents:

ec008670 (diff), e57ce38 (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 'master' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:

• BOOK/cross-tools/sparc/linux-headers.xml (modified) (2 diffs)

BOOK/cross-tools/sparc/linux-headers.xml

@@ -31 +31 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="c"><userinput>install -dv /tools/include
-make mrproper
+<screen os="c"><userinput>make mrproper
 make ARCH=sparc headers_check
-make ARCH=sparc INSTALL_HDR_PATH=dest headers_install
-cp -rv dest/include/* /tools/include</userinput></screen>
+make ARCH=sparc INSTALL_HDR_PATH=/tools headers_install</userinput></screen>
 
     <variablelist os="d">
@@ -53 +51 @@
 
       <varlistentry os="d3">
-        <term><parameter>make ARCH=sparc INSTALL_HDR_PATH=dest headers_install</parameter></term>
+        <term><parameter>make ARCH=sparc INSTALL_HDR_PATH=/tools headers_install</parameter></term>
         <listitem>
-          <para>Normally the headers_install target removes the entire
-          destination directory (default
-          <filename class="directory">/usr/include</filename>) before
-          installing the headers. To prevent this, we tell the kernel to
-          install the headers to a directory inside the source dir.</para>
+          <para>This will install the kernel headers into
+          <filename class="directory">/tools/include</filename>.</para>
         </listitem>
       </varlistentry>