Changeset 473d4fe for BOOK/boot

Timestamp:

Apr 13, 2014, 3:10:07 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

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

Children:

22da6db

Parents:

6ed3b08

Message:

Removed extra eudev file

Location:

BOOK/boot

Files:

• 64/eudev.xml (modified) (3 diffs)
• mips64-64-chapter.xml (modified) (1 diff)
• ppc64-64-chapter.xml (modified) (1 diff)
• sparc64-64-chapter.xml (modified) (1 diff)
• x86_64-64-chapter.xml (modified) (1 diff)
• x86_64-64/eudev.xml (deleted)

BOOK/boot/64/eudev.xml

@@ -27 +27 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib64 -lblkid" \
-KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib64 -lkmod" \
-CC="${CC} ${BUILD64}" LDFLAGS="-Wl,-rpath,/tools/lib64:/lib64" \
+<screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib -lblkid" \
+KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib -lkmod" \
+CC="${CC} ${BUILD64}" LDFLAGS="-Wl,-rpath,/tools/lib:/lib" \
     ./configure --prefix=/usr --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --with-rootprefix='' --enable-split-usr --sysconfdir=/etc \
-    --libexecdir=/lib64 --bindir=/sbin --sbindir=/sbin --libdir=/lib64 \
+    --libexecdir=/lib --bindir=/sbin --sbindir=/sbin --libdir=/lib \
     --disable-introspection --disable-gtk-doc-html --disable-gudev \
     --disable-keymap --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
@@ -54 +54 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eudev.xml"
     xpointer="xpointer(//*[@os='r1'])"/>
 
@@ -60 +68 @@
     xpointer="xpointer(//*[@os='r2'])"/>
 
- </sect2>
+  </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/boot/mips64-64-chapter.xml

@@ -20 +20 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/kernel.xml"/>

BOOK/boot/ppc64-64-chapter.xml

@@ -19 +19 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/kernel.xml"/>

BOOK/boot/sparc64-64-chapter.xml

@@ -19 +19 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/elftoaout.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>

BOOK/boot/x86_64-64-chapter.xml

@@ -19 +19 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/eudev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/eudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/kernel.xml"/>