Updated udev to version 145.

I had to move the ipfire_make udev to the hardware tools sektion
because udev has a lot a new dependencies.

So I had to remove udev als a dependency form initscripts.

diff --git a/lfs/initscripts b/lfs/initscripts
index 5194017e1d7c5bb7a36d9db4335c25e205a76b58..f14083fd15f92d72e4562e248c414647370ee46b 100644 (file)
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -40,7 +40,7 @@ EXTRA      = no
 DEBUG      = no
 BUILD_DEPS =
 DEPS       = coreutils e2fsprogs module-init-tools procps sysvinit system-release \
-       udev upstart util-linux-ng
+       upstart util-linux-ng
 
 URL        =
 LICENSE    = GPLv2+

diff --git a/lfs/udev b/lfs/udev
index 4d58359c802f079842dc7c71ff5930031ad1306d..bfa40bf695c1e9f8125d622d510d79cf3a743f0e 100644 (file)
--- a/lfs/udev
+++ b/lfs/udev
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = udev
-PKG_VER    = 142
+PKG_VER    = 145
 PKG_REL    = 0
 
 THISAPP    = $(PKG_NAME)-$(PKG_VER)
@@ -106,6 +106,9 @@ $(OBJECT): $(objects)
        for i in $(DIR_SOURCE)/initscripts/udev/*; do \
                install -m 755 -v $$i /lib/udev/$$(basename $$i); \
        done
+       
+       rm -vf /lib/libgudev-1.0.la
+       rm -vf /lib/libudev.la
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index defd22971f7c455c9d9ded6288baa65c6c161756..2d3a9ccb59f348e4ce3fe60ac2ddab3474aaa83d 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -189,7 +189,6 @@ base_build() {
        ipfire_make sysvinit
        ipfire_make tar
        ipfire_make texinfo
-       ipfire_make udev
        ipfire_make vim
 }
 
@@ -307,6 +306,7 @@ ipfire_build() {
        ipfire_make libnfsidmap
        ipfire_make libgssglue
        ipfire_make librpcsecgss
+       ipfire_make gperf
        
        ### Building vpn stuff
        #
@@ -340,6 +340,7 @@ ipfire_build() {
        ipfire_make parted
        ipfire_make hal
        ipfire_make hal-info
+       ipfire_make udev
 
        ### Building some important tools
        #

diff --git a/src/rootfiles/core/udev b/src/rootfiles/core/udev
index e24507b9a52ed9b86c9b6242a1ff5ad0cbd0deca..be9e7c7c185198f59a540673f7f5e248b0c2dd40 100644 (file)
--- a/src/rootfiles/core/udev
+++ b/src/rootfiles/core/udev
@@ -1,16 +1,13 @@
-etc/scsi_id.config
-etc/udev
-etc/udev/rules.d
 etc/udev/udev.conf
-lib/firmware
+lib/libgudev-1.0.so
+lib/libgudev-1.0.so.0
+lib/libgudev-1.0.so.0.0.1
+lib/libudev.so
 lib/libudev.so.0
-lib/libudev.so.0.3.0
-lib/udev
-lib/udev/ata_id
-lib/udev/cdrom_id
-lib/udev/collect
+lib/libudev.so.0.4.2
+#lib/pkgconfig/gudev-1.0.pc
+#lib/pkgconfig/libudev.pc
 lib/udev/console_init
-lib/udev/create_floppy_devices
 lib/udev/devices
 lib/udev/devices/console
 lib/udev/devices/core
@@ -22,47 +19,152 @@ lib/udev/devices/shm
 lib/udev/devices/stderr
 lib/udev/devices/stdin
 lib/udev/devices/stdout
-lib/udev/edd_id
-lib/udev/firmware.sh
-lib/udev/fstab_import
-lib/udev/path_id
-lib/udev/rule_generator.functions
-lib/udev/rules.d
 lib/udev/rules.d/10-console.rules
 lib/udev/rules.d/23-usb.rules
-lib/udev/rules.d/50-firmware.rules
-lib/udev/rules.d/50-udev-default.rules
 lib/udev/rules.d/55-ipfire.rules
-lib/udev/rules.d/60-cdrom_id.rules
 lib/udev/rules.d/60-net.rules
-lib/udev/rules.d/60-persistent-input.rules
-lib/udev/rules.d/60-persistent-serial.rules
-lib/udev/rules.d/60-persistent-storage-tape.rules
-lib/udev/rules.d/60-persistent-storage.rules
-lib/udev/rules.d/60-persistent-v4l.rules
 lib/udev/rules.d/61-cdrom.rules
-lib/udev/rules.d/61-persistent-storage-edd.rules
-lib/udev/rules.d/75-cd-aliases-generator.rules
-lib/udev/rules.d/75-persistent-net-generator.rules
-lib/udev/rules.d/79-fstab_import.rules
-lib/udev/rules.d/80-drivers.rules
-lib/udev/rules.d/95-udev-late.rules
-lib/udev/scsi_id
-lib/udev/usb_id
-lib/udev/write_cd_rules
-lib/udev/write_net_rules
+libexec
+libexec/ata_id
+libexec/cdrom_id
+libexec/collect
+libexec/create_floppy_devices
+libexec/edd_id
+libexec/findkeyboards
+libexec/firmware.sh
+libexec/fstab_import
+libexec/hid2hci
+libexec/keymap
+libexec/keymaps
+libexec/keymaps/acer
+libexec/keymaps/acer-aspire_5920g
+libexec/keymaps/acer-extensa_5xxx
+libexec/keymaps/acer-travelmate_6292
+libexec/keymaps/acer-travelmate_c300
+libexec/keymaps/asus
+libexec/keymaps/benq-joybook_r22
+libexec/keymaps/compaq-e_evo
+libexec/keymaps/dell
+libexec/keymaps/fujitsu-amilo_pa_2548
+libexec/keymaps/fujitsu-amilo_pro_edition_v3505
+libexec/keymaps/fujitsu-amilo_pro_v3205
+libexec/keymaps/fujitsu-amilo_si_1520
+libexec/keymaps/fujitsu-esprimo_mobile_v5
+libexec/keymaps/fujitsu-esprimo_mobile_v6
+libexec/keymaps/hewlett-packard
+libexec/keymaps/hewlett-packard-2510p_2530p
+libexec/keymaps/hewlett-packard-compaq_elitebook
+libexec/keymaps/hewlett-packard-pavilion
+libexec/keymaps/hewlett-packard-tablet
+libexec/keymaps/hewlett-packard-tx2
+libexec/keymaps/inventec-symphony_6.0_7.0
+libexec/keymaps/lenovo-3000
+libexec/keymaps/lenovo-thinkpad_x200_tablet
+libexec/keymaps/lenovo-thinkpad_x6_tablet
+libexec/keymaps/maxdata-pro_7000
+libexec/keymaps/medion-fid2060
+libexec/keymaps/medionnb-a555
+libexec/keymaps/micro-star
+libexec/keymaps/module-asus-w3j
+libexec/keymaps/module-ibm
+libexec/keymaps/module-lenovo
+libexec/keymaps/module-sony
+libexec/keymaps/module-sony-old
+libexec/keymaps/oqo-model2
+libexec/keymaps/samsung-other
+libexec/keymaps/samsung-sq1us
+libexec/keymaps/samsung-sx20s
+libexec/keymaps/toshiba-satellite_a100
+libexec/keymaps/toshiba-satellite_a110
+libexec/modem-modeswitch
+libexec/path_id
+libexec/pci-db
+libexec/rule_generator.functions
+libexec/rules.d
+libexec/rules.d/50-firmware.rules
+libexec/rules.d/50-udev-default.rules
+libexec/rules.d/60-cdrom_id.rules
+libexec/rules.d/60-persistent-alsa.rules
+libexec/rules.d/60-persistent-input.rules
+libexec/rules.d/60-persistent-serial.rules
+libexec/rules.d/60-persistent-storage-tape.rules
+libexec/rules.d/60-persistent-storage.rules
+libexec/rules.d/60-persistent-v4l.rules
+libexec/rules.d/61-mobile-action.rules
+libexec/rules.d/61-option-modem-modeswitch.rules
+libexec/rules.d/61-persistent-storage-edd.rules
+libexec/rules.d/70-acl.rules
+libexec/rules.d/70-hid2hci.rules
+libexec/rules.d/75-cd-aliases-generator.rules
+libexec/rules.d/75-net-description.rules
+libexec/rules.d/75-persistent-net-generator.rules
+libexec/rules.d/75-tty-description.rules
+libexec/rules.d/78-sound-card.rules
+libexec/rules.d/79-fstab_import.rules
+libexec/rules.d/80-drivers.rules
+libexec/rules.d/95-keymap.rules
+libexec/rules.d/95-udev-late.rules
+libexec/scsi_id
+libexec/udev-acl
+libexec/usb-db
+libexec/usb_id
+libexec/v4l_id
+libexec/write_cd_rules
+libexec/write_net_rules
 sbin/udevadm
 sbin/udevd
+#usr/include/gudev-1.0
+#usr/include/gudev-1.0/gudev
+#usr/include/gudev-1.0/gudev/gudev.h
+#usr/include/gudev-1.0/gudev/gudevclient.h
+#usr/include/gudev-1.0/gudev/gudevdevice.h
+#usr/include/gudev-1.0/gudev/gudevenums.h
+#usr/include/gudev-1.0/gudev/gudevenumtypes.h
+#usr/include/gudev-1.0/gudev/gudevtypes.h
 #usr/include/libudev.h
-usr/lib/libudev.so
-#usr/lib/pkgconfig/libudev.pc
+usr/lib/ConsoleKit
+usr/lib/ConsoleKit/run-session.d
+usr/lib/ConsoleKit/run-session.d/udev-acl.ck
+#usr/share/doc/udev
+#usr/share/doc/udev/README.keymap.txt
+#usr/share/doc/udev/writing_udev_rules
+#usr/share/doc/udev/writing_udev_rules/index.html
+#usr/share/gtk-doc/html/gudev
+#usr/share/gtk-doc/html/gudev/GUdevClient.html
+#usr/share/gtk-doc/html/gudev/GUdevDevice.html
+#usr/share/gtk-doc/html/gudev/gudev-hierarchy.html
+#usr/share/gtk-doc/html/gudev/gudev.devhelp
+#usr/share/gtk-doc/html/gudev/gudev.devhelp2
+#usr/share/gtk-doc/html/gudev/home.png
+#usr/share/gtk-doc/html/gudev/index.html
+#usr/share/gtk-doc/html/gudev/index.sgml
+#usr/share/gtk-doc/html/gudev/ix01.html
+#usr/share/gtk-doc/html/gudev/left.png
+#usr/share/gtk-doc/html/gudev/ref-API.html
+#usr/share/gtk-doc/html/gudev/right.png
+#usr/share/gtk-doc/html/gudev/style.css
+#usr/share/gtk-doc/html/gudev/up.png
+#usr/share/gtk-doc/html/libudev
+#usr/share/gtk-doc/html/libudev/api-index-full.html
+#usr/share/gtk-doc/html/libudev/ch01.html
+#usr/share/gtk-doc/html/libudev/home.png
+#usr/share/gtk-doc/html/libudev/index.html
+#usr/share/gtk-doc/html/libudev/index.sgml
+#usr/share/gtk-doc/html/libudev/left.png
+#usr/share/gtk-doc/html/libudev/libudev-udev-device.html
+#usr/share/gtk-doc/html/libudev/libudev-udev-enumerate.html
+#usr/share/gtk-doc/html/libudev/libudev-udev-list.html
+#usr/share/gtk-doc/html/libudev/libudev-udev-monitor.html
+#usr/share/gtk-doc/html/libudev/libudev-udev-queue.html
+#usr/share/gtk-doc/html/libudev/libudev-udev.html
+#usr/share/gtk-doc/html/libudev/libudev.devhelp
+#usr/share/gtk-doc/html/libudev/libudev.devhelp2
+#usr/share/gtk-doc/html/libudev/right.png
+#usr/share/gtk-doc/html/libudev/style.css
+#usr/share/gtk-doc/html/libudev/up.png
 #usr/share/man/man7/udev.7
-#usr/share/man/man8/ata_id.8
-#usr/share/man/man8/cdrom_id.8
-#usr/share/man/man8/create_floppy_devices.8
-#usr/share/man/man8/edd_id.8
-#usr/share/man/man8/path_id.8
 #usr/share/man/man8/scsi_id.8
 #usr/share/man/man8/udevadm.8
 #usr/share/man/man8/udevd.8
-#usr/share/man/man8/usb_id.8
+#usr/share/pkgconfig
+#usr/share/pkgconfig/udev.pc