Changeset 229ed25 for BOOK/boot/ppc64-64

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

Location:

BOOK/boot/ppc64-64

Files:

• powerpc-utils.xml (moved) (moved from BOOK/final-system/multilib/udev.xml ) (3 diffs)
• yaboot-build.xml (added)

BOOK/boot/ppc64-64/powerpc-utils.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-system-udev-32" role="wrap">
-  <?dbhtml filename="udev.html"?>
+<sect1 id="ch-boot-powerpc-utils" role="wrap">
+  <?dbhtml filename="powerpc-utils.html"?>
 
-  <title>Udev-&udev-version; 32 Bit Libraries</title>
+  <title>Powerpc-Utils_&powerpcutils-version;</title>
 
-  <indexterm zone="ch-system-udev-32">
-    <primary sortas="a-Udev">Udev 32 Bit Libraries</primary>
-    <secondary>32 Bit</secondary>
+  <indexterm zone="ch-boot-powerpc-utils">
+    <primary sortas="a-Powerpc-Utils">Powerpc-Utils</primary>
+    <secondary>boot</secondary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/udev.xml"
+  href="../../final-system/ppc/powerpc-utils.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation of Udev</title>
+    <title>Installation of Powerpc-Utils</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
+    href="../../final-system/ppc/powerpc-utils.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
@@ -34 +34 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
+    href="../ppc/powerpc-utils.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen><userinput>${CC} ${BUILD64} -o nvsetenv nvsetenv.c nwnvsetenv.c</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../ppc/powerpc-utils.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
+    href="../ppc/powerpc-utils.xml"
     xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
@@ -54 +52 @@
     <title/>
 
-    <para>Details on this package are located in <xref
-    linkend="contents-udev" role="."/></para>
+    <para>Details on this package are located in <xref linkend="contents-powerpc-utils" role="."/></para>
 
   </sect2>
+
 </sect1>
-