[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.1.0-727-g097344e
git
git at cross-lfs.org
Sun Apr 13 12:10:59 PDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, systemd has been updated
via 097344e9438ca1cd125962a881ed199387219de2 (commit)
via 90e8c97f2801c08e9a686a5a61052f7750c64fb6 (commit)
via 22da6db43ec6a1d23bd119fe39fb559d210c26d9 (commit)
from 473d4fe5ce055bfb2e4c374b94cf326ebe1da9bb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 097344e9438ca1cd125962a881ed199387219de2
Author: Chris Staub <chris at beaker67.com>
Date: Sun Apr 13 15:10:54 2014 -0400
Install eudev in /tools
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index e28ae6b..50ab521 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,17 @@
-->
<listitem>
+ <para>13 April 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[Chris] - Updated most packages in the Boot section to install
+ into /tools instead of $CLFS. Thanks to Martin Ward and
+ William Harrington for assistance.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>12 April 2014</para>
<itemizedlist>
<listitem>
commit 90e8c97f2801c08e9a686a5a61052f7750c64fb6
Author: Chris Staub <chris at beaker67.com>
Date: Sun Apr 13 15:07:20 2014 -0400
Install eudev in /tools
diff --git a/BOOK/boot/64/eudev.xml b/BOOK/boot/64/eudev.xml
index 3699af0..a275bd7 100644
--- a/BOOK/boot/64/eudev.xml
+++ b/BOOK/boot/64/eudev.xml
@@ -29,9 +29,7 @@
<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=/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>
diff --git a/BOOK/boot/common/bootscripts.xml b/BOOK/boot/common/bootscripts.xml
index 891cd6e..3da69dd 100644
--- a/BOOK/boot/common/bootscripts.xml
+++ b/BOOK/boot/common/bootscripts.xml
@@ -34,6 +34,11 @@ sed -e '/^install-minimal/s/ udev_device_dirs udev_device_links//' \
-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&@' clfs/init.d/udev.orig > clfs/init.d/udev</userinput></screen>
+
<para os="a">Install the package:</para>
<screen os="b"><userinput>make DESTDIR=${CLFS} install-minimal</userinput></screen>
diff --git a/BOOK/boot/common/eudev.xml b/BOOK/boot/common/eudev.xml
index bb22520..3abd568 100644
--- a/BOOK/boot/common/eudev.xml
+++ b/BOOK/boot/common/eudev.xml
@@ -30,11 +30,9 @@
<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>
@@ -44,7 +42,7 @@ LDFLAGS="-Wl,-rpath,/tools/lib:/lib" ./configure --prefix=/usr \
<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
loaded by <command>udev</command>:</para>
diff --git a/BOOK/boot/multilib/eudev.xml b/BOOK/boot/multilib/eudev.xml
index e73b017..4c6d15e 100644
--- a/BOOK/boot/multilib/eudev.xml
+++ b/BOOK/boot/multilib/eudev.xml
@@ -29,11 +29,9 @@
<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" \
- ./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>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
commit 22da6db43ec6a1d23bd119fe39fb559d210c26d9
Author: Chris Staub <chris at beaker67.com>
Date: Sun Apr 13 15:06:28 2014 -0400
Install GRUB entirely in /tools
diff --git a/BOOK/boot/64/grub-build.xml b/BOOK/boot/64/grub-build.xml
index 1685c4b..f3e084c 100644
--- a/BOOK/boot/64/grub-build.xml
+++ b/BOOK/boot/64/grub-build.xml
@@ -40,7 +40,7 @@
<screen os="ab"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
- --sysconfdir=/etc --disable-werror --enable-grub-mkfont=no</userinput></screen>
+ --disable-werror --enable-grub-mkfont=no</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../x86/grub-build.xml"
@@ -62,7 +62,9 @@
href="../../final-system/x86/grub.xml"
xpointer="xpointer(//*[@os='f'])"/>
-<screen os="ag"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86/grub-build.xml"
+ xpointer="xpointer(//*[@os='ag'])"/>
</sect2>
diff --git a/BOOK/boot/multilib/grub-build.xml b/BOOK/boot/multilib/grub-build.xml
index 5162d36..04aa883 100644
--- a/BOOK/boot/multilib/grub-build.xml
+++ b/BOOK/boot/multilib/grub-build.xml
@@ -40,7 +40,7 @@
<screen os="ab"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
- --sysconfdir=/etc --libdir=/tools/lib64 --disable-werror \
+ --libdir=/tools/lib64 --disable-werror \
--enable-grub-mkfont=no</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -63,7 +63,9 @@
href="../../final-system/x86/grub.xml"
xpointer="xpointer(//*[@os='f'])"/>
-<screen os="ag"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86/grub-build.xml"
+ xpointer="xpointer(//*[@os='ag'])"/>
</sect2>
diff --git a/BOOK/boot/x86/grub-build.xml b/BOOK/boot/x86/grub-build.xml
index 01a6636..480d2aa 100644
--- a/BOOK/boot/x86/grub-build.xml
+++ b/BOOK/boot/x86/grub-build.xml
@@ -40,7 +40,7 @@
<screen os="ab"><userinput>./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
- --sysconfdir=/etc --disable-werror --enable-grub-mkfont=no</userinput></screen>
+ --disable-werror --enable-grub-mkfont=no</userinput></screen>
<para os="b">The meaning of the new configure option:</para>
@@ -65,7 +65,7 @@
href="../../final-system/x86/grub.xml"
xpointer="xpointer(//*[@os='f'])"/>
-<screen os="ag"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+<screen os="ag"><userinput>make install</userinput></screen>
</sect2>
-----------------------------------------------------------------------
Summary of changes:
BOOK/boot/64/eudev.xml | 4 +---
BOOK/boot/64/grub-build.xml | 6 ++++--
BOOK/boot/common/bootscripts.xml | 5 +++++
BOOK/boot/common/eudev.xml | 8 +++-----
BOOK/boot/multilib/eudev.xml | 8 +++-----
BOOK/boot/multilib/grub-build.xml | 6 ++++--
BOOK/boot/x86/grub-build.xml | 4 ++--
BOOK/introduction/common/changelog.xml | 11 +++++++++++
8 files changed, 33 insertions(+), 19 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list