Die IDE/SCSI/SATA/USB-Erkennung erstellt nun schoene Ramdisks :D

[people/pmueller/ipfire-2.x.git] / lfs / udev

diff --git a/lfs/udev b/lfs/udev
index d34949b736284c05b182a66cf9a319dcc0462c00..ca5bad7a4f5a9b36a82f1ef4a64066a5761c4b45 100644 (file)
--- a/lfs/udev
+++ b/lfs/udev
@@ -34,9 +34,13 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 ifeq "$(LFS_PASS)" "install"
        TARGET     = $(DIR_INFO)/$(THISAPP)-install
+else
+ifeq "$(KLIBC)" "1"
+       TARGET     = $(DIR_INFO)/$(THISAPP)-klibc
 else
        TARGET     = $(DIR_INFO)/$(THISAPP)
 endif
+endif
 
 ###############################################################################
 # Top-level Rules
@@ -82,7 +86,7 @@ ifeq "$(LFS_PASS)" "install"
        cd $(DIR_APP) && make DESTDIR=/install/initrd sbindir=/sbin udevdir=/dev
        cd $(DIR_APP) && make DESTDIR=/install/initrd sbindir=/sbin udevdir=/dev install
        rm -f /install/initrd/sbin/udev* /install/initrd/usr/sbin/udev* /install/initrd/usr/bin/udev*
-       cd $(DIR_APP) && install udevstart udevinfo /install/initrd/sbin
+       cd $(DIR_APP) && install udevstart udevinfo udevd udevsettle udevtrigger /install/initrd/sbin
        cd /install/initrd/usr/share && rm -rf man
        cd /install/initrd/dev && rm -f console
        cd /install/initrd/dev && mknod -m 0600 console c 5 1
@@ -95,6 +99,27 @@ ifeq "$(LFS_PASS)" "install"
        cd /install/initrd/dev && mknod -m 0600 tty4 c 4 4
        cd /install/initrd/dev && mknod -m 0600 tty5 c 4 5
        cd /install/initrd/dev && mknod -m 0600 tty6 c 4 6
+else
+ifeq "$(KLIBC)" "1"
+       cd $(DIR_APP) && sed -i "s|USE_LOG = .*|USE_LOG = false|g" Makefile
+       cd $(DIR_APP) && sed -i "s|USE_KLIBC = .*|USE_KLIBC = true|g" Makefile
+
+       cd $(DIR_APP) && make PROGRAMS="udevd udevsettle udevtrigger" EXTRAS="extras/firmware extras/cdrom_id"
+
+       -mkdir -p /lib/initcpio/udev
+       -mkdir -p /lib/initcpio/install
+       -mkdir -p /lib/initcpio/hooks
+       cd $(DIR_APP) && install -m755 udevd /lib/initcpio/udev
+       cd $(DIR_APP) && install -m755 udevtrigger  /lib/initcpio/udev
+       cd $(DIR_APP) && install -m755 udevsettle  /lib/initcpio/udev
+       cd $(DIR_APP) && install -m755 extras/firmware/firmware.sh  /lib/initcpio/udev
+       cd $(DIR_APP) && install -m755 extras/cdrom_id/cdrom_id  /lib/initcpio/udev
+       
+       install -m755 $(DIR_SRC)/config/mkinitcpio/start_udev /lib/initcpio/udev
+       install -m644 $(DIR_SRC)/config/mkinitcpio/udev.rules  /lib/initcpio/udev
+       install -m755 $(DIR_SRC)/config/mkinitcpio/load-modules.sh /lib/initcpio/udev
+       install -m644 $(DIR_SRC)/config/mkinitcpio/udev_install /lib/initcpio/install/udev
+       install -m644 $(DIR_SRC)/config/mkinitcpio/udev_hook /lib/initcpio/hooks/udev
 else
        cd $(DIR_APP) && tar jxf $(DIR_DL)/udev-config-6.2.tar.bz2
        install -dv /lib/{firmware,udev/devices/{pts,shm}}
@@ -112,6 +137,7 @@ else
                                        extras/scsi_id extras/usb_id extras/volume_id" install
        cd $(DIR_APP) && cp -v udev-config-6.2/[0-9]* /etc/udev/rules.d/
        touch /etc/udev/rules.d/30-persistent-network.rules
+endif
 endif
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)