[oe-commits] Graham Gower : mbmerlin_0.8.1-2.bb: Don't overwrite a file staged by libx11 .

[git version control]

Module: openembedded.git
Branch: master
Commit: 2ca63bf30fbed7b8cd534aa8183215f95d8c53fb
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=2ca63bf30fbed7b8cd534aa8183215f95d8c53fb

Author: Graham Gower <graham.gower at gmail.com>
Date:   Wed Sep  1 21:08:14 2010 +0000

mbmerlin_0.8.1-2.bb: Don't overwrite a file staged by libx11.

If mbmerlin is staged, packages which use the x11.pc file will get one
that mbmerlin provides.

Signed-off-by: Graham Gower <graham.gower at gmail.com>
Signed-off-by: Khem Raj <raj.khem at gmail.com>

---

 recipes/mbmerlin/mbmerlin_0.8.1-2.bb |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/recipes/mbmerlin/mbmerlin_0.8.1-2.bb b/recipes/mbmerlin/mbmerlin_0.8.1-2.bb
index 5c3a93a..e5c582a 100644
--- a/recipes/mbmerlin/mbmerlin_0.8.1-2.bb
+++ b/recipes/mbmerlin/mbmerlin_0.8.1-2.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
 
 inherit pkgconfig gpe
 
@@ -19,3 +19,8 @@ CFLAGS += " -D_GNU_SOURCE"
 
 SRC_URI[md5sum] = "c379c781ac05d3b64228f48362aecaca"
 SRC_URI[sha256sum] = "d2a482d4b7bce5cc41bacddc8ef48ebd21fecbe6585b74036e432c030595b11f"
+
+do_install_prepend() {
+    # This package is not x11, this file should not be staged.
+    rm ${S}/build/x11.pc
+}