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, thirteen has been updated via 206ad2f1240ec3ba0786e7c46529dca2e7d55bfc (commit) via ef239becc4807e474cdc8d96dd1ce6bae6a30996 (commit) via 13d491616c1c8aa0f7243e230d28dbb02cb56b38 (commit) via 2c9a70d1581495587b49511f24480b15f89fe7a0 (commit) via ae0d87a63bfea638341bfe54093325707f2f9877 (commit) via ae522f767d6a1641aa605e3f0581ad0cf4497adc (commit) via e8fff1dfef9e4571a1d73441951214ad6122b59e (commit) via 0ebec256b0f59bca995550b1b622378c6ad169ce (commit) from a8c02fc396feddbc2c95076c2e38029ea4b58fc5 (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 206ad2f1240ec3ba0786e7c46529dca2e7d55bfc Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Oct 30 18:34:17 2012 +0100
make.sh fix package machine type package build.
commit ef239becc4807e474cdc8d96dd1ce6bae6a30996 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Oct 30 18:33:52 2012 +0100
cyrus-imapd: fix build.
commit 13d491616c1c8aa0f7243e230d28dbb02cb56b38 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Oct 30 15:35:46 2012 +0100
smartmontools: update to 6.0.
commit 2c9a70d1581495587b49511f24480b15f89fe7a0 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Oct 30 14:57:24 2012 +0100
e2fsprogs: update to 1.42.6.
commit ae0d87a63bfea638341bfe54093325707f2f9877 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Oct 30 14:25:33 2012 +0100
udev: update to 141 and cleanup rules.
commit ae522f767d6a1641aa605e3f0581ad0cf4497adc Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Oct 29 13:34:40 2012 +0100
kudzu: removed.
commit e8fff1dfef9e4571a1d73441951214ad6122b59e Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Oct 29 11:16:57 2012 +0100
installer: blacklist cdrom/tapes as target.
commit 0ebec256b0f59bca995550b1b622378c6ad169ce Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Oct 29 11:13:39 2012 +0100
installer: remove useless deepscan.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/compat-wireless | 2 +- config/rootfiles/common/e2fsprogs | 9 +- config/rootfiles/common/kudzu | 198 -------------------- config/rootfiles/common/udev | 31 ++-- config/rootfiles/installer/kudzu | 1 - config/rootfiles/packages/bluetooth | 2 +- config/udev/10-dvb.rules | 2 - config/udev/55-scsi-cdrom.rules | 2 - config/udev/dvb.sh | 2 - lfs/bluetooth | 4 +- lfs/compat-wireless | 2 +- lfs/cyrus-imapd | 2 +- lfs/e2fsprogs | 4 +- lfs/installer | 4 +- lfs/kudzu | 79 -------- lfs/linux2 | 3 - lfs/smartmontools | 6 +- lfs/udev | 33 ++-- make.sh | 3 +- src/install+setup/install/main.c | 10 +- src/install+setup/install/mountdest.sh | 4 + src/install+setup/install/probehw.sh | 76 -------- src/patches/kudzu-link-lintl.diff | 11 - src/patches/kudzu-usbnet.patch | 40 ---- .../linux-2.6.25.18-not_report_sysctl_1.23.patch | 14 -- src/patches/udev-125-netif_rename.patch | 47 ----- src/patches/udev-141_no_netif_rename.patch | 50 +++++ .../udev-config-6.2_persistent-storage-fix.patch | 12 -- .../udev-config-6.2_remove-lfs-usb-rule.patch | 11 - 29 files changed, 109 insertions(+), 555 deletions(-) delete mode 100644 config/rootfiles/common/kudzu delete mode 120000 config/rootfiles/installer/kudzu delete mode 100644 config/rootfiles/packages/directfb delete mode 100644 config/udev/10-dvb.rules delete mode 100644 config/udev/55-scsi-cdrom.rules delete mode 100755 config/udev/dvb.sh delete mode 100644 lfs/kudzu delete mode 100644 src/install+setup/install/probehw.sh delete mode 100644 src/patches/kudzu-link-lintl.diff delete mode 100644 src/patches/kudzu-usbnet.patch delete mode 100644 src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch delete mode 100644 src/patches/udev-125-netif_rename.patch create mode 100644 src/patches/udev-141_no_netif_rename.patch delete mode 100644 src/patches/udev-config-6.2_persistent-storage-fix.patch delete mode 100644 src/patches/udev-config-6.2_remove-lfs-usb-rule.patch
Difference in files: diff --git a/config/rootfiles/common/compat-wireless b/config/rootfiles/common/compat-wireless index 80018c8..5a562d2 100644 --- a/config/rootfiles/common/compat-wireless +++ b/config/rootfiles/common/compat-wireless @@ -1,2 +1,2 @@ -etc/udev/rules.d/50-compat_firmware.rules +lib/udev/rules.d/50-compat_firmware.rules lib/udev/compat_firmware.sh diff --git a/config/rootfiles/common/e2fsprogs b/config/rootfiles/common/e2fsprogs index a293290..9622e6c 100644 --- a/config/rootfiles/common/e2fsprogs +++ b/config/rootfiles/common/e2fsprogs @@ -41,6 +41,7 @@ usr/bin/uuidgen #usr/include/blkid #usr/include/blkid/blkid.h #usr/include/blkid/blkid_types.h +#usr/include/com_err.h #usr/include/e2p #usr/include/e2p/e2p.h #usr/include/et @@ -54,7 +55,10 @@ usr/bin/uuidgen #usr/include/ext2fs/ext2_types.h #usr/include/ext2fs/ext2fs.h #usr/include/ext2fs/ext3_extents.h +#usr/include/ext2fs/qcow2.h #usr/include/ext2fs/tdb.h +#usr/include/quota +#usr/include/quota/mkquota.h #usr/include/ss #usr/include/ss/ss.h #usr/include/ss/ss_err.h @@ -69,18 +73,20 @@ usr/lib/libcom_err.so usr/lib/libe2p.so #usr/lib/libext2fs.a usr/lib/libext2fs.so +#usr/lib/libquota.a #usr/lib/libss.a usr/lib/libss.so #usr/lib/libuuid.a usr/lib/libuuid.so -#usr/lib/pkgconfig #usr/lib/pkgconfig/blkid.pc #usr/lib/pkgconfig/com_err.pc #usr/lib/pkgconfig/e2p.pc #usr/lib/pkgconfig/ext2fs.pc +#usr/lib/pkgconfig/quota.pc #usr/lib/pkgconfig/ss.pc #usr/lib/pkgconfig/uuid.pc usr/sbin/e2freefrag +usr/sbin/e4defrag usr/sbin/filefrag usr/sbin/mklost+found usr/sbin/uuidd @@ -117,6 +123,7 @@ usr/sbin/uuidd #usr/share/man/man8/e2image.8 #usr/share/man/man8/e2label.8 #usr/share/man/man8/e2undo.8 +#usr/share/man/man8/e4defrag.8 #usr/share/man/man8/filefrag.8 #usr/share/man/man8/findfs.8 #usr/share/man/man8/fsck.8 diff --git a/config/rootfiles/common/kudzu b/config/rootfiles/common/kudzu deleted file mode 100644 index 5776f0f..0000000 --- a/config/rootfiles/common/kudzu +++ /dev/null @@ -1,198 +0,0 @@ -#etc/rc.d/init.d/kudzu -#etc/sysconfig/kudzu -sbin/kudzu -#usr/include/kudzu -#usr/include/kudzu/adb.h -#usr/include/kudzu/alias.h -#usr/include/kudzu/ddc.h -#usr/include/kudzu/device.h -#usr/include/kudzu/firewire.h -#usr/include/kudzu/ide.h -#usr/include/kudzu/isapnp.h -#usr/include/kudzu/keyboard.h -#usr/include/kudzu/kudzu.h -#usr/include/kudzu/macio.h -#usr/include/kudzu/misc.h -#usr/include/kudzu/modules.h -#usr/include/kudzu/parallel.h -#usr/include/kudzu/pci.h -#usr/include/kudzu/pcmcia.h -#usr/include/kudzu/psaux.h -#usr/include/kudzu/sbus.h -#usr/include/kudzu/scsi.h -#usr/include/kudzu/serial.h -#usr/include/kudzu/usb.h -#usr/lib/libkudzu.a -#usr/lib/libkudzu_loader.a -#usr/lib/python2.7/lib2to3/tests/data/bom.pyc -#usr/lib/python2.7/lib2to3/tests/data/crlf.pyc -#usr/lib/python2.7/lib2to3/tests/data/different_encoding.pyc -#usr/lib/python2.7/lib2to3/tests/data/fixers/bad_order.pyc -#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/__init__.pyc -#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/fix_explicit.pyc -#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/fix_first.pyc -#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/fix_last.pyc -#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/fix_parrot.pyc -#usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes/fix_preorder.pyc -#usr/lib/python2.7/lib2to3/tests/data/fixers/no_fixer_cls.pyc -#usr/lib/python2.7/lib2to3/tests/data/fixers/parrot_example.pyc -#usr/lib/python2.7/lib2to3/tests/data/infinite_recursion.pyc -#usr/lib/python2.7/lib2to3/tests/data/py2_test_grammar.pyc -#usr/lib/python2.7/site-packages/_kudzumodule.so -#usr/lib/python2.7/site-packages/drv_libxml2.pyc -#usr/lib/python2.7/site-packages/kudzu.py -#usr/lib/python2.7/site-packages/kudzu.pyc -#usr/lib/python2.7/site-packages/libxslt.pyc -#usr/lib/python2.7/site-packages/snack.pyc -usr/sbin/kudzu -#usr/share/locale/ar -#usr/share/locale/ar/LC_MESSAGES -#usr/share/locale/ar/LC_MESSAGES/kudzu.mo -#usr/share/locale/as -#usr/share/locale/as/LC_MESSAGES -#usr/share/locale/as/LC_MESSAGES/kudzu.mo -#usr/share/locale/be/LC_MESSAGES/kudzu.mo -#usr/share/locale/bg -#usr/share/locale/bg/LC_MESSAGES -#usr/share/locale/bg/LC_MESSAGES/kudzu.mo -#usr/share/locale/bn -#usr/share/locale/bn/LC_MESSAGES -#usr/share/locale/bn/LC_MESSAGES/kudzu.mo -#usr/share/locale/bn_IN -#usr/share/locale/bn_IN/LC_MESSAGES -#usr/share/locale/bn_IN/LC_MESSAGES/kudzu.mo -#usr/share/locale/bs -#usr/share/locale/bs/LC_MESSAGES -#usr/share/locale/bs/LC_MESSAGES/kudzu.mo -#usr/share/locale/ca/LC_MESSAGES/kudzu.mo -#usr/share/locale/cs/LC_MESSAGES/kudzu.mo -#usr/share/locale/cy -#usr/share/locale/cy/LC_MESSAGES -#usr/share/locale/cy/LC_MESSAGES/kudzu.mo -#usr/share/locale/da/LC_MESSAGES/kudzu.mo -#usr/share/locale/de/LC_MESSAGES/kudzu.mo -#usr/share/locale/el/LC_MESSAGES/kudzu.mo -#usr/share/locale/en_GB/LC_MESSAGES/kudzu.mo -#usr/share/locale/es/LC_MESSAGES/kudzu.mo -#usr/share/locale/et/LC_MESSAGES/kudzu.mo -#usr/share/locale/eu_ES -#usr/share/locale/eu_ES/LC_MESSAGES -#usr/share/locale/eu_ES/LC_MESSAGES/kudzu.mo -#usr/share/locale/fi/LC_MESSAGES/kudzu.mo -#usr/share/locale/fr/LC_MESSAGES/kudzu.mo -#usr/share/locale/gl/LC_MESSAGES/kudzu.mo -#usr/share/locale/gu -#usr/share/locale/gu/LC_MESSAGES -#usr/share/locale/gu/LC_MESSAGES/kudzu.mo -#usr/share/locale/he -#usr/share/locale/he/LC_MESSAGES -#usr/share/locale/he/LC_MESSAGES/kudzu.mo -#usr/share/locale/hi -#usr/share/locale/hi/LC_MESSAGES -#usr/share/locale/hi/LC_MESSAGES/kudzu.mo -#usr/share/locale/hr/LC_MESSAGES/kudzu.mo -#usr/share/locale/hu/LC_MESSAGES/kudzu.mo -#usr/share/locale/hy -#usr/share/locale/hy/LC_MESSAGES -#usr/share/locale/hy/LC_MESSAGES/kudzu.mo -#usr/share/locale/id -#usr/share/locale/id/LC_MESSAGES -#usr/share/locale/id/LC_MESSAGES/kudzu.mo -#usr/share/locale/ilo -#usr/share/locale/ilo/LC_MESSAGES -#usr/share/locale/ilo/LC_MESSAGES/kudzu.mo -#usr/share/locale/is -#usr/share/locale/is/LC_MESSAGES -#usr/share/locale/is/LC_MESSAGES/kudzu.mo -#usr/share/locale/it/LC_MESSAGES/kudzu.mo -#usr/share/locale/ja/LC_MESSAGES/kudzu.mo -#usr/share/locale/ka -#usr/share/locale/ka/LC_MESSAGES -#usr/share/locale/ka/LC_MESSAGES/kudzu.mo -#usr/share/locale/kn -#usr/share/locale/kn/LC_MESSAGES -#usr/share/locale/kn/LC_MESSAGES/kudzu.mo -#usr/share/locale/ko/LC_MESSAGES/kudzu.mo -#usr/share/locale/ku -#usr/share/locale/ku/LC_MESSAGES -#usr/share/locale/ku/LC_MESSAGES/kudzu.mo -#usr/share/locale/lo -#usr/share/locale/lo/LC_MESSAGES -#usr/share/locale/lo/LC_MESSAGES/kudzu.mo -#usr/share/locale/lt -#usr/share/locale/lt/LC_MESSAGES -#usr/share/locale/lt/LC_MESSAGES/kudzu.mo -#usr/share/locale/lv -#usr/share/locale/lv/LC_MESSAGES -#usr/share/locale/lv/LC_MESSAGES/kudzu.mo -#usr/share/locale/mk -#usr/share/locale/mk/LC_MESSAGES -#usr/share/locale/mk/LC_MESSAGES/kudzu.mo -#usr/share/locale/ml -#usr/share/locale/ml/LC_MESSAGES -#usr/share/locale/ml/LC_MESSAGES/kudzu.mo -#usr/share/locale/mr -#usr/share/locale/mr/LC_MESSAGES -#usr/share/locale/mr/LC_MESSAGES/kudzu.mo -#usr/share/locale/ms -#usr/share/locale/ms/LC_MESSAGES -#usr/share/locale/ms/LC_MESSAGES/kudzu.mo -#usr/share/locale/my -#usr/share/locale/my/LC_MESSAGES -#usr/share/locale/my/LC_MESSAGES/kudzu.mo -#usr/share/locale/nb/LC_MESSAGES/kudzu.mo -#usr/share/locale/nl/LC_MESSAGES/kudzu.mo -#usr/share/locale/nn -#usr/share/locale/nn/LC_MESSAGES -#usr/share/locale/nn/LC_MESSAGES/kudzu.mo -#usr/share/locale/no -#usr/share/locale/no/LC_MESSAGES -#usr/share/locale/no/LC_MESSAGES/kudzu.mo -#usr/share/locale/or -#usr/share/locale/or/LC_MESSAGES -#usr/share/locale/or/LC_MESSAGES/kudzu.mo -#usr/share/locale/pa -#usr/share/locale/pa/LC_MESSAGES -#usr/share/locale/pa/LC_MESSAGES/kudzu.mo -#usr/share/locale/pl/LC_MESSAGES/kudzu.mo -#usr/share/locale/pt -#usr/share/locale/pt/LC_MESSAGES -#usr/share/locale/pt/LC_MESSAGES/kudzu.mo -#usr/share/locale/pt_BR/LC_MESSAGES/kudzu.mo -#usr/share/locale/ro/LC_MESSAGES/kudzu.mo -#usr/share/locale/ru/LC_MESSAGES/kudzu.mo -#usr/share/locale/si -#usr/share/locale/si/LC_MESSAGES -#usr/share/locale/si/LC_MESSAGES/kudzu.mo -#usr/share/locale/sk/LC_MESSAGES/kudzu.mo -#usr/share/locale/sl/LC_MESSAGES/kudzu.mo -#usr/share/locale/sq -#usr/share/locale/sq/LC_MESSAGES -#usr/share/locale/sq/LC_MESSAGES/kudzu.mo -#usr/share/locale/sr -#usr/share/locale/sr/LC_MESSAGES -#usr/share/locale/sr/LC_MESSAGES/kudzu.mo -#usr/share/locale/sr@Latn -#usr/share/locale/sr@Latn/LC_MESSAGES -#usr/share/locale/sr@Latn/LC_MESSAGES/kudzu.mo -#usr/share/locale/sv/LC_MESSAGES/kudzu.mo -#usr/share/locale/ta -#usr/share/locale/ta/LC_MESSAGES -#usr/share/locale/ta/LC_MESSAGES/kudzu.mo -#usr/share/locale/te -#usr/share/locale/te/LC_MESSAGES -#usr/share/locale/te/LC_MESSAGES/kudzu.mo -#usr/share/locale/tr/LC_MESSAGES/kudzu.mo -#usr/share/locale/uk/LC_MESSAGES/kudzu.mo -#usr/share/locale/ur -#usr/share/locale/ur/LC_MESSAGES -#usr/share/locale/ur/LC_MESSAGES/kudzu.mo -#usr/share/locale/vi -#usr/share/locale/vi/LC_MESSAGES -#usr/share/locale/vi/LC_MESSAGES/kudzu.mo -#usr/share/locale/wa -#usr/share/locale/wa/LC_MESSAGES -#usr/share/locale/wa/LC_MESSAGES/kudzu.mo -#usr/share/locale/zh_CN/LC_MESSAGES/kudzu.mo -#usr/share/locale/zh_TW/LC_MESSAGES/kudzu.mo -#usr/share/man/man8/kudzu.8 diff --git a/config/rootfiles/common/udev b/config/rootfiles/common/udev index 58df07c..0d513f6 100644 --- a/config/rootfiles/common/udev +++ b/config/rootfiles/common/udev @@ -1,25 +1,18 @@ etc/modprobe.d/blacklist etc/scsi_id.config etc/udev -#etc/udev/dvb.sh #etc/udev/rules.d -#etc/udev/rules.d/05-udev-early.rules -#etc/udev/rules.d/10-dvb.rules -#etc/udev/rules.d/25-lfs.rules -#etc/udev/rules.d/26-modprobe.rules -#etc/udev/rules.d/27-firmware.rules #etc/udev/rules.d/30-persistent-network.rules -#etc/udev/rules.d/55-scsi-cdrom.rules -#etc/udev/rules.d/60-persistent-storage.rules -#etc/udev/rules.d/81-cdrom.rules #etc/udev/udev.conf #lib/firmware -lib/firmware/dirinfo -lib/libvolume_id.so.0 -lib/libvolume_id.so.0.85.0 +lib/libudev.so.0 +lib/libudev.so.0.2.0 +lib/libvolume_id.so.1 +lib/libvolume_id.so.1.1.0 lib/udev #lib/udev/ata_id #lib/udev/cdrom_id +#lib/udev/collect #lib/udev/create_floppy_devices #lib/udev/devices #lib/udev/devices/core @@ -33,27 +26,36 @@ lib/udev #lib/udev/edd_id #lib/udev/enable_codel #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/50-firmware.rules #lib/udev/rules.d/50-udev-default.rules #lib/udev/rules.d/60-cdrom_id.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/80-drivers.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/write_cd_rules +#lib/udev/write_net_rules sbin/udevadm sbin/udevd -sbin/udevsettle -usr/bin/udevinfo +#usr/include/libudev.h #usr/include/libvolume_id.h +usr/lib/libudev.so usr/lib/libvolume_id.so +#usr/lib/pkgconfig/libudev.pc #usr/lib/pkgconfig/libvolume_id.pc #usr/share/man/man7/udev.7 #usr/share/man/man8/ata_id.8 @@ -64,4 +66,5 @@ usr/lib/libvolume_id.so #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/rootfiles/installer/kudzu b/config/rootfiles/installer/kudzu deleted file mode 120000 index da66b91..0000000 --- a/config/rootfiles/installer/kudzu +++ /dev/null @@ -1 +0,0 @@ -../common/kudzu \ No newline at end of file diff --git a/config/rootfiles/packages/bluetooth b/config/rootfiles/packages/bluetooth index 278cbea..267e40e 100644 --- a/config/rootfiles/packages/bluetooth +++ b/config/rootfiles/packages/bluetooth @@ -6,7 +6,7 @@ etc/bluetooth/main.conf etc/bluetooth/network.conf etc/bluetooth/rfcomm.conf etc/dbus-1/system.d/bluetooth.conf -etc/udev/rules.d/24-bluetooth.rules +#lib/udev/rules.d/24-bluetooth.rules lib/firmware/BCM-LEGAL.txt lib/firmware/BCM2033-FW.bin lib/firmware/BCM2033-MD.hex diff --git a/config/rootfiles/packages/directfb b/config/rootfiles/packages/directfb deleted file mode 100644 index e69de29..0000000 diff --git a/config/udev/10-dvb.rules b/config/udev/10-dvb.rules deleted file mode 100644 index 5bcd40e..0000000 --- a/config/udev/10-dvb.rules +++ /dev/null @@ -1,2 +0,0 @@ -# Create DVB Devices -KERNEL=="dvb*", PROGRAM="/etc/udev/dvb.sh %k", NAME="%c" diff --git a/config/udev/55-scsi-cdrom.rules b/config/udev/55-scsi-cdrom.rules deleted file mode 100644 index f7ad37d..0000000 --- a/config/udev/55-scsi-cdrom.rules +++ /dev/null @@ -1,2 +0,0 @@ -# SCSI devices -BUS=="scsi", KERNEL=="sr[0-9]*", NAME="scd%n", SYMLINK+="sr%n" diff --git a/config/udev/dvb.sh b/config/udev/dvb.sh deleted file mode 100755 index 5405ffa..0000000 --- a/config/udev/dvb.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -/bin/echo $1 | /bin/sed -e 's,dvb([0-9]).([^0-9]*)([0-9]),dvb/adapter\1/\2\3,' diff --git a/lfs/bluetooth b/lfs/bluetooth index ca3176d..33e126c 100644 --- a/lfs/bluetooth +++ b/lfs/bluetooth @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2012 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 # @@ -108,7 +108,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --sysconfdir=/etc --localstatedir=/var --libexecdir=/lib cd $(DIR_SRC)/bluez-hcidump-1.42 && make $(MAKETUNING) cd $(DIR_SRC)/bluez-hcidump-1.42 && make install - mv -f /etc/udev/bluetooth.rules /etc/udev/rules.d/24-bluetooth.rules + mv -f /etc/udev/bluetooth.rules /lib/udev/rules.d/24-bluetooth.rules # Change bluetooth peername to Hostname-devicenumber sed -i -e 's|name "BlueZ (%d)";|name "%h-%d";|g' /etc/bluetooth/hcid.conf # Create empty config files diff --git a/lfs/compat-wireless b/lfs/compat-wireless index d51f2d0..4f94fe8 100644 --- a/lfs/compat-wireless +++ b/lfs/compat-wireless @@ -117,7 +117,7 @@ endif KMODPATH_ARG='INSTALL_MOD_PATH=' KMODDIR=kernel install-modules
# Install firmware udev files... - cd $(DIR_APP)/udev && install -m 644 50-compat_firmware.rules /etc/udev/rules.d/ + cd $(DIR_APP)/udev && install -m 644 50-compat_firmware.rules /lib/udev/rules.d/ cd $(DIR_APP)/udev && install -m 755 compat_firmware.sh /lib/udev/
-rm -rf $(DIR_APP) diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd index 0a4fe2c..8f74c5a 100644 --- a/lfs/cyrus-imapd +++ b/lfs/cyrus-imapd @@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-autocreate-0.9.4.diff cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-gcc4.patch - cp -f /usr/include/et/com_err.h /usr/include/com_err.h +# cp -f /usr/include/et/com_err.h /usr/include/com_err.h cd $(DIR_APP) && ./configure --prefix=/usr --with-service-path=/usr/lib/cyrus \ --with-cyrus-prefix=/usr/lib/cyrus --sysconfdir=/var/ipfire/cyrusimap \ --with-auth=unix --with-perl --with-sasl --with-idle=idled \ diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs index 6844d3b..dff6393 100644 --- a/lfs/e2fsprogs +++ b/lfs/e2fsprogs @@ -24,7 +24,7 @@
include Config
-VER = 1.41.11 +VER = 1.42.6
THISAPP = e2fsprogs-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = fb507a40c2706bc38306f150d069e345 +$(DL_FILE)_MD5 = 9e444c240c1001b3292d108fbad0f49c
install : $(TARGET)
diff --git a/lfs/installer b/lfs/installer index 7661963..740793a 100644 --- a/lfs/installer +++ b/lfs/installer @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2012 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 # @@ -61,7 +61,7 @@ $(TARGET) : -DNAME='"$(NAME)"' -DSNAME='"$(SNAME)"' -DVERSION='"$(VERSION)"' \ -DSLOGAN='"$(SLOGAN)"' -DCONFIG_ROOT='"$(CONFIG_ROOT)"' -DKERNEL_VERSION='"$(KVER)"'" cd $(DIR_APP)/install && install -v -m 0755 install probenic.sh \ - probehw.sh downloadsource.sh mountsource.sh mountdest.sh /install/initrd/bin + downloadsource.sh mountsource.sh mountdest.sh /install/initrd/bin #Patch ISO Name for download ... sed -i -e "s|ipfire.iso|download.ipfire.org/releases/ipfire-2.x/$(VERSION)-core$(CORE)/$(SNAME)-$(VERSION).$(MACHINE)-full-core$(CORE).iso|g" \ /install/initrd/bin/downloadsource.sh diff --git a/lfs/kudzu b/lfs/kudzu deleted file mode 100644 index bc5ed02..0000000 --- a/lfs/kudzu +++ /dev/null @@ -1,79 +0,0 @@ -############################################################################### -# # -# 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 = 1.2.64 - -THISAPP = kudzu-$(VER) -DL_FILE = kudzu-$(VER).tar.gz -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 = 3eb6fae5e8f62409fd5149f2079f6060 - -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 zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/kudzu-usbnet.patch - rm -rf /usr/sbin/kudzu - cd $(DIR_APP) && ARCH=$(MACHINE) RPM_OPT_FLAGS="$(CFLAGS)" make - cd $(DIR_APP) && ARCH=$(MACHINE) RPM_OPT_FLAGS="$(CFLAGS)" make install - cd $(DIR_APP) && ARCH=$(MACHINE) RPM_OPT_FLAGS="$(CFLAGS)" make install-program - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/linux2 b/lfs/linux2 index 9bedd53..0a53bdc 100644 --- a/lfs/linux2 +++ b/lfs/linux2 @@ -139,9 +139,6 @@ else cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32-imq-test2.patch endif
- # Not report deprecated syscall 1.23 (for kudzu) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch - # Reiser4 (don't check if fail (some patches are already in xen patchset) -cd $(DIR_APP) && bzcat $(DIR_DL)/reiser4-for-2.6.32.patch.bz2 | patch -Np1
diff --git a/lfs/smartmontools b/lfs/smartmontools index 1f9467a..a4ae11b 100644 --- a/lfs/smartmontools +++ b/lfs/smartmontools @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2012 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 = 5.43 +VER = 6.0
THISAPP = smartmontools-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = a1cb2c3d8cc2de377037fe9e7cef40a9 +$(DL_FILE)_MD5 = 5646a07f5f4bee8e2e649de8c6b7ae87
install : $(TARGET)
diff --git a/lfs/udev b/lfs/udev index 6e31c90..a16ba6f 100644 --- a/lfs/udev +++ b/lfs/udev @@ -24,10 +24,10 @@
include Config
-VER = 125 +VER = 141
THISAPP = udev-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -36,13 +36,11 @@ TARGET = $(DIR_INFO)/$(THISAPP) # Top-level Rules ###############################################################################
-objects = $(DL_FILE) udev-config-6.2.tar.bz2 +objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -udev-config-6.2.tar.bz2 = $(DL_FROM)/udev-config-6.2.tar.bz2
-$(DL_FILE)_MD5 = be98e04cefdd9ca76b8fe7e92735ce29 -udev-config-6.2.tar.bz2_MD5 = 9ff2667ab0f7bfe8182966ef690078a0 +$(DL_FILE)_MD5 = 1670fe81cabf5161319c52084cf81134
install : $(TARGET)
@@ -71,35 +69,32 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-125-netif_rename.patch + @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 rm -rf /lib/udev/devices - cd $(DIR_APP) && tar jxf $(DIR_DL)/udev-config-6.2.tar.bz2 - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/udev-config-6.2_persistent-storage-fix.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/udev-config-6.2_remove-lfs-usb-rule.patch install -dv /lib/{firmware,udev/devices/{pts,shm}} - echo "Put device firmwares here ..." > /lib/firmware/dirinfo 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 - cd $(DIR_APP) && cp -v udev-config-6.2/[0-9]* /etc/udev/rules.d/ - cp -rf $(DIR_SRC)/config/udev/10-dvb.rules /etc/udev/rules.d/ - cp -rf $(DIR_SRC)/config/udev/55-scsi-cdrom.rules /etc/udev/rules.d/ - chmod 644 /etc/udev/rules.d/10-dvb.rules - chmod 644 /etc/udev/rules.d/55-scsi-cdrom.rules - cp -rf $(DIR_SRC)/config/udev/dvb.sh /etc/udev/ - chmod 755 /etc/udev/dvb.sh + + # Disable net generator rule. This does not work with the setup. + rm -f /lib/udev/rules.d/75-persistent-net-generator.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
# Install codel rules. diff --git a/make.sh b/make.sh index 781d477..59b8d51 100755 --- a/make.sh +++ b/make.sh @@ -519,7 +519,6 @@ buildipfire() { ipfiremake mISDNuser ipfiremake capi4k-utils ipfiremake hwdata - ipfiremake kudzu ipfiremake logrotate ipfiremake logwatch ipfiremake misc-progs @@ -867,7 +866,7 @@ ipfirepackages() { ipfiremake core-updates
local i - for i in $(find $BASEDIR/config/rootfiles/packages{${machine},} -maxdepth 1 -type f); do + for i in $(find $BASEDIR/config/rootfiles/packages{/${MACHINE},} -maxdepth 1 -type f); do i=$(basename ${i}) if [ -e $BASEDIR/lfs/$i ]; then ipfiredist $i diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 319dfde..9513a7f 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -57,7 +57,6 @@ int main(int argc, char *argv[]) int choice; int i; int found = 0; - int firstrun = 0; char shortlangname[10]; char message[1000]; char title[STRING_SIZE]; @@ -203,13 +202,8 @@ int main(int argc, char *argv[]) found = 1; break; case 10: // No harddisk found - if (firstrun == 1) { - errorbox(ctr[TR_NO_HARDDISK]); - goto EXIT; - } - // Do this if the kudzu-scan fails... - runcommandwithstatus("/bin/probehw.sh deep-scan", ctr[TR_PROBING_HARDWARE]); - firstrun = 1; + errorbox(ctr[TR_NO_HARDDISK]); + goto EXIT; } }
diff --git a/src/install+setup/install/mountdest.sh b/src/install+setup/install/mountdest.sh index 749d4fa..776962a 100644 --- a/src/install+setup/install/mountdest.sh +++ b/src/install+setup/install/mountdest.sh @@ -72,6 +72,10 @@ for path in /sys/block/*; do fd*) continue ;; + # Cd/Tape. + sr*) + continue + ;; esac
# Replace any exclamation marks (e.g. cciss!c0d0). diff --git a/src/install+setup/install/probehw.sh b/src/install+setup/install/probehw.sh deleted file mode 100644 index c56462e..0000000 --- a/src/install+setup/install/probehw.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh -############################################################################### -# # -# 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/. # -# # -############################################################################### - -echo "Detecting Hardware..." -for MODULE in $(kudzu -qps -t 30 | grep driver: | cut -d ' ' -f 2 | sort | uniq); do - if [ "${MODULE}" = "unknown" ] || \ - [ "${MODULE}" = "ignore" ] || \ - [ "${MODULE}" = "" ]; then - continue - fi - MODULE=$(find /lib/modules -name $(echo $MODULE | sed -e 's/[_-]/*/g')* 2>/dev/null) - [ "${MODULE}" == "" ] && continue - MODULE=$(basename $MODULE | cut -d. -f1 | head -1) - - if grep -Eqe "^${MODULE} " /proc/modules; then - continue - fi - echo -n "Loading ${MODULE}" - modprobe ${MODULE} >/dev/null 2>&1 - echo " --> ecode: $?" -done - -sleep 10 - -if [ $# -eq 0 ]; then - exit 0 -fi - -## If the autodetection fails we will try to load every module... -## Do this only when we want... - -for i in a b c d e f g; do - if [ ! -e /dev/sd$i ]; then - DEVICE="/dev/sd$i" - echo "Checking for: $DEVICE" - break - fi -done - -for MODULE in $(ls /lib/modules/*/kernel/drivers/ata && ls /lib/modules/*/kernel/drivers/scsi); do - MODULE=`basename $MODULE | awk -F. '{ print $1 }'` - - echo -n "Probing for $MODULE" - modprobe $MODULE >/dev/null 2>&1 - RETVAL=$? - echo " --> ecode: $RETVAL" - if [ "$RETVAL" -eq "0" ]; then - sleep 3 - if [ -e "$DEVICE" ]; then - break - fi - fi - -done - -sleep 5 - -exit 0 diff --git a/src/patches/kudzu-link-lintl.diff b/src/patches/kudzu-link-lintl.diff deleted file mode 100644 index ec3974c..0000000 --- a/src/patches/kudzu-link-lintl.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- tmp/kudzu-1.2.60/Makefile 2006-09-05 15:56:21.000000000 +0200 -+++ build/usr/src/kudzu-1.2.60/Makefile 2006-11-20 15:08:32.000000000 +0100 -@@ -63,7 +63,7 @@ - $(RANLIB) libkudzu.a - - kudzu: libkudzu.a $(KUDOBJS) po -- $(CC) $(CFLAGS) $(LDFLAGS) $(KUDOBJS) -o kudzu -L. -lkudzu -L. -lpci -Wl,-Bstatic -lpopt -Wl,-Bdynamic -+ $(CC) $(CFLAGS) $(LDFLAGS) $(KUDOBJS) -o kudzu -L. -lkudzu -L. -lpci -L. -lintl -Wl,-Bstatic -lpopt -Wl,-Bdynamic - - module_upgrade: libkudzu.a module_upgrade.c - $(CC) $(CFLAGS) $(LDFLAGS) module_upgrade.c -o module_upgrade -L. -lkudzu -lpci diff --git a/src/patches/kudzu-usbnet.patch b/src/patches/kudzu-usbnet.patch deleted file mode 100644 index 185d1a7..0000000 --- a/src/patches/kudzu-usbnet.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -Naur kudzu-1.2.64.org/usb.c kudzu-1.2.64/usb.c ---- kudzu-1.2.64.org/usb.c 2006-11-28 17:58:58.000000000 +0100 -+++ kudzu-1.2.64/usb.c 2009-07-16 20:33:19.000000000 +0200 -@@ -261,13 +261,33 @@ - t->desc = strdup(t->usbprod); - else - asprintf(&t->desc,"Unknown USB device 0x%x:0x%x",t->vendorId,t->deviceId); -- if (t->driver && (!strcmp(t->driver, "pegasus") || -+ if (t->driver && (!strcmp(t->driver, "asix") || - !strcmp(t->driver, "catc") || -+ !strcmp(t->driver, "cdc_ether") || -+ !strcmp(t->driver, "cdc_subset") || -+ !strcmp(t->driver, "dm9601") || -+ !strcmp(t->driver, "gl620a") || - !strcmp(t->driver, "kaweth") || -+ !strcmp(t->driver, "mcs7830") || -+ !strcmp(t->driver, "net1080") || -+ !strcmp(t->driver, "pegasus") || -+ !strcmp(t->driver, "plusb") || -+ !strcmp(t->driver, "rndis_host") || - !strcmp(t->driver, "rtl8150") || -- !strcmp(t->driver, "ax8817x") || -+ !strcmp(t->driver, "zaurus") || -+ !strcmp(t->driver, "rt2500usb") || -+ !strcmp(t->driver, "rt2800usb") || -+ !strcmp(t->driver, "rt2x00usb") || -+ !strcmp(t->driver, "rt73usb") || -+ !strcmp(t->driver, "ar9170usb") || -+ !strcmp(t->driver, "libertas_tf_usb") || -+ !strcmp(t->driver, "at76c50x-usb") || -+ !strcmp(t->driver, "p54usb") || -+ !strcmp(t->driver, "rndis_wlan") || -+ !strcmp(t->driver, "rtl8187") || -+ !strcmp(t->driver, "usb8xxx") || - !strcmp(t->driver, "zd1201") || -- !strcmp(t->driver, "asix") || -+ !strcmp(t->driver, "zd1211rw") || - !strcmp(t->driver, "usbnet"))) { - if (t->type == CLASS_OTHER) - t->type = CLASS_NETWORK; diff --git a/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch b/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch deleted file mode 100644 index 7419c05..0000000 --- a/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur linux-2.6.25.18.org/kernel/sysctl.c linux-2.6.25.18/kernel/sysctl.c ---- linux-2.6.25.18.org/kernel/sysctl.c 2008-10-09 04:58:32.000000000 +0200 -+++ linux-2.6.25.18/kernel/sysctl.c 2008-10-10 18:03:33.000000000 +0200 -@@ -2807,6 +2807,10 @@ - if ((args->nlen == 2) && (name[0] == CTL_KERN) && (name[1] == KERN_VERSION)) - return 0; - -+ /* Ignore kudzu syscall 1.23 */ -+ if ((args->nlen == 2) && (name[0] == 1) && (name[1] == 23)) -+ return 0; -+ - if (msg_count < 5) { - msg_count++; - printk(KERN_INFO diff --git a/src/patches/udev-125-netif_rename.patch b/src/patches/udev-125-netif_rename.patch deleted file mode 100644 index c80b05a..0000000 --- a/src/patches/udev-125-netif_rename.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -Nur udev-125.vanilla/udev_device.c udev-125/udev_device.c ---- udev-125.vanilla/udev_device.c 2008-07-18 16:26:55.000000000 +0200 -+++ udev-125/udev_device.c 2010-07-25 18:15:12.289242450 +0200 -@@ -123,42 +123,7 @@ - if (retval == 0) - kernel_log(ifr); - else { -- int loop; -- -- /* see if the destination interface name already exists */ -- if (errno != EEXIST) { -- err("error changing netif name %s to %s: %s\n", ifr.ifr_name, ifr.ifr_newname, strerror(errno)); -- goto exit; -- } -- -- /* free our own name, another process may wait for us */ -- strlcpy(ifr.ifr_newname, udev->dev->kernel, IFNAMSIZ); -- strlcat(ifr.ifr_newname, "_rename", IFNAMSIZ); -- retval = ioctl(sk, SIOCSIFNAME, &ifr); -- if (retval != 0) { -- err("error changing netif name %s to %s: %s\n", ifr.ifr_name, ifr.ifr_newname, strerror(errno)); -- goto exit; -- } -- -- /* wait 30 seconds for our target to become available */ -- strlcpy(ifr.ifr_name, ifr.ifr_newname, IFNAMSIZ); -- strlcpy(ifr.ifr_newname, udev->name, IFNAMSIZ); -- loop = 30 * 20; -- while (loop--) { -- retval = ioctl(sk, SIOCSIFNAME, &ifr); -- if (retval == 0) { -- kernel_log(ifr); -- break; -- } -- -- if (errno != EEXIST) { -- err("error changing net interface name %s to %s: %s\n", -- ifr.ifr_name, ifr.ifr_newname, strerror(errno)); -- break; -- } -- dbg("wait for netif '%s' to become free, loop=%i\n", udev->name, (30 * 20) - loop); -- usleep(1000 * 1000 / 20); -- } -+ err("error changing netif name %s to %s: %s\n", ifr.ifr_name, ifr.ifr_newname, strerror(errno)); - } - - exit: diff --git a/src/patches/udev-141_no_netif_rename.patch b/src/patches/udev-141_no_netif_rename.patch new file mode 100644 index 0000000..fcc5009 --- /dev/null +++ b/src/patches/udev-141_no_netif_rename.patch @@ -0,0 +1,50 @@ +diff -Naur udev-141.org/udev/udev-event.c udev-141/udev/udev-event.c +--- udev-141.org/udev/udev-event.c 2009-02-24 15:08:35.000000000 +0100 ++++ udev-141/udev/udev-event.c 2012-10-30 12:27:00.262833136 +0100 +@@ -486,45 +486,8 @@ + if (err == 0) + rename_netif_kernel_log(ifr); + else { +- int loop; +- +- /* see if the destination interface name already exists */ +- if (errno != EEXIST) { +- err(event->udev, "error changing netif name %s to %s: %m\n", +- ifr.ifr_name, ifr.ifr_newname); +- goto exit; +- } +- +- /* free our own name, another process may wait for us */ +- util_strlcpy(ifr.ifr_newname, udev_device_get_sysname(dev), IFNAMSIZ); +- util_strlcat(ifr.ifr_newname, "_rename", IFNAMSIZ); +- err = ioctl(sk, SIOCSIFNAME, &ifr); +- if (err != 0) { +- err(event->udev, "error changing netif name %s to %s: %m\n", ++ err(event->udev, "error changing netif name %s to %s: %m\n", + ifr.ifr_name, ifr.ifr_newname); +- goto exit; +- } +- +- /* wait 90 seconds for our target to become available */ +- util_strlcpy(ifr.ifr_name, ifr.ifr_newname, IFNAMSIZ); +- util_strlcpy(ifr.ifr_newname, event->name, IFNAMSIZ); +- loop = 90 * 20; +- while (loop--) { +- err = ioctl(sk, SIOCSIFNAME, &ifr); +- if (err == 0) { +- rename_netif_kernel_log(ifr); +- break; +- } +- +- if (errno != EEXIST) { +- err(event->udev, "error changing net interface name %s to %s: %m\n", +- ifr.ifr_name, ifr.ifr_newname); +- break; +- } +- dbg(event->udev, "wait for netif '%s' to become free, loop=%i\n", +- event->name, (90 * 20) - loop); +- usleep(1000 * 1000 / 20); +- } + } + exit: + close(sk); diff --git a/src/patches/udev-config-6.2_persistent-storage-fix.patch b/src/patches/udev-config-6.2_persistent-storage-fix.patch deleted file mode 100644 index 172091a..0000000 --- a/src/patches/udev-config-6.2_persistent-storage-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur udev-config-6.2.org/60-persistent-storage.rules udev-config-6.2/60-persistent-storage.rules ---- udev-config-6.2.org/60-persistent-storage.rules 2006-05-13 01:03:13.000000000 +0200 -+++ udev-config-6.2/60-persistent-storage.rules 2010-08-14 11:08:35.000000000 +0200 -@@ -9,7 +9,7 @@ - - # never access removable ide devices, the drivers are causing event loops on open() - KERNEL=="hd*[!0-9]", SYSFS{removable}=="1", DRIVER=="ide-cs|ide-floppy", GOTO="persistent_storage_end" --KERNEL=="hd*[0-9]", SYSFS{../removable}=="1", GOTO="persistent_storage_end" -+KERNEL=="hd*[0-9]", SYSFS{removable}=="1", GOTO="persistent_storage_end" - - # for partitions import parent information - KERNEL=="*[0-9]", IMPORT{parent}=="ID_*" diff --git a/src/patches/udev-config-6.2_remove-lfs-usb-rule.patch b/src/patches/udev-config-6.2_remove-lfs-usb-rule.patch deleted file mode 100644 index ef02bf7..0000000 --- a/src/patches/udev-config-6.2_remove-lfs-usb-rule.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur udev-config-6.2.org/25-lfs.rules udev-config-6.2/25-lfs.rules ---- udev-config-6.2.org/25-lfs.rules 2006-07-14 23:29:28.000000000 +0200 -+++ udev-config-6.2/25-lfs.rules 2010-12-21 18:55:40.375602794 +0100 -@@ -84,7 +84,6 @@ - - # USB devices go in their own subdirectory - --SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*} D=$${X#*.}; echo bus/usb/$$B/$$D'", NAME="%c" - KERNEL=="hiddev*", NAME="usb/%k" - KERNEL=="auer*", NAME="usb/%k" - KERNEL=="legousbtower*", NAME="usb/%k"
hooks/post-receive -- IPFire 2.x development tree