udev: Migrate to eudev

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/udev b/config/rootfiles/common/udev
index 1ba82d044f9afd16177e80d9d10eeb1820e1bd67..877a832a3a35e65dee6831804b0771926f0139f6 100644 (file)
--- a/config/rootfiles/common/udev
+++ b/config/rootfiles/common/udev
@@ -1,102 +1,87 @@
 bin/udevadm
 etc/modprobe.d/blacklist.conf
 etc/udev
+etc/udev/hwdb.bin
+etc/udev/hwdb.d
+etc/udev/hwdb.d/20-OUI.hwdb
+etc/udev/hwdb.d/20-acpi-vendor.hwdb
+etc/udev/hwdb.d/20-bluetooth-vendor-product.hwdb
+etc/udev/hwdb.d/20-net-ifname.hwdb
+etc/udev/hwdb.d/20-pci-classes.hwdb
+etc/udev/hwdb.d/20-pci-vendor-model.hwdb
+etc/udev/hwdb.d/20-sdio-classes.hwdb
+etc/udev/hwdb.d/20-sdio-vendor-model.hwdb
+etc/udev/hwdb.d/20-usb-classes.hwdb
+etc/udev/hwdb.d/20-usb-vendor-model.hwdb
+etc/udev/hwdb.d/20-vmbus-class.hwdb
+etc/udev/hwdb.d/60-evdev.hwdb
+etc/udev/hwdb.d/60-keyboard.hwdb
+etc/udev/hwdb.d/60-sensor.hwdb
+etc/udev/hwdb.d/70-mouse.hwdb
+etc/udev/hwdb.d/70-pointingstick.hwdb
+etc/udev/hwdb.d/70-touchpad.hwdb
 #etc/udev/rules.d
-#etc/udev/rules.d/55-lfs.rules
-#etc/udev/rules.d/81-cdrom.rules
-#etc/udev/rules.d/83-cdrom-symlinks.rules
-#etc/udev/udev.conf
-#lib/firmware
+etc/udev/rules.d/55-lfs.rules
+etc/udev/rules.d/81-cdrom.rules
+etc/udev/rules.d/83-cdrom-symlinks.rules
+etc/udev/udev.conf
 lib/libudev.so.1
-lib/libudev.so.1.3.2
+lib/libudev.so.1.6.3
 lib/udev
-#lib/udev/accelerometer
-#lib/udev/ata_id
-#lib/udev/cdrom_id
-#lib/udev/collect
-#lib/udev/devices
-#lib/udev/devices/pts
-#lib/udev/enable_codel
-#lib/udev/hwdb.d
-#lib/udev/hwdb.d/20-OUI.hwdb
-#lib/udev/hwdb.d/20-acpi-vendor.hwdb
-#lib/udev/hwdb.d/20-bluetooth-vendor-product.hwdb
-#lib/udev/hwdb.d/20-pci-classes.hwdb
-#lib/udev/hwdb.d/20-pci-vendor-model.hwdb
-#lib/udev/hwdb.d/20-usb-classes.hwdb
-#lib/udev/hwdb.d/20-usb-vendor-model.hwdb
-#lib/udev/hwdb.d/60-keyboard.hwdb
-#lib/udev/init-net-rules.sh
-#lib/udev/mtd_probe
-#lib/udev/network-hotplug-bridges
-#lib/udev/network-hotplug-rename
-#lib/udev/network-hotplug-vlan
-#lib/udev/rule_generator.functions
+lib/udev/ata_id
+lib/udev/cdrom_id
+lib/udev/collect
+lib/udev/enable_codel
+lib/udev/init-net-rules.sh
+lib/udev/mtd_probe
+lib/udev/network-hotplug-bridges
+lib/udev/network-hotplug-rename
+lib/udev/network-hotplug-vlan
+lib/udev/rule_generator.functions
 #lib/udev/rules.d
-#lib/udev/rules.d/25-alsa.rules
-#lib/udev/rules.d/42-usb-hid-pm.rules
-#lib/udev/rules.d/50-firmware.rules
-#lib/udev/rules.d/50-udev-default.rules
-#lib/udev/rules.d/60-cdrom_id.rules
-#lib/udev/rules.d/60-keyboard.rules
-#lib/udev/rules.d/60-net.rules
-#lib/udev/rules.d/60-persistent-alsa.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-accelerometer.rules
-#lib/udev/rules.d/64-btrfs.rules
-#lib/udev/rules.d/75-net-description.rules
-#lib/udev/rules.d/75-probe_mtd.rules
-#lib/udev/rules.d/75-tty-description.rules
-#lib/udev/rules.d/78-sound-card.rules
-#lib/udev/rules.d/80-drivers.rules
-#lib/udev/rules.d/80-net-name-slot.rules
-#lib/udev/rules.d/90-hwrng.rules
-#lib/udev/rules.d/95-udev-late.rules
-#lib/udev/rules.d/99-codel.rules
-#lib/udev/scsi_id
-#lib/udev/udevd
-#lib/udev/v4l_id
-#lib/udev/write_cd_rules
-#lib/udev/write_net_rules
+lib/udev/rules.d/25-alsa.rules
+lib/udev/rules.d/50-udev-default.rules
+lib/udev/rules.d/60-block.rules
+lib/udev/rules.d/60-cdrom_id.rules
+lib/udev/rules.d/60-drm.rules
+lib/udev/rules.d/60-evdev.rules
+lib/udev/rules.d/60-input-id.rules
+lib/udev/rules.d/60-net.rules
+lib/udev/rules.d/60-persistent-alsa.rules
+lib/udev/rules.d/60-persistent-input.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/60-sensor.rules
+lib/udev/rules.d/60-serial.rules
+lib/udev/rules.d/64-btrfs.rules
+lib/udev/rules.d/70-joystick.rules
+lib/udev/rules.d/70-mouse.rules
+lib/udev/rules.d/70-touchpad.rules
+lib/udev/rules.d/75-net-description.rules
+lib/udev/rules.d/75-probe_mtd.rules
+lib/udev/rules.d/78-sound-card.rules
+lib/udev/rules.d/80-drivers.rules
+lib/udev/rules.d/90-hwrng.rules
+lib/udev/rules.d/99-codel.rules
+lib/udev/scsi_id
+lib/udev/v4l_id
+lib/udev/write_cd_rules
+lib/udev/write_net_rules
 sbin/udevadm
 sbin/udevd
 #usr/include/libudev.h
-#usr/lib/firmware
-usr/lib/libudev.so
+#usr/include/udev.h
+#usr/lib/libudev.la
+#usr/lib/libudev.so
 #usr/lib/pkgconfig/libudev.pc
-#usr/lib/pkgconfig/udev.pc
-#usr/share/doc/udev-208
-#usr/share/doc/udev-208/lfs
-#usr/share/doc/udev-208/lfs/55-lfs.txt
-#usr/share/doc/udev-208/lfs/README
-#usr/share/doc/udev-208/libudev-overrides.txt
-#usr/share/doc/udev-208/libudev-sections.txt
-#usr/share/doc/udev-208/libudev.types
-#usr/share/gtk-doc
-#usr/share/gtk-doc/html
-#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-hwdb.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-util.html
-#usr/share/gtk-doc/html/libudev/libudev-udev.html
-#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/doc/udev-20171102
+#usr/share/doc/udev-20171102/lfs
+#usr/share/doc/udev-20171102/lfs/55-lfs.txt
+#usr/share/doc/udev-20171102/lfs/README
+#usr/share/man/man5/udev.conf.5
 #usr/share/man/man7/udev.7
 #usr/share/man/man8/udevadm.8
 #usr/share/man/man8/udevd.8
+#usr/share/pkgconfig
+#usr/share/pkgconfig/udev.pc

diff --git a/config/rootfiles/core/125/filelists/udev b/config/rootfiles/core/125/filelists/udev
new file mode 120000 (symlink)
index 0000000..e967a1c
--- /dev/null
+++ b/config/rootfiles/core/125/filelists/udev
@@ -0,0 +1 @@
+../../../common/udev
\ No newline at end of file

diff --git a/lfs/udev b/lfs/udev
index d55dec45051d6dd32170d4d637ecba045054fb9b..b578ab54cbd5c1456c8b47352860a0ff0e359a86 100644 (file)
--- a/lfs/udev
+++ b/lfs/udev
@@ -24,26 +24,26 @@
 
 include Config
 
-VER        = 208
+VER        = 3.2.6
+RULES_VER  = 20171102
 
-THISAPP    = udev-$(VER)
-DL_FILE    = systemd-$(VER).tar.xz
+THISAPP    = eudev-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/systemd-$(VER)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) udev-lfs-208-1.tar.bz2
-
+objects = $(DL_FILE) udev-lfs-$(RULES_VER).tar.bz2
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-udev-lfs-$(VER)-1.tar.bz2 = $(DL_FROM)/udev-lfs-$(VER)-1.tar.bz2
+udev-lfs-$(RULES_VER).tar.bz2 = $(DL_FROM)/udev-lfs-$(RULES_VER).tar.bz2
 
-$(DL_FILE)_MD5 = df64550d92afbffb4f67a434193ee165
-udev-lfs-$(VER)-1.tar.bz2_MD5 = 67a5339e7ef1fa08f5db8315a5ea69e7
+$(DL_FILE)_MD5 = 902c4cdc9235838067cc69978a780e72
+udev-lfs-$(RULES_VER).tar.bz2_MD5 = d92afb0c6e8e616792068ee4737b0d24
 
 install : $(TARGET)
 
@@ -73,27 +73,36 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && tar axf $(DIR_DL)/udev-lfs-$(VER)-1.tar.bz2
+       cd $(DIR_APP) && tar axf $(DIR_DL)/udev-lfs-$(RULES_VER).tar.bz2
 
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-208_remove_systemd_log.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-208-fix_uint8_t.patch
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --bindir=/bin \
+               --sbindir=/sbin \
+               --sysconfdir=/etc \
+               --libdir=/usr/lib \
+               --libexecdir=/lib \
+               --with-rootprefix= \
+               --with-rootlibdir=/lib \
+               --enable-manpages \
+               --disable-static
 
-       rm -rf /lib/udev/devices
-       install -dv /lib/firmware
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
 
-       cd $(DIR_APP) && make -f udev-lfs-$(VER)-1/Makefile.lfs $(MAKETUNING)
-       cd $(DIR_APP) && make -f udev-lfs-$(VER)-1/Makefile.lfs install
+       # Generate hardware database
+       udevadm hwdb --update
 
-       # Make some compat symlinks
-       ln -sf /lib/udev/udevd /sbin/udevd
-       ln -sf /sbin/udevadm /bin/udevadm
+       # Install rules
+       cd $(DIR_APP) && make -f udev-lfs-$(RULES_VER)/Makefile.lfs install
 
        # Disable net generator rule. This does not work with the setup.
        rm -f /lib/udev/rules.d/75-persistent-net-generator.rules
        rm -f /lib/udev/rules.d/80-net-name-slot.rules
 
        # Blacklist some modules
-       cp -vf $(DIR_SRC)/config/udev/blacklist.conf /etc/modprobe.d/blacklist.conf
+       cp -vf $(DIR_SRC)/config/udev/blacklist.conf \
+               /etc/modprobe.d/blacklist.conf
 
        # Install config file
        install -v -m 644 $(DIR_SRC)/config/udev/udev.conf \
@@ -122,5 +131,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                /lib/udev/rules.d
        install -m 755 $(DIR_SRC)/config/udev/enable_codel \
                /lib/udev/enable_codel
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)