Changeset 9aaf578 for BOOK/boot

Timestamp:

May 6, 2014, 5:09:26 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

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

Children:

8e02d40

Parents:

8ac4555

Message:

Tidy up ppcutils instructions

Location:

BOOK/boot

Files:

• ppc/powerpc-utils.xml (modified) (1 diff)
• ppc64-64/powerpc-utils.xml (modified) (2 diffs)
• ppc64/powerpc-utils.xml (modified) (2 diffs)

BOOK/boot/ppc/powerpc-utils.xml

@@ -31 +31 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-    <para os="a">This package's Makefile has issues with cross-compiling. Fortunately,
+    <para os="c">This package's Makefile has issues with cross-compiling. Fortunately,
     we only need one program and it is a simple task to compile it.</para>
 
-<screen><userinput>${CC} -o nvsetenv nvsetenv.c nwnvsetenv.c</userinput></screen>
+<screen os="d"><userinput>${CC} -o nvsetenv nvsetenv.c nwnvsetenv.c</userinput></screen>
 
-    <para os="c">Install the program:</para>
+    <para os="e">Install the program:</para>
 
-<screen os="d"><userinput>install -v -m755 nvsetenv /tools/sbin</userinput></screen>
+<screen os="f"><userinput>install -v -m755 nvsetenv /tools/sbin</userinput></screen>
 
   </sect2>

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

@@ -24 +24 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/powerpc-utils.xml"
+    href="../ppc/powerpc-utils.xml"
     xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr \
-  --exec-prefix="" --sysconfdir=/etc \
-  --sbindir=/sbin --libexecdir=/lib/udev \
-  --libdir=/usr/lib --with-systemdsystemunitdir=/lib/systemd/system \
-  --disable-extras --disable-introspection</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>${CC} ${BUILD64} -o nvsetenv nvsetenv.c nwnvsetenv.c</userinput></screen>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -43 +35 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
+<screen os="d"><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='d'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../ppc/powerpc-utils.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>

BOOK/boot/ppc64/powerpc-utils.xml

@@ -24 +24 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/powerpc-utils.xml"
+    href="../ppc/powerpc-utils.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/ppc/powerpc-utils.xml"
+    href="../ppc/powerpc-utils.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>${CC} ${BUILD32} -o nvsetenv nvsetenv.c nwnvsetenv.c</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -41 +35 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
+<screen os="d"><userinput>${CC} ${BUILD32} -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='d'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../ppc/powerpc-utils.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>