From: Arne Fitzenreiter Date: Mon, 18 Nov 2013 22:27:37 +0000 (+0100) Subject: udev: update to 208. X-Git-Tag: v2.15-beta1~146 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=35e188494d9723b977c010eedbac98820e7176a6 udev: update to 208. --- diff --git a/config/rootfiles/common/udev b/config/rootfiles/common/udev index 49cad7e927..3b9979b2e8 100644 --- a/config/rootfiles/common/udev +++ b/config/rootfiles/common/udev @@ -1,71 +1,98 @@ +bin/udevadm etc/modprobe.d/blacklist.conf -etc/scsi_id.config etc/udev #etc/udev/rules.d #etc/udev/rules.d/30-persistent-network.rules +#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 -lib/libudev.so.0 -lib/libudev.so.0.2.0 -lib/libvolume_id.so.1 -lib/libvolume_id.so.1.1.0 +lib/libudev.so.1 +lib/libudev.so.1.3.2 lib/udev +#lib/udev/accelerometer #lib/udev/ata_id #lib/udev/cdrom_id #lib/udev/collect -#lib/udev/create_floppy_devices #lib/udev/devices -#lib/udev/devices/core -#lib/udev/devices/fd -#lib/udev/devices/null #lib/udev/devices/pts -#lib/udev/devices/shm -#lib/udev/devices/stderr -#lib/udev/devices/stdin -#lib/udev/devices/stdout -#lib/udev/edd_id #lib/udev/enable_codel -#lib/udev/firmware.sh -#lib/udev/fstab_import -#lib/udev/path_id +#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/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-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-persistent-storage-edd.rules -#lib/udev/rules.d/75-cd-aliases-generator.rules -#lib/udev/rules.d/79-fstab_import.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/95-udev-late.rules #lib/udev/rules.d/99-codel.rules #lib/udev/scsi_id -#lib/udev/usb_id -#lib/udev/vol_id +#lib/udev/udevd +#lib/udev/v4l_id #lib/udev/write_cd_rules #lib/udev/write_net_rules sbin/udevadm sbin/udevd #usr/include/libudev.h -#usr/include/libvolume_id.h +#usr/lib/firmware usr/lib/libudev.so -usr/lib/libvolume_id.so #usr/lib/pkgconfig/libudev.pc -#usr/lib/pkgconfig/libvolume_id.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/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/man/man8/vol_id.8 diff --git a/config/udev/blacklist b/config/udev/blacklist.conf similarity index 100% rename from config/udev/blacklist rename to config/udev/blacklist.conf diff --git a/config/udev/udev.conf b/config/udev/udev.conf new file mode 100644 index 0000000000..31bb6620ee --- /dev/null +++ b/config/udev/udev.conf @@ -0,0 +1,4 @@ +# The initial syslog(3) priority: "err", "info", "debug" or its +# numerical equivalent. For runtime debugging, the daemons internal +# state can be changed with: "udevadm control --log-priority=". +udev_log="err" diff --git a/lfs/udev b/lfs/udev index 3f7b94f339..2991210090 100644 --- a/lfs/udev +++ b/lfs/udev @@ -24,23 +24,26 @@ include Config -VER = 141 +VER = 208 THISAPP = udev-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = systemd-$(VER).tar.xz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) +DIR_APP = $(DIR_SRC)/systemd-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### # Top-level Rules ############################################################################### -objects = $(DL_FILE) +objects = $(DL_FILE) udev-lfs-208-1.tar.bz2 + $(DL_FILE) = $(DL_FROM)/$(DL_FILE) +udev-lfs-$(VER)-1.tar.bz2 = $(DL_FROM)/udev-lfs-$(VER)-1.tar.bz2 -$(DL_FILE)_MD5 = 1670fe81cabf5161319c52084cf81134 +$(DL_FILE)_MD5 = df64550d92afbffb4f67a434193ee165 +udev-lfs-$(VER)-1.tar.bz2_MD5 = 67a5339e7ef1fa08f5db8315a5ea69e7 install : $(TARGET) @@ -70,23 +73,29 @@ $(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) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-141_no_netif_rename.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-125-ext4_wo_journal.patch + cd $(DIR_APP) && tar axf $(DIR_DL)/udev-lfs-$(VER)-1.tar.bz2 + +# cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-141_no_netif_rename.patch + + cd $(DIR_APP)/udev-lfs-$(VER)-1 && sed -i "s/HANDLE_AT 1/HANDLE_AT 0/g" cfg.h + rm -rf /lib/udev/devices - install -dv /lib/{firmware,udev/devices/{pts,shm}} - mknod -m0666 /lib/udev/devices/null c 1 3 - ln -sv /proc/self/fd /lib/udev/devices/fd - ln -sv /proc/self/fd/0 /lib/udev/devices/stdin - ln -sv /proc/self/fd/1 /lib/udev/devices/stdout - ln -sv /proc/self/fd/2 /lib/udev/devices/stderr - ln -sv /proc/kcore /lib/udev/devices/core - cd $(DIR_APP) && ./configure --disable-introspection --sbindir=/sbin --sysconfdir=/etc --libexecdir=/lib/udev - cd $(DIR_APP) && make $(MAKETUNING) EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id \ - extras/firmware extras/floppy extras/path_id \ - extras/scsi_id extras/usb_id extras/volume_id" - cd $(DIR_APP) && make DESTDIR=/ EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id \ - extras/firmware extras/floppy extras/path_id \ - extras/scsi_id extras/usb_id extras/volume_id" install + install -dv /lib/firmware + +# install -dv /lib/{firmware,udev/devices/{pts,shm}} +# mknod -m0666 /lib/udev/devices/null c 1 3 +# ln -sv /proc/self/fd /lib/udev/devices/fd +# ln -sv /proc/self/fd/0 /lib/udev/devices/stdin +# ln -sv /proc/self/fd/1 /lib/udev/devices/stdout +# ln -sv /proc/self/fd/2 /lib/udev/devices/stderr +# ln -sv /proc/kcore /lib/udev/devices/core + + cd $(DIR_APP) && make -f udev-lfs-$(VER)-1/Makefile.lfs $(MAKETUNING) + cd $(DIR_APP) && make -f udev-lfs-$(VER)-1/Makefile.lfs install + + # Make some compat symlinks + ln -sf /lib/udev/udevd /sbin/udevd + ln -sf /sbin/udevadm /bin/udevadm # Disable net generator rule. This does not work with the setup. rm -f /lib/udev/rules.d/75-persistent-net-generator.rules @@ -97,6 +106,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Blacklist some modules 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 \ + /etc/udev/ + # Install alsa rules. install -v -m 644 $(DIR_SRC)/config/udev/25-alsa.rules \ /lib/udev/rules.d