Hi, this small patch series updates kmod, dracut and replaces udev with eudev. Udev is since 2013 at the end of life! The eudev package needs a kmod package newer version 15. Eudev finds newer hardware random number generators.
In my ESXi VM's came the message: "This system supports Intel(R) RDRAND" :)
With udev, i never see this Message!
Patches: kmod: update to 23 dracut: update to 044 replace udev with eudev 3.2
Greetings, Marcel
Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org --- config/rootfiles/common/kmod | 5 +++-- lfs/kmod | 15 ++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/config/rootfiles/common/kmod b/config/rootfiles/common/kmod index 14e7654..bb74986 100644 --- a/config/rootfiles/common/kmod +++ b/config/rootfiles/common/kmod @@ -1,4 +1,6 @@ bin/kmod +lib/libkmod.so.2 +lib/libkmod.so.2.3.1 sbin/depmod sbin/insmod sbin/lsmod @@ -8,6 +10,5 @@ sbin/rmmod #usr/include/libkmod.h #usr/lib/libkmod.la usr/lib/libkmod.so -usr/lib/libkmod.so.2 -usr/lib/libkmod.so.2.2.3 #usr/lib/pkgconfig/libkmod.pc +usr/share/bash-completion/completions/kmod diff --git a/lfs/kmod b/lfs/kmod index dc2dc10..4495368 100644 --- a/lfs/kmod +++ b/lfs/kmod @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 13 +VER = 23
THISAPP = kmod-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,6 +32,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
+export zlib_CFLAGS="-I/usr/include" +export zlib_LIBS="-L/usr/lib -L/usr/lib -lz" + ############################################################################### # Top-level Rules ############################################################################### @@ -40,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d5aba43b9370cd52f3cb35e82a1aa595 +$(DL_FILE)_MD5 = 3cf469f40ec2ed51f56ba45ea03793e7
install : $(TARGET)
@@ -74,11 +77,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --prefix=/usr \ --bindir=/bin \ --sysconfdir=/etc \ - --enable-zlib \ + --with-rootlibdir=/lib \ + --with-zlib \ --disable-manpages - -# --libdir=/lib \ - cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install
Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org --- config/rootfiles/common/dracut | 5 +++++ lfs/dracut | 10 ++++------ 2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/config/rootfiles/common/dracut b/config/rootfiles/common/dracut index 03379b4..64f1595 100644 --- a/config/rootfiles/common/dracut +++ b/config/rootfiles/common/dracut @@ -7,6 +7,7 @@ usr/bin/mkinitrd usr/lib/dracut #usr/lib/dracut/dracut-functions #usr/lib/dracut/dracut-functions.sh +#usr/lib/dracut/dracut-init.sh #usr/lib/dracut/dracut-initramfs-restore #usr/lib/dracut/dracut-install #usr/lib/dracut/dracut-logger.sh @@ -37,6 +38,8 @@ usr/lib/dracut #usr/lib/dracut/modules.d/90kernel-modules/insmodpost.sh #usr/lib/dracut/modules.d/90kernel-modules/module-setup.sh #usr/lib/dracut/modules.d/90kernel-modules/parse-kernel.sh +#usr/lib/dracut/modules.d/90kernel-network-modules +#usr/lib/dracut/modules.d/90kernel-network-modules/module-setup.sh #usr/lib/dracut/modules.d/90mdraid #usr/lib/dracut/modules.d/90mdraid/59-persistent-storage-md.rules #usr/lib/dracut/modules.d/90mdraid/65-md-incremental-imsm.rules @@ -76,6 +79,7 @@ usr/lib/dracut #usr/lib/dracut/modules.d/98integrity #usr/lib/dracut/modules.d/98integrity/README #usr/lib/dracut/modules.d/98integrity/evm-enable.sh +#usr/lib/dracut/modules.d/98integrity/ima-keys-load.sh #usr/lib/dracut/modules.d/98integrity/ima-policy-load.sh #usr/lib/dracut/modules.d/98integrity/module-setup.sh #usr/lib/dracut/modules.d/98pollcdrom @@ -132,3 +136,4 @@ usr/lib/dracut #usr/share/man/man8/dracut.8 #usr/share/man/man8/mkinitrd-suse.8 #usr/share/man/man8/mkinitrd.8 +#usr/share/pkgconfig/dracut.pc diff --git a/lfs/dracut b/lfs/dracut index 97d12f3..abb6be1 100644 --- a/lfs/dracut +++ b/lfs/dracut @@ -24,7 +24,7 @@
include Config
-VER = 038 +VER = 044
THISAPP = dracut-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4487bd98000cc536c5c3839a2f112831 +$(DL_FILE)_MD5 = fbb8b6aea24c2f7d328021bbf11788fd
install : $(TARGET)
@@ -70,11 +70,9 @@ $(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/dracut-038-always-enable-mdraid.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dracut-038_add_sdhci-pci.patch - + cd $(DIR_APP) && ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install sbindir=/sbin sysconfdir=/etc + cd $(DIR_APP) && make install
rm -rf /usr/lib/dracut/modules.d/*{biosdevname,bootchart,dash,fips*,modsign,busybox,convertfs,network,ifcfg,url-lib,gensplash,cms,plymouth,btrfs,crypt*,dm,dmraid,dmsquash-live,livenet,lvm,multipath,qemu*,cifs,dasd*,fcoe*,iscsi,nbd,nfs,resume,ssh-client,zfcp*,systemd*,znet,securityfs,masterkey,selinux,usrmount,uefi-lib}
Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org --- config/eudev/config.cache | 3 ++ config/rootfiles/common/eudev | 69 ++++++++++++++++++++++++++++ config/rootfiles/common/udev | 102 ------------------------------------------ lfs/{udev => eudev} | 49 +++++++++++--------- make.sh | 4 +- 5 files changed, 103 insertions(+), 124 deletions(-) create mode 100644 config/eudev/config.cache create mode 100644 config/rootfiles/common/eudev delete mode 100644 config/rootfiles/common/udev rename lfs/{udev => eudev} (77%)
diff --git a/config/eudev/config.cache b/config/eudev/config.cache new file mode 100644 index 0000000..7b275d4 --- /dev/null +++ b/config/eudev/config.cache @@ -0,0 +1,3 @@ +HAVE_BLKID=1 +BLKID_LIBS="-lblkid" +BLKID_CFLAGS="-I/tools/include" diff --git a/config/rootfiles/common/eudev b/config/rootfiles/common/eudev new file mode 100644 index 0000000..070b29b --- /dev/null +++ b/config/rootfiles/common/eudev @@ -0,0 +1,69 @@ +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/60-evdev.hwdb +#etc/udev/hwdb.d/60-keyboard.hwdb +#etc/udev/hwdb.d/70-mouse.hwdb +#etc/udev/hwdb.d/70-pointingstick.hwdb +#etc/udev/rules.d +#etc/udev/udev.conf +lib/libudev.so.1 +lib/libudev.so.1.6.3 +lib/udev +#lib/udev/ata_id +#lib/udev/cdrom_id +#lib/udev/collect +#lib/udev/enable_codel +#lib/udev/mtd_probe +#lib/udev/network-hotplug-macvtap +#lib/udev/network-hotplug-rename +#lib/udev/network-hotplug-vlan +#lib/udev/rules.d +#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-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-serial.rules +#lib/udev/rules.d/64-btrfs.rules +#lib/udev/rules.d/70-mouse.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 +sbin/udevadm +sbin/udevd +#usr/include/libudev.h +#usr/include/udev.h +#usr/lib/libudev.la +usr/lib/libudev.so +#usr/lib/pkgconfig/libudev.pc +#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/common/udev b/config/rootfiles/common/udev deleted file mode 100644 index e1f4bd5..0000000 --- a/config/rootfiles/common/udev +++ /dev/null @@ -1,102 +0,0 @@ -bin/udevadm -etc/modprobe.d/blacklist.conf -etc/udev -#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 -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/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-macvtap -#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 -sbin/udevadm -sbin/udevd -#usr/include/libudev.h -#usr/lib/firmware -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/man/man7/udev.7 -#usr/share/man/man8/udevadm.8 -#usr/share/man/man8/udevd.8 diff --git a/lfs/udev b/lfs/eudev similarity index 77% rename from lfs/udev rename to lfs/eudev index 61bd337..a0600bf 100644 --- a/lfs/udev +++ b/lfs/eudev @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2016 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,26 +24,25 @@
include Config
-VER = 208 +VER = 3.2
-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-20140408.tar.bz2
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -udev-lfs-$(VER)-1.tar.bz2 = $(DL_FROM)/udev-lfs-$(VER)-1.tar.bz2 +udev-lfs-20140408.tar.bz2 = $(DL_FROM)/udev-lfs-20140408.tar.bz2
-$(DL_FILE)_MD5 = df64550d92afbffb4f67a434193ee165 -udev-lfs-$(VER)-1.tar.bz2_MD5 = 67a5339e7ef1fa08f5db8315a5ea69e7 +$(DL_FILE)_MD5 = 7e42d9b9ed8162021665139520676367 +udev-lfs-20140408.tar.bz2_MD5 = c2d6b127f89261513b23b6d458484099
install : $(TARGET)
@@ -73,20 +72,30 @@ $(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) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-208_remove_systemd_log.patch - - cd $(DIR_APP)/udev-lfs-$(VER)-1 && sed -i "s/HANDLE_AT 1/HANDLE_AT 0/g" cfg.h - + cd $(DIR_APP) && sed -r -i 's|/usr(/bin/test)|\1|' test/udev-test.pl + cp -vf $(DIR_SRC)/config/eudev/config.cache $(DIR_APP) + cd $(DIR_APP) && ./configure --prefix=/usr \ + --bindir=/sbin \ + --sbindir=/sbin \ + --libdir=/usr/lib \ + --sysconfdir=/etc \ + --libexecdir=/lib \ + --with-rootprefix= \ + --with-rootlibdir=/lib \ + --enable-manpages \ + --disable-static \ + --config-cache rm -rf /lib/udev/devices install -dv /lib/firmware - - cd $(DIR_APP) && make -f udev-lfs-$(VER)-1/Makefile.lfs $(MAKETUNING) - cd $(DIR_APP) && make -f udev-lfs-$(VER)-1/Makefile.lfs install + cd $(DIR_APP) && LIBRARY_PATH=/tools/lib make + cd $(DIR_APP) && make LD_LIBRARY_PATH=/tools/lib install + cd $(DIR_APP) && LD_LIBRARY_PATH=/tools/lib udevadm hwdb --update + @rm -rf $(DIR_APP) + cd $(DIR_SRC) && tar axf $(DIR_DL)/udev-lfs-20140408.tar.bz2 + cd $(DIR_SRC)/udev-lfs-20140408 make -f Makefile.lfs install + @rm -rf $(DIR_SRC)/udev-lfs-20140408
# 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. diff --git a/make.sh b/make.sh index b175a01..94272fa 100755 --- a/make.sh +++ b/make.sh @@ -366,6 +366,7 @@ buildbase() { lfsmake2 groff lfsmake2 gperf lfsmake2 gzip + lfsmake2 xz lfsmake2 hostname lfsmake2 iproute2 lfsmake2 jwhois @@ -383,9 +384,8 @@ buildbase() { lfsmake2 tar lfsmake2 texinfo lfsmake2 util-linux - lfsmake2 udev + lfsmake2 eudev lfsmake2 vim - lfsmake2 xz lfsmake2 paxctl }
-
Marcel Lorenz