[oe-commits] Stanislav Brabec : udev: udev-compat-wrapper-patch: Use KERNELMICROVER evaluation that does not fail on rc and four-part versions .

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 0e59321a3f00cdcf6e0f92e83b9ccce37a53d153
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=0e59321a3f00cdcf6e0f92e83b9ccce37a53d153

Author: Stanislav Brabec <utx at penguin.cz>
Date:   Sun Aug 29 23:40:26 2010 +0000

udev: udev-compat-wrapper-patch: Use KERNELMICROVER evaluation that does not fail on rc and four-part versions.

---

 recipes/udev/files/udev-compat-wrapper-patch |    2 +-
 recipes/udev/udev.inc                        |    2 +-
 recipes/udev/udev_151.bb                     |    2 +-
 recipes/udev/udev_154.bb                     |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes/udev/files/udev-compat-wrapper-patch b/recipes/udev/files/udev-compat-wrapper-patch
index a3e312d..c90d05a 100644
--- a/recipes/udev/files/udev-compat-wrapper-patch
+++ b/recipes/udev/files/udev-compat-wrapper-patch
@@ -16,7 +16,7 @@ WORKDIR and cannot be selectively applied on another source file.
 +UDEVADM="/sbin/udevadm"
 +# If we are running an old kernel and have a static udev present use that instead
 +if [ -e /sbin/udevd-compat ] ; then
-+	KERNELMICROVER="$(uname -r | awk -F. '{print $3}')"
++	KERNELMICROVER="$(uname -r | sed 's/^[0-9]*\.[0-9]*\.\([0-9]*\).*$/\1/')"
 +	if [ $KERNELMICROVER -lt 27 ] ; then
 +		UDEVD="/sbin/udevd-compat"
 +		UDEVADM="/sbin/udevadm-compat"
diff --git a/recipes/udev/udev.inc b/recipes/udev/udev.inc
index e6aad4b..7502094 100644
--- a/recipes/udev/udev.inc
+++ b/recipes/udev/udev.inc
@@ -14,7 +14,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
            file://init \
 	   file://udev-compat-wrapper-patch"
 
-INC_PR = "r28"
+INC_PR = "r29"
 
 inherit update-rc.d autotools pkgconfig
 
diff --git a/recipes/udev/udev_151.bb b/recipes/udev/udev_151.bb
index 038fec7..8423ff4 100644
--- a/recipes/udev/udev_151.bb
+++ b/recipes/udev/udev_151.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 the hotplug package and requires a kernel not older than 2.6.12."
 LICENSE = "GPLv2+"
 
-PR = "r15"
+PR = "r16"
 
 # Untested
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/udev/udev_154.bb b/recipes/udev/udev_154.bb
index 6698566..e4dc48b 100644
--- a/recipes/udev/udev_154.bb
+++ b/recipes/udev/udev_154.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 the hotplug package and requires a kernel not older than 2.6.12."
 LICENSE = "GPLv2+"
 
-PR = "r2"
+PR = "r3"
 
 # Untested
 DEFAULT_PREFERENCE = "-1"