diff options
| author |   Graham Gower <graham.gower@gmail.com> | 2010-09-01 21:08:14 +0000 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2010-10-13 21:30:28 -0700 |
| commit | 2ca63bf30fbed7b8cd534aa8183215f95d8c53fb (patch) | |
| tree | 9eff2641d01219abf5cbbcc6c9c715833f50d7aa /recipes/mbmerlin/mbmerlin_0.8.1-2.bb | |
| parent | a4091df206a67ce8212f2eb0b602b5179b894579 (diff) | |
| download | openembedded-2ca63bf30fbed7b8cd534aa8183215f95d8c53fb.tar.gz | |
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@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/mbmerlin/mbmerlin_0.8.1-2.bb')
| -rw-r--r-- | 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 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 +} |