From 2ca63bf30fbed7b8cd534aa8183215f95d8c53fb Mon Sep 17 00:00:00 2001 From: Graham Gower Date: Wed, 1 Sep 2010 21:08:14 +0000 Subject: [PATCH] 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 Signed-off-by: Khem Raj --- recipes/mbmerlin/mbmerlin_0.8.1-2.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes/mbmerlin/mbmerlin_0.8.1-2.bb b/recipes/mbmerlin/mbmerlin_0.8.1-2.bb index 5c3a93a52b..e5c582a6eb 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 +} -- 2.39.5