This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, fifteen has been updated via a5d81233a3a6638f6138c21d6174f73f99eb93fe (commit) via 147446202ff649e7371cc45d040626d7ab262cf4 (commit) via 80469a89354a686b5fc56066828ed763f81e55a4 (commit) via b474c1ca151c323ae5f8a4b402960cfa0f21c6cf (commit) via 5c3fa3223a4de6eb3a62d1c97c52f1762faa07f4 (commit) via 35e188494d9723b977c010eedbac98820e7176a6 (commit) via ba109afd0d551909be86bb11d797f1db80ce56f6 (commit) from 1ee33ddadf2737588ea50326bbc5995e93864aa3 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit a5d81233a3a6638f6138c21d6174f73f99eb93fe Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Nov 20 07:37:51 2013 +0100
setup: change persistent network rules for new udev.
commit 147446202ff649e7371cc45d040626d7ab262cf4 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Nov 20 07:37:01 2013 +0100
udev: disable new netdev names and systemd log prefix.
commit 80469a89354a686b5fc56066828ed763f81e55a4 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Nov 18 23:36:10 2013 +0100
initskripts: updates for new udev.
commit b474c1ca151c323ae5f8a4b402960cfa0f21c6cf Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Nov 18 23:34:00 2013 +0100
stage2: add /run symlink to /var/run.
commit 5c3fa3223a4de6eb3a62d1c97c52f1762faa07f4 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Nov 18 23:30:27 2013 +0100
dracut: fixes for new udev and missing scsi_wait.
commit 35e188494d9723b977c010eedbac98820e7176a6 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Nov 18 23:27:37 2013 +0100
udev: update to 208.
commit ba109afd0d551909be86bb11d797f1db80ce56f6 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Nov 18 19:00:51 2013 +0100
kmod: replace module-init-tools by kmod-13.
newer udev depend on kmod.
-----------------------------------------------------------------------
Summary of changes: config/etc/modprobe.d/{cfg80211 => cfg80211.conf} | 0 .../etc/modprobe.d/{pcspeaker => pcspeaker.conf} | 0 config/rootfiles/common/armv5tel/linux | 6 +- config/rootfiles/common/armv5tel/linux-kirkwood | 6 +- config/rootfiles/common/i586/linux | 6 +- config/rootfiles/common/kmod | 13 +++ config/rootfiles/common/module-init-tools | 21 ----- config/rootfiles/common/stage2 | 5 +- config/rootfiles/common/udev | 95 ++++++++++++++-------- config/udev/{blacklist => blacklist.conf} | 0 config/udev/udev.conf | 4 + lfs/dracut | 2 + lfs/{pcre => kmod} | 28 +++++-- lfs/linux | 14 ++-- lfs/mISDN | 4 +- lfs/stage2 | 3 + lfs/udev | 53 ++++++------ make.sh | 2 +- src/initscripts/init.d/udev | 19 ++--- src/initscripts/init.d/udev_retry | 2 +- src/install+setup/libsmooth/netstuff.c | 2 +- src/install+setup/setup/networking.c | 2 + src/patches/dracut-006_add_run_symlink.patch | 13 +++ src/patches/dracut-006_remove_scsi_wait.patch | 12 +++ src/patches/udev-208_remove_systemd_log.patch | 12 +++ 25 files changed, 204 insertions(+), 120 deletions(-) rename config/etc/modprobe.d/{cfg80211 => cfg80211.conf} (100%) rename config/etc/modprobe.d/{pcspeaker => pcspeaker.conf} (100%) create mode 100644 config/rootfiles/common/kmod delete mode 100644 config/rootfiles/common/module-init-tools rename config/udev/{blacklist => blacklist.conf} (100%) create mode 100644 config/udev/udev.conf copy lfs/{pcre => kmod} (87%) create mode 100644 src/patches/dracut-006_add_run_symlink.patch create mode 100644 src/patches/dracut-006_remove_scsi_wait.patch create mode 100644 src/patches/udev-208_remove_systemd_log.patch
Difference in files: diff --git a/config/etc/modprobe.d/cfg80211 b/config/etc/modprobe.d/cfg80211 deleted file mode 100644 index e72bedd..0000000 --- a/config/etc/modprobe.d/cfg80211 +++ /dev/null @@ -1 +0,0 @@ -blacklist ieee80211 diff --git a/config/etc/modprobe.d/cfg80211.conf b/config/etc/modprobe.d/cfg80211.conf new file mode 100644 index 0000000..e72bedd --- /dev/null +++ b/config/etc/modprobe.d/cfg80211.conf @@ -0,0 +1 @@ +blacklist ieee80211 diff --git a/config/etc/modprobe.d/pcspeaker b/config/etc/modprobe.d/pcspeaker deleted file mode 100644 index d4e7e94..0000000 --- a/config/etc/modprobe.d/pcspeaker +++ /dev/null @@ -1 +0,0 @@ -blacklist snd_pcsp diff --git a/config/etc/modprobe.d/pcspeaker.conf b/config/etc/modprobe.d/pcspeaker.conf new file mode 100644 index 0000000..d4e7e94 --- /dev/null +++ b/config/etc/modprobe.d/pcspeaker.conf @@ -0,0 +1 @@ +blacklist snd_pcsp diff --git a/config/rootfiles/common/armv5tel/linux b/config/rootfiles/common/armv5tel/linux index 2206ce3..8c4c97f 100644 --- a/config/rootfiles/common/armv5tel/linux +++ b/config/rootfiles/common/armv5tel/linux @@ -1,4 +1,4 @@ -etc/modprobe.d/framebuffer -etc/modprobe.d/ipv6 -etc/modprobe.d/isdn +etc/modprobe.d/framebuffer.conf +etc/modprobe.d/ipv6.conf +etc/modprobe.d/isdn.conf sbin/gen_init_cpio diff --git a/config/rootfiles/common/armv5tel/linux-kirkwood b/config/rootfiles/common/armv5tel/linux-kirkwood index 3354d9e..60374aa 100644 --- a/config/rootfiles/common/armv5tel/linux-kirkwood +++ b/config/rootfiles/common/armv5tel/linux-kirkwood @@ -4,9 +4,9 @@ boot/config-KVER-ipfire-kirkwood boot/dtb-KVER-ipfire-kirkwood boot/uImage-ipfire-kirkwood boot/vmlinuz-KVER-ipfire-kirkwood -etc/modprobe.d/framebuffer -etc/modprobe.d/ipv6 -etc/modprobe.d/isdn +etc/modprobe.d/framebuffer.conf +etc/modprobe.d/ipv6.conf +etc/modprobe.d/isdn.conf lib/modules/KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/build #lib/modules/KVER-ipfire-kirkwood/kernel diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux index 20b6410..c0c3436 100644 --- a/config/rootfiles/common/i586/linux +++ b/config/rootfiles/common/i586/linux @@ -3,9 +3,9 @@ boot/System.map-ipfire boot/config-KVER-ipfire boot/vmlinuz-KVER-ipfire boot/vmlinuz-ipfire -etc/modprobe.d/framebuffer -etc/modprobe.d/ipv6 -etc/modprobe.d/isdn +etc/modprobe.d/framebuffer.conf +etc/modprobe.d/ipv6.conf +etc/modprobe.d/isdn.conf lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/build #lib/modules/KVER-ipfire/kernel diff --git a/config/rootfiles/common/kmod b/config/rootfiles/common/kmod new file mode 100644 index 0000000..14e7654 --- /dev/null +++ b/config/rootfiles/common/kmod @@ -0,0 +1,13 @@ +bin/kmod +sbin/depmod +sbin/insmod +sbin/lsmod +sbin/modinfo +sbin/modprobe +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 diff --git a/config/rootfiles/common/module-init-tools b/config/rootfiles/common/module-init-tools deleted file mode 100644 index 4cffddb..0000000 --- a/config/rootfiles/common/module-init-tools +++ /dev/null @@ -1,21 +0,0 @@ -bin/lsmod -sbin/depmod -sbin/generate-modprobe.conf -sbin/insmod -sbin/insmod.static -sbin/modinfo -sbin/modprobe -sbin/rmmod -#share -#share/man -#share/man/man5 -#share/man/man5/depmod.conf.5 -#share/man/man5/modprobe.conf.5 -#share/man/man5/modules.dep.5 -#share/man/man8 -#share/man/man8/depmod.8 -#share/man/man8/insmod.8 -#share/man/man8/lsmod.8 -#share/man/man8/modinfo.8 -#share/man/man8/modprobe.8 -#share/man/man8/rmmod.8 diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index 04ef3f2..a53ecaf 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -20,8 +20,8 @@ etc/ld.so.conf etc/logrotate.conf etc/mime.types etc/modprobe.d -etc/modprobe.d/cfg80211 -etc/modprobe.d/pcspeaker +etc/modprobe.d/cfg80211.conf +etc/modprobe.d/pcspeaker.conf etc/modules.conf etc/mtab etc/nsswitch.conf @@ -132,6 +132,7 @@ usr/share/doc/licenses/GPLv3 #usr/share/misc #usr/share/terminfo #usr/share/zoneinfo +run #var #var/cache var/empty diff --git a/config/rootfiles/common/udev b/config/rootfiles/common/udev index bacd0cb..3b9979b 100644 --- a/config/rootfiles/common/udev +++ b/config/rootfiles/common/udev @@ -1,71 +1,98 @@ -etc/modprobe.d/blacklist -etc/scsi_id.config +bin/udevadm +etc/modprobe.d/blacklist.conf 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 deleted file mode 100644 index 6b76366..0000000 --- a/config/udev/blacklist +++ /dev/null @@ -1,6 +0,0 @@ -blacklist crc_ccitt -blacklist slhc - -# Intel MEI controllers -# makes some systems hang on reboot -blacklist mei diff --git a/config/udev/blacklist.conf b/config/udev/blacklist.conf new file mode 100644 index 0000000..6b76366 --- /dev/null +++ b/config/udev/blacklist.conf @@ -0,0 +1,6 @@ +blacklist crc_ccitt +blacklist slhc + +# Intel MEI controllers +# makes some systems hang on reboot +blacklist mei diff --git a/config/udev/udev.conf b/config/udev/udev.conf new file mode 100644 index 0000000..31bb662 --- /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=<value>". +udev_log="err" diff --git a/lfs/dracut b/lfs/dracut index d486950..7b0cd8a 100644 --- a/lfs/dracut +++ b/lfs/dracut @@ -73,6 +73,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_lzma.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_remove_cdrom_wait.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_add_run_symlink.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_remove_scsi_wait.patch
cd $(DIR_APP) && cp -vf $(DIR_SRC)/src/dracut/switch_root.c .
diff --git a/lfs/kmod b/lfs/kmod new file mode 100644 index 0000000..dc2dc10 --- /dev/null +++ b/lfs/kmod @@ -0,0 +1,94 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 13 + +THISAPP = kmod-$(VER) +DL_FILE = $(THISAPP).tar.xz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = d5aba43b9370cd52f3cb35e82a1aa595 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --bindir=/bin \ + --sysconfdir=/etc \ + --enable-zlib \ + --disable-manpages + +# --libdir=/lib \ + + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + + # Create symlinks + ln -svf ../bin/kmod /sbin/modprobe + ln -svf ../bin/kmod /sbin/modinfo + ln -svf ../bin/kmod /sbin/insmod + ln -svf ../bin/kmod /sbin/rmmod + ln -svf ../bin/kmod /sbin/depmod + ln -svf ../bin/kmod /sbin/lsmod + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/linux b/lfs/linux index 5fc9e1f..306a1d1 100644 --- a/lfs/linux +++ b/lfs/linux @@ -230,25 +230,25 @@ ifeq "$(LASTKERNEL)" "1" cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/
# Blacklist matroxfb_base - echo "blacklist matroxfb_base" >> /etc/modprobe.d/framebuffer + echo "blacklist matroxfb_base" >> /etc/modprobe.d/framebuffer.conf # Blacklist old framebuffer modules for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/video -name *fb.ko); do \ - echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer ; \ + echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer.conf ; \ done # Blacklist new drm framebuffer modules for f in $$(ls -1 /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/gpu/drm/*/*.ko); do \ - echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer ; \ + echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer.conf ; \ done - sed -i -e "s|.ko||g" /etc/modprobe.d/framebuffer + sed -i -e "s|.ko||g" /etc/modprobe.d/framebuffer.conf
# Blacklist isdn modules for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn -name *.ko); do \ - echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/isdn ; \ + echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/isdn.conf ; \ done - sed -i -e "s|.ko||g" /etc/modprobe.d/isdn + sed -i -e "s|.ko||g" /etc/modprobe.d/isdn.conf
# Disable ipv6 at runtime - echo "options ipv6 disable_ipv6=1" > /etc/modprobe.d/ipv6 + echo "options ipv6 disable_ipv6=1" > /etc/modprobe.d/ipv6.conf endif
# Disable geode_aes modul if exist diff --git a/lfs/mISDN b/lfs/mISDN index e6a7465..5cd4972 100644 --- a/lfs/mISDN +++ b/lfs/mISDN @@ -106,9 +106,9 @@ endif ifneq "$(XEN)" "1" # Blacklist misdn modules for f in $$(find /lib/modules/$(KVER)-$(VERSUFIX)/mISDN -name *.ko); do \ - echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/mISDN ; \ + echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/mISDN.conf ; \ done - sed -i -e "s|.ko||g" /etc/modprobe.d/mISDN + sed -i -e "s|.ko||g" /etc/modprobe.d/mISDN.conf endif
# Remove mISDN modules that was shipped with the kernel diff --git a/lfs/stage2 b/lfs/stage2 index 5c15f41..3c4a8e4 100644 --- a/lfs/stage2 +++ b/lfs/stage2 @@ -111,6 +111,9 @@ $(TARGET) : chgrp -v utmp /var/run/utmp /var/log/lastlog chmod -v 664 /var/run/utmp /var/log/lastlog
+ # Create /run symlink + ln -s /var/run /run + # Permissions chmod 0711 /var/empty diff --git a/lfs/udev b/lfs/udev index 9ebec2f..d034993 100644 --- a/lfs/udev +++ b/lfs/udev @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2013 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,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,32 +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) && 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-208_remove_systemd_log.patch +# 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 + + 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 + rm -f /lib/udev/rules.d/80-net-name-slot.rules
# Create rule file for the setup touch /etc/udev/rules.d/30-persistent-network.rules
# Blacklist some modules - cp -vf $(DIR_SRC)/config/udev/blacklist /etc/modprobe.d/blacklist + 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 \ diff --git a/make.sh b/make.sh index 849624e..dea4290 100755 --- a/make.sh +++ b/make.sh @@ -360,7 +360,7 @@ buildbase() { lfsmake2 make lfsmake2 man lfsmake2 mktemp - lfsmake2 module-init-tools + lfsmake2 kmod lfsmake2 net-tools lfsmake2 patch lfsmake2 psmisc diff --git a/src/initscripts/init.d/udev b/src/initscripts/init.d/udev index 03846e6..72d1e40 100644 --- a/src/initscripts/init.d/udev +++ b/src/initscripts/init.d/udev @@ -17,6 +17,9 @@
case "${1}" in start) + boot_mesg "Mount /var/run..." + mount -n -t tmpfs tmpfs /var/run -o size=2M + boot_mesg "Populating /dev with device nodes..." if ! grep -q '[[:space:]]sysfs' /proc/mounts; then echo_failure @@ -29,16 +32,10 @@ case "${1}" in read ENTER /etc/rc.d/init.d/halt stop fi - - # Mount a temporary file system over /dev, so that any devices - # made or removed during this boot don't affect the next one. - # The reason we don't write to mtab is because we don't ever - # want /dev to be unavailable (such as by `umount -a'). - mount -n -t tmpfs tmpfs /dev -o mode=755 - if [ ${?} != 0 ]; then + if ! grep -q '[[:space:]]/dev' /proc/mounts; then echo_failure - boot_mesg -n "FAILURE:\n\nCannot mount a tmpfs" ${FAILURE} - boot_mesg -n " onto /dev, this system will be halted." + boot_mesg -n "FAILURE:\n\nKernel has no devtmpfs/mount" ${FAILURE} + boot_mesg -n " support but this is needed for udev." boot_mesg -n "\n\nAfter you press Enter, this system" boot_mesg -n " will be halted and powered off." boot_mesg -n "\n\nPress Enter to continue..." ${INFO} @@ -60,10 +57,10 @@ case "${1}" in
# Now traverse /sys in order to "coldplug" devices that have # already been discovered - /sbin/udevadm trigger + /bin/udevadm trigger
# Now wait for udevd to process the uevents we triggered - /sbin/udevadm settle + /bin/udevadm settle evaluate_retval
;; diff --git a/src/initscripts/init.d/udev_retry b/src/initscripts/init.d/udev_retry index 78461ce..25e6967 100644 --- a/src/initscripts/init.d/udev_retry +++ b/src/initscripts/init.d/udev_retry @@ -26,7 +26,7 @@ case "${1}" in done 2>/dev/null # Now wait for udevd to process the uevents we triggered - /sbin/udevadm settle + /bin/udevadm settle evaluate_retval ;;
diff --git a/src/install+setup/libsmooth/netstuff.c b/src/install+setup/libsmooth/netstuff.c index 1c6eb42..8c6f3fa 100644 --- a/src/install+setup/libsmooth/netstuff.c +++ b/src/install+setup/libsmooth/netstuff.c @@ -532,7 +532,7 @@ int create_udev(void) for (i = 0 ; i < 4 ; i++) { if (strcmp(knics[i].macaddr, "")) { - fprintf(fp,"ACTION=="add", SUBSYSTEM=="net", SYSFS{type}=="1", SYSFS{address}=="%s", NAME="%s0" # %s\n", knics[i].macaddr, lcolourcard[i], knics[i].description); + fprintf(fp,"\n# %s\nACTION=="add", SUBSYSTEM=="net", ATTR{type}=="1", ATTR{address}=="%s", NAME="%s0"\n", knics[i].description, knics[i].macaddr, lcolourcard[i]); } } fclose(fp); diff --git a/src/install+setup/setup/networking.c b/src/install+setup/setup/networking.c index 9c13717..edd3c71 100644 --- a/src/install+setup/setup/networking.c +++ b/src/install+setup/setup/networking.c @@ -112,6 +112,8 @@ int handlenetworking(void) runcommandwithstatus("/etc/rc.d/init.d/network start", ctr[TR_PULLING_NETWORK_UP]); } + } else { + rename_nics(); } create_udev(); return 1; diff --git a/src/patches/dracut-006_add_run_symlink.patch b/src/patches/dracut-006_add_run_symlink.patch new file mode 100644 index 0000000..abe029f --- /dev/null +++ b/src/patches/dracut-006_add_run_symlink.patch @@ -0,0 +1,13 @@ +diff -Naur dracut-006.org/modules.d/99base/init dracut-006/modules.d/99base/init +--- dracut-006.org/modules.d/99base/init 2010-06-17 10:46:29.000000000 +0200 ++++ dracut-006/modules.d/99base/init 2013-10-31 16:51:17.658771341 +0100 +@@ -87,6 +87,9 @@ + + ln -s /proc/self/fd /dev/fd >/dev/null 2>&1 + ++# Add run symlink ++ln -s /var/run /run ++ + if getarg rdinitdebug; then + getarg quiet && DRACUT_QUIET="yes" + mkfifo /dev/initlog.pipe diff --git a/src/patches/dracut-006_remove_scsi_wait.patch b/src/patches/dracut-006_remove_scsi_wait.patch new file mode 100644 index 0000000..cfccf01 --- /dev/null +++ b/src/patches/dracut-006_remove_scsi_wait.patch @@ -0,0 +1,12 @@ +diff -Naur dracut-006.org/modules.d/99base/init dracut-006/modules.d/99base/init +--- dracut-006.org/modules.d/99base/init 2010-06-17 10:46:29.000000000 +0200 ++++ dracut-006/modules.d/99base/init 2013-10-31 17:05:09.135475525 +0100 +@@ -175,7 +175,7 @@ + + $UDEV_QUEUE_EMPTY >/dev/null 2>&1 || continue + +- modprobe scsi_wait_scan && rmmod scsi_wait_scan ++ sleep 0.1 + + $UDEV_QUEUE_EMPTY >/dev/null 2>&1 || continue + diff --git a/src/patches/udev-208_remove_systemd_log.patch b/src/patches/udev-208_remove_systemd_log.patch new file mode 100644 index 0000000..927de1e --- /dev/null +++ b/src/patches/udev-208_remove_systemd_log.patch @@ -0,0 +1,12 @@ +diff -Naur systemd-208.org/src/libudev/libudev-util.c systemd-208/src/libudev/libudev-util.c +--- systemd-208.org/src/libudev/libudev-util.c 2013-09-23 21:31:55.000000000 +0200 ++++ systemd-208/src/libudev/libudev-util.c 2013-11-19 23:18:10.326350131 +0100 +@@ -481,7 +481,7 @@ + if (fd < 0) + return -errno; + +- len = snprintf(text, sizeof(text), "<30>systemd-udevd[%u]: ", getpid()); ++ len = snprintf(text, sizeof(text), "udevd[%u]: ", getpid()); + + va_start(ap, fmt); + len += vsnprintf(text + len, sizeof(text) - len, fmt, ap);
hooks/post-receive -- IPFire 2.x development tree