[oe-commits] Martin Jansa : linux-openmoko: search for mtdutils in sbinding

[git version control]

Module: openembedded.git
Branch: testing-next
Commit: 312423b94fe879e24a69624f921560b088b34642
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=312423b94fe879e24a69624f921560b088b34642

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri May 20 14:12:56 2011 +0200

linux-openmoko: search for mtdutils in sbinding

* newer mtdutils are not using bindir
* fixes http://trac.shr-project.org/trac/ticket/1446

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 recipes/linux/linux-openmoko.inc       |    4 ++--
 recipes/linux/linux-openmoko_2.6.34.bb |    2 +-
 recipes/linux/linux-openmoko_2.6.37.bb |    2 +-
 recipes/linux/linux-openmoko_2.6.39.bb |    1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/recipes/linux/linux-openmoko.inc b/recipes/linux/linux-openmoko.inc
index 652f442..dedd27d 100644
--- a/recipes/linux/linux-openmoko.inc
+++ b/recipes/linux/linux-openmoko.inc
@@ -81,8 +81,8 @@ elif test "empty$has_mtdblock" != "empty" -o "empty$has_ubi" != "empty"; then
 			exit 1
 		fi
 
-		${bindir}/flash_eraseall $MTD_KERNEL_PARTITION
-		${bindir}/nandwrite -p $MTD_KERNEL_PARTITION /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}
+		${sbindir}/flash_eraseall $MTD_KERNEL_PARTITION
+		${sbindir}/nandwrite -p $MTD_KERNEL_PARTITION /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}
 	else
 		touch ${sysconfdir}/default/flashkernel
 	fi
diff --git a/recipes/linux/linux-openmoko_2.6.34.bb b/recipes/linux/linux-openmoko_2.6.34.bb
index 9da7bf8..a83ee17 100644
--- a/recipes/linux/linux-openmoko_2.6.34.bb
+++ b/recipes/linux/linux-openmoko_2.6.34.bb
@@ -2,5 +2,5 @@ require linux_${PV}.bb
 require linux-openmoko.inc
 # just for upgrade path in 2.6.34
 KERNEL_RELEASE = "2.6.34.8"
-OM-PR = "17"
+OM-PR = "18"
 PKGV = "${KERNEL_RELEASE}-oe${OM-PR}"
diff --git a/recipes/linux/linux-openmoko_2.6.37.bb b/recipes/linux/linux-openmoko_2.6.37.bb
index 2824f6c..69e1d6a 100644
--- a/recipes/linux/linux-openmoko_2.6.37.bb
+++ b/recipes/linux/linux-openmoko_2.6.37.bb
@@ -1,3 +1,3 @@
 require linux_${PV}.bb
 require linux-openmoko.inc
-OM-PR = "2"
+OM-PR = "3"
diff --git a/recipes/linux/linux-openmoko_2.6.39.bb b/recipes/linux/linux-openmoko_2.6.39.bb
index 3e4d09e..633349e 100644
--- a/recipes/linux/linux-openmoko_2.6.39.bb
+++ b/recipes/linux/linux-openmoko_2.6.39.bb
@@ -1,2 +1,3 @@
 require linux_${PV}.bb
 require linux-openmoko.inc
+OM-PR = "1"