Merge stage1 x86_64 dans trunk

[hvlinux.git] / stage2 / cis-udev

diff --git a/stage2/cis-udev b/stage2/cis-udev
index 2104875..130770e 100755 (executable)
--- a/stage2/cis-udev
+++ b/stage2/cis-udev
@@ -17,6 +17,10 @@ if [ ! -c /lib/udev/devices/null ]; then
     mknod -m0666 /lib/udev/devices/null c 1 3 || exit 1
 fi &&
 
+if [ ! -c /lib/udev/devices/kmsg ]; then
+    mknod -m0600 /lib/udev/devices/kmsg c 1 11 || exit 1
+fi &&
+
 if [ ! -h /lib/udev/devices/fd ]; then
     ln -sfv /proc/self/fd /lib/udev/devices/fd || exit 1
 fi &&
@@ -37,15 +41,19 @@ if [ ! -h /lib/udev/devices/core ]; then
     ln -sfv /proc/kcore /lib/udev/devices/core || exit 1
 fi &&
 
-make EXTRAS="`echo extras/*/`" &&
-make DESTDIR=/ EXTRAS="`echo extras/*/`" install &&
-
-# First install the commonly-used rules files provided by Udev:
-cp -v etc/udev/rules.d/[0-9]* /etc/udev/rules.d/ &&
-
-# Install the documentation that explains how to create custom Udev rules:
-#install -m644 -v docs/writing_udev_rules/index.html \
-#    /usr/share/doc/${1}/index.html &&
+cd ${LFS_TMP}/${PACKAGE} &&
+./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --sbindir=/sbin \
+    --with-rootlibdir=/lib \
+    --libexecdir=/lib/udev \
+    --docdir=/usr/share/doc/${PACKAGE} \
+    --disable-extras \
+    --disable-introspection \
+    ${CONFIGURE_OPTS} &&
+make &&
+make install &&
 
 cat > /etc/sysconfig/modules << "EOF" &&
 # Add modules that must be manually loaded in this file,
@@ -55,7 +63,6 @@ EOF
 
 chmod -v 644 /etc/sysconfig/modules &&
 
-
 ldconfig
 
 # Return last error