[oe-commits] Tom Rini : opie-sh 1.2.4: Rework opie-sh-fsmounter-name.patch

[git version control]

Module: openembedded.git
Branch: 2011.03-maintenance
Commit: 9ca89dfb499e3e9b40fef93aed522851ed397a74
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=9ca89dfb499e3e9b40fef93aed522851ed397a74

Author: Tom Rini <tom_rini at mentor.com>
Date:   Wed Mar 16 11:29:41 2011 -0700

opie-sh 1.2.4: Rework opie-sh-fsmounter-name.patch

Signed-off-by: Tom Rini <tom_rini at mentor.com>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 recipes/opie-sh/files/opie-sh-fsmounter-name.patch |    4 ++--
 recipes/opie-sh/opie-sh_1.2.4.bb                   |    8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/recipes/opie-sh/files/opie-sh-fsmounter-name.patch b/recipes/opie-sh/files/opie-sh-fsmounter-name.patch
index ccdea20..c5f1e10 100644
--- a/recipes/opie-sh/files/opie-sh-fsmounter-name.patch
+++ b/recipes/opie-sh/files/opie-sh-fsmounter-name.patch
@@ -1,5 +1,5 @@
---- ../../apps/Opie-SH/filesystem_mounter.desktop	7 Mar 2004 12:33:12 -0000	1.8
-+++ ../../apps/Opie-SH/filesystem_mounter.desktop	21 Sep 2008 13:14:03 -0000
+--- apps/Opie-SH/filesystem_mounter.desktop	7 Mar 2004 12:33:12 -0000	1.8
++++ apps/Opie-SH/filesystem_mounter.desktop	21 Sep 2008 13:14:03 -0000
 @@ -2,7 +2,7 @@
  Exec=filesystem_mounter.sh
  Icon=opie-sh-scripts/fsmounter
diff --git a/recipes/opie-sh/opie-sh_1.2.4.bb b/recipes/opie-sh/opie-sh_1.2.4.bb
index a07919e..c34fb48 100644
--- a/recipes/opie-sh/opie-sh_1.2.4.bb
+++ b/recipes/opie-sh/opie-sh_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://sources.openembedded.org/opie-1.2.4-split_noncore_tools_opie-sh.tar.bz2;name=split_noncore_tools_opie-sh \
            http://sources.openembedded.org/opie-1.2.4-split_pics.tar.bz2;name=split_pics \
@@ -9,7 +9,7 @@ SRC_URI = "http://sources.openembedded.org/opie-1.2.4-split_noncore_tools_opie-s
            http://sources.openembedded.org/opie-1.2.4-split_apps.tar.bz2;name=split_apps \
            http://sources.openembedded.org/opie-1.2.4-split_bin.tar.bz2;name=split_bin \
            file://opie-sh-path.patch \
-           file://opie-sh-fsmounter-name.patch"
+           file://opie-sh-fsmounter-name.patch;apply=false"
 SRC_URI[split_noncore_tools_opie-sh.md5sum] = "bc57f7ab07181c122ebc382e302bb594"
 SRC_URI[split_noncore_tools_opie-sh.sha256sum] = "a1305994918160449177b24efe384a0de87dc9dfcecf476e33b87cf8999b5bb1"
 SRC_URI[split_pics.md5sum] = "5499dc84b65395ab99bda6ed9d01ff0f"
@@ -22,3 +22,7 @@ SRC_URI[split_apps.md5sum] = "67a43e8e4bcd9e63b884ea25deea5b34"
 SRC_URI[split_apps.sha256sum] = "a33a55efb4ae4c15a8c2c5d6faba6d671a5652da8e216ce35088896fe597215b"
 SRC_URI[split_bin.md5sum] = "d63089ebb9a87636e30fecefcc5b2cb8"
 SRC_URI[split_bin.sha256sum] = "8caf1981a2463029c1a27d965af8573d46b8e2ab818fb61b8e73ff40e43aab0c"
+
+do_configure_prepend() {
+	(cd .. ; patch -p0 -i ${WORKDIR}/opie-sh-fsmounter-name.patch)
+}