Changeset 90e8c97 for BOOK

Timestamp:

Apr 13, 2014, 12:07:20 PM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

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

Children:

097344e

Parents:

22da6db

Message:

Install eudev in /tools

Location:

BOOK/boot

Files:

• 64/eudev.xml (modified) (1 diff)
• common/bootscripts.xml (modified) (1 diff)
• common/eudev.xml (modified) (2 diffs)
• multilib/eudev.xml (modified) (1 diff)

BOOK/boot/64/eudev.xml

@@ -30 +30 @@
 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=/lib --bindir=/sbin --sbindir=/sbin --libdir=/lib \
+    ./configure --prefix=/tools --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --disable-introspection --disable-gtk-doc-html --disable-gudev \
     --disable-keymap --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>

BOOK/boot/common/bootscripts.xml

@@ -34 +34 @@
     -e '/ mknod_devices/d' \
     Makefile.orig > Makefile</userinput></screen>
+
+    <para os="s3">Account for udev now being in /tools:</para>
+
+<screen os="s4"><userinput>cp clfs/init.d/udev{,.orig}
+sed 's@/sbin/udev@/tools&amp;@' clfs/init.d/udev.orig > clfs/init.d/udev</userinput></screen>
 
     <para os="a">Install the package:</para>

BOOK/boot/common/eudev.xml

@@ -31 +31 @@
 <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" \
-LDFLAGS="-Wl,-rpath,/tools/lib:/lib" ./configure --prefix=/usr \
+LDFLAGS="-Wl,-rpath,/tools/lib:/lib" ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --with-rootprefix='' --enable-split-usr --sysconfdir=/etc \
-    --libexecdir=/lib --bindir=/sbin --sbindir=/sbin --libdir=/usr/lib \
-    --with-rootlibdir=/lib --disable-introspection --disable-gtk-doc-html \
+    --disable-introspection --disable-gtk-doc-html \
     --disable-gudev --disable-keymap --with-firmware-path=/lib/firmware \
     --enable-libkmod</userinput></screen>
@@ -45 +43 @@
     <para os="g">Install the package:</para>
 
-<screen os="j"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+<screen os="j"><userinput>make install</userinput></screen>
 
     <para os="i">Create a directory for storing firmware that can be

BOOK/boot/multilib/eudev.xml

@@ -30 +30 @@
 KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib64 -lkmod" \
 CC="${CC} ${BUILD64}" LDFLAGS="-Wl,-rpath,/tools/lib64:/lib64" \
-    ./configure --prefix=/usr --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} --with-rootprefix='' --enable-split-usr \
-    --sysconfdir=/etc --libexecdir=/lib64 --bindir=/sbin --sbindir=/sbin \
-    --libdir=/usr/lib64 --with-rootlibdir=/lib64 --disable-introspection \
-    --disable-gtk-doc-html --disable-gudev --disable-keymap \
+    ./configure --prefix=/tools --build=${CLFS_HOST} \
+    --host=${CLFS_TARGET} --libdir=/tools/lib64 --with-rootlibdir=/tools/lib64 \
+    --disable-introspection --disable-gtk-doc-html --disable-gudev --disable-keymap \
     --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>