merge of 522ddd4c8860b47256c8a27f2b39d34c4e3b3d98

     and b8b3a6adaac0e7f64525ebfc53d429e599c9ea65

13 files changed, 13 insertions, 18 deletions

diff --git a/packages/base-files/base-files/borzoi/fstab b/packages/base-files/base-files/borzoi/fstab
index c693378d33..3d0e508dfd 100644
--- a/packages/base-files/base-files/borzoi/fstab
+++ b/packages/base-files/base-files/borzoi/fstab
@@ -19,7 +19,7 @@ tmpfs              /media/ram   tmpfs   defaults                0  0
 #
 /dev/sda1       /media/usbhdd   vfat            noauto,umask=000,noatime,iocharset=utf8,codepage=932    0  0
 devpts          /dev/pts        devpts          mode=0620,gid=5       0  0
-usbdevfs        /proc/bus/usb   usbdevfs        noauto                0  0
+usbfs           /proc/bus/usb   usbfs           noauto                0  0
 
 #
 # Harddisk
diff --git a/packages/base-files/base-files/spitz/fstab b/packages/base-files/base-files/spitz/fstab
index c693378d33..3d0e508dfd 100644
--- a/packages/base-files/base-files/spitz/fstab
+++ b/packages/base-files/base-files/spitz/fstab
@@ -19,7 +19,7 @@ tmpfs              /media/ram   tmpfs   defaults                0  0
 #
 /dev/sda1       /media/usbhdd   vfat            noauto,umask=000,noatime,iocharset=utf8,codepage=932    0  0
 devpts          /dev/pts        devpts          mode=0620,gid=5       0  0
-usbdevfs        /proc/bus/usb   usbdevfs        noauto                0  0
+usbfs           /proc/bus/usb   usbfs           noauto                0  0
 
 #
 # Harddisk
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index 0689cfa0f3..25cb1b1bbe 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r47"
+PR = "r48"
 LICENSE = "GPL"
 
 SRC_URI = " \
diff --git a/packages/hostap/hostap-modules.inc b/packages/hostap/hostap-modules.inc
index 838924a75b..72f2dc2da3 100644
--- a/packages/hostap/hostap-modules.inc
+++ b/packages/hostap/hostap-modules.inc
@@ -3,6 +3,8 @@ SECTION = "kernel/modules"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
+PROVIDES = "hostap-conf"
+RPROVIDES = "virtual/kernel-hostap"
 
 SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
 	   file://hostap_cs.conf"
diff --git a/packages/hostap/hostap-modules_0.3.10.bb b/packages/hostap/hostap-modules_0.3.10.bb
index 7f2cc5628a..2a09550772 100644
--- a/packages/hostap/hostap-modules_0.3.10.bb
+++ b/packages/hostap/hostap-modules_0.3.10.bb
@@ -1,6 +1,5 @@
 include hostap-modules.inc
-LICENSE = "GPL"
-PR = "r6"
+PR = "r7"
 
 SRC_URI += "file://Makefile.patch;patch=1 \
 	    file://add_event.patch;patch=1 \
diff --git a/packages/hostap/hostap-modules_0.3.7.bb b/packages/hostap/hostap-modules_0.3.7.bb
index aead35d25b..5980783840 100644
--- a/packages/hostap/hostap-modules_0.3.7.bb
+++ b/packages/hostap/hostap-modules_0.3.7.bb
@@ -1,6 +1,5 @@
 include hostap-modules.inc
-PROVIDES = "virtual/kernel-hostap hostap-conf"
-PR = "r6"
+PR = "r7"
 
 SRC_URI += "file://Makefile.patch;patch=1 \
 	    file://add_event.patch;patch=1 \
diff --git a/packages/hostap/hostap-modules_0.3.9.bb b/packages/hostap/hostap-modules_0.3.9.bb
index 95bcbff5a6..508c653230 100644
--- a/packages/hostap/hostap-modules_0.3.9.bb
+++ b/packages/hostap/hostap-modules_0.3.9.bb
@@ -1,6 +1,5 @@
 include hostap-modules.inc
-PROVIDES = "virtual/kernel-hostap hostap-conf"
-PR = "r8"
+PR = "r9"
 
 SRC_URI += "file://Makefile.patch;patch=1 \
 	    file://add_event.patch;patch=1 \
diff --git a/packages/hostap/hostap-modules_0.4.4.bb b/packages/hostap/hostap-modules_0.4.4.bb
index 278b2ed0bc..b3d0a8e949 100644
--- a/packages/hostap/hostap-modules_0.4.4.bb
+++ b/packages/hostap/hostap-modules_0.4.4.bb
@@ -1,5 +1,4 @@
 include hostap-modules.inc
-PROVIDES = "virtual/kernel-hostap hostap-conf"
-PR = "r4"
+PR = "r5"
 
 SRC_URI += "file://kernel_updates.patch;patch=1"
diff --git a/packages/hostap/hostap-modules_0.4.7.bb b/packages/hostap/hostap-modules_0.4.7.bb
index 57905fffed..e9efcb5617 100644
--- a/packages/hostap/hostap-modules_0.4.7.bb
+++ b/packages/hostap/hostap-modules_0.4.7.bb
@@ -1,4 +1,4 @@
 include hostap-modules.inc
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://kernel_updates.patch;patch=1"
diff --git a/packages/hostap/hostap-utils_0.3.7.bb b/packages/hostap/hostap-utils_0.3.7.bb
index cdfb0c1e3e..c5c5d5b3f9 100644
--- a/packages/hostap/hostap-utils_0.3.7.bb
+++ b/packages/hostap/hostap-utils_0.3.7.bb
@@ -4,8 +4,8 @@ SECTION = "kernel/userland"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-RDEPENDS = "virtual/kernel-hostap"
-PR = "r2"
+RRECOMMENDS = "virtual/kernel-hostap"
+PR = "r3"
 
 SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \
 	   file://hostap-fw-load.patch;patch=1"
diff --git a/packages/hostap/hostap-utils_0.4.0.bb b/packages/hostap/hostap-utils_0.4.0.bb
index 98254602aa..c5c5d5b3f9 100644
--- a/packages/hostap/hostap-utils_0.4.0.bb
+++ b/packages/hostap/hostap-utils_0.4.0.bb
@@ -4,7 +4,6 @@ SECTION = "kernel/userland"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-DEPENDS = "virtual/kernel-hostap"
 RRECOMMENDS = "virtual/kernel-hostap"
 PR = "r3"
 
diff --git a/packages/perl/perl.inc b/packages/perl/perl.inc
index 12fffa1c33..09a2ce7082 100644
--- a/packages/perl/perl.inc
+++ b/packages/perl/perl.inc
@@ -5,7 +5,7 @@ SECTION = "devel"
 PRIORITY = "optional"
 DEPENDS = "virtual/db perl-native"
 
-SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
+SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
 	file://Makefile.patch;patch=1 \
 	file://config.sh-arm-linux.patch;patch=1 \
 	file://libperl-5.8.3-create-libperl-soname.patch;patch=1;pnum=0 \
diff --git a/packages/udev/udev_084.bb b/packages/udev/udev_084.bb
index 904f73783c..85393315c5 100644
--- a/packages/udev/udev_084.bb
+++ b/packages/udev/udev_084.bb
@@ -1,5 +1,3 @@
-DEFAULT_PREFERENCE = "-1"
-
 DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
 /dev/, handles hotplug events and loads drivers at boot time. It replaces \
 the hotplug package and requires a kernel not older than 2.6.12."