[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. cf7616fd617e3e209eff29f3c6641e93aa7e0dad
git
git at cross-lfs.org
Fri Sep 7 11:33:53 PDT 2012
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, master has been updated
via cf7616fd617e3e209eff29f3c6641e93aa7e0dad (commit)
from ba7a62c179d1046a4a0477810ef8e9f6ebfd9062 (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 cf7616fd617e3e209eff29f3c6641e93aa7e0dad
Author: William Harrington <kb0iic at gmail.com>
Date: Fri Sep 7 13:33:49 2012 -0500
Tidy up udev xml and kmod
diff --git a/BOOK/boot/64/udev.xml b/BOOK/boot/64/udev.xml
index 496e00c..003376f 100644
--- a/BOOK/boot/64/udev.xml
+++ b/BOOK/boot/64/udev.xml
@@ -28,15 +28,12 @@
<screen os="b"><userinput>CC="${CC} ${BUILD64}" LIBS="-lpthread" \
BLKID_CFLAGS="-I/tools/include/blkid" BLKID_LIBS="-L/tools/lib64 -lblkid" \
- KMOD_CFLAGS="-I/tools/include" KMOD_LIBS="-L${CLFS}/lib64 -lkmod" \
- ./configure --prefix=/usr \
- --build=${CLFS_HOST} --host=${CLFS_TARGET} \
- --with-rootprefix=$CLFS --bindir=/sbin \
- --sysconfdir=/etc \
- --libdir=/usr/lib64 --disable-introspection \
- --with-usb-ids-path=no --with-pci-ids-path=no \
- --disable-gtk-doc-html --disable-gudev \
- --disable-keymap --disable-logging</userinput></screen>
+ KMOD_CFLAGS="-I/tools/include" KMOD_LIBS="-L${CLFS}/lib64 -lkmod" \
+ ./configure --prefix=/usr --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+ --with-rootprefix='' --bindir=/sbin --sysconfdir=/etc --libdir=/usr/lib64 \
+ --disable-introspection --with-usb-ids-path=no --with-pci-ids-path=no \
+ --disable-gtk-doc-html --disable-gudev --disable-keymap --disable-logging \
+ --with-firmware-path=/lib/firmware</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/udev.xml"
diff --git a/BOOK/boot/common/udev.xml b/BOOK/boot/common/udev.xml
index 1a10aa8..17ad43a 100644
--- a/BOOK/boot/common/udev.xml
+++ b/BOOK/boot/common/udev.xml
@@ -27,15 +27,13 @@
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>LIBS="-lpthread" \
- BLKID_CFLAGS="-I/tools/include/blkid" BLKID_LIBS="-L/tools/lib -lblkid" \
- KMOD_CFLAGS="-I/tools/include" KMOD_LIBS="-L${CLFS}/lib -lkmod" \
- ./configure --prefix=/usr \
- --build=${CLFS_HOST} --host=${CLFS_TARGET} \
- --with-rootprefix=$CLFS --bindir=/sbin \
- --sysconfdir=/etc --libexecdir=/lib \
- --disable-introspection --with-usb-ids-path=no --with-pci-ids-path=no \
- --disable-gtk-doc-html --disable-gudev \
- --disable-keymap --disable-logging</userinput></screen>
+ BLKID_CFLAGS="-I/tools/include/blkid" BLKID_LIBS="-L/tools/lib -lblkid" \
+ KMOD_CFLAGS="-I/tools/include" KMOD_LIBS="-L${CLFS}/lib -lkmod" \
+ ./configure --prefix=/usr --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+ --with-rootprefix=$CLFS --bindir=/sbin --sysconfdir=/etc --libexecdir=/lib \
+ --disable-introspection --with-usb-ids-path=no --with-pci-ids-path=no \
+ --disable-gtk-doc-html --disable-gudev --disable-keymap --disable-logging \
+ --with-firmware-path=/lib/firmware</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/udev.xml"
diff --git a/BOOK/boot/multilib/kmod.xml b/BOOK/boot/multilib/kmod.xml
index 146d931..3d7d4bb 100644
--- a/BOOK/boot/multilib/kmod.xml
+++ b/BOOK/boot/multilib/kmod.xml
@@ -27,7 +27,8 @@
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
- --bindir=/bin --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+ --bindir=/bin --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+ --libdir=/tools/lib64</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/kmod.xml"
diff --git a/BOOK/boot/multilib/udev.xml b/BOOK/boot/multilib/udev.xml
index 897ddd0..52c3550 100644
--- a/BOOK/boot/multilib/udev.xml
+++ b/BOOK/boot/multilib/udev.xml
@@ -27,16 +27,14 @@
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>CC="${CC} ${BUILD64}" LIBS="-lpthread" \
- BLKID_CFLAGS="-I/tools/include/blkid" BLKID_LIBS="-L/tools/lib64 -lblkid" \
- KMOD_CFLAGS="-I/tools/include" KMOD_LIBS="-L${CLFS}/lib64 -lkmod" \
- ./configure --prefix=/usr \
- --build=${CLFS_HOST} --host=${CLFS_TARGET} \
- --with-rootprefix=$CLFS --bindir=/sbin \
- --sysconfdir=/etc --libexecdir=/lib \
- --libdir=/usr/lib64 --disable-introspection \
- --with-usb-ids-path=no --with-pci-ids-path=no \
- --disable-gtk-doc-html --disable-gudev \
- --disable-keymap --disable-logging</userinput></screen>
+ BLKID_CFLAGS="-I/tools/include/blkid" BLKID_LIBS="-L/tools/lib64 -lblkid" \
+ KMOD_CFLAGS="-I/tools/include" KMOD_LIBS="-L${CLFS}/lib64 -lkmod" \
+ ./configure --prefix=/usr --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+ --with-rootprefix='' --bindir=/sbin --sysconfdir=/etc --libexecdir=/lib \
+ --libdir=/usr/lib64 --disable-introspection \
+ --with-usb-ids-path=no --with-pci-ids-path=no \
+ --disable-gtk-doc-html --disable-gudev --disable-keymap --disable-logging \
+ --with-firmware-path=/lib/firmware</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/udev.xml"
diff --git a/BOOK/boot/x86_64-64/udev.xml b/BOOK/boot/x86_64-64/udev.xml
index 4dfa84a..e2b5e01 100644
--- a/BOOK/boot/x86_64-64/udev.xml
+++ b/BOOK/boot/x86_64-64/udev.xml
@@ -31,12 +31,10 @@
KMOD_CFLAGS="-I/tools/include" KMOD_LIBS="-L${CLFS}/lib -lkmod" \
./configure --prefix=/usr \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
- --with-rootprefix= --bindir=/sbin \
- --sysconfdir=/etc \
- --libexecdir=/lib --disable-introspection \
- --with-usb-ids-path=no --with-pci-ids-path=no \
- --disable-gtk-doc-html --disable-gudev \
- --disable-keymap --disable-logging --with-firmware-path=/lib/firmware</userinput></screen>
+ --with-rootprefix='' --bindir=/sbin --sysconfdir=/etc --libexecdir=/lib \
+ --disable-introspection --with-usb-ids-path=no --with-pci-ids-path=no \
+ --disable-gtk-doc-html --disable-gudev --disable-keymap --disable-logging \
+ --with-firmware-path=/lib/firmware</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/udev.xml"
-----------------------------------------------------------------------
Summary of changes:
BOOK/boot/64/udev.xml | 15 ++++++---------
BOOK/boot/common/udev.xml | 16 +++++++---------
BOOK/boot/multilib/kmod.xml | 3 ++-
BOOK/boot/multilib/udev.xml | 18 ++++++++----------
BOOK/boot/x86_64-64/udev.xml | 10 ++++------
5 files changed, 27 insertions(+), 35 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list