diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-12 02:27:39 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-12 02:28:03 +0000 |
| commit | fe0659991b826eb3b4163743d29533fe5f91cb12 (patch) | |
| tree | 5c998ed9b679e99a9c61f7b6232ec9fed2fa3887 /meta | |
| parent | 664fb2753798da8f4ea6a5556c6ada986fdda8e9 (diff) | |
| download | poky-fe0659991b826eb3b4163743d29533fe5f91cb12.tar.gz | |
libx11-trim/diet: Ensure libx11-locale doesn't trigger multiple provider issues
(From OE-Core rev: 028a7319cf9b178bd3a9878dcba35fa9483d13f5)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb index 4bab148029..0a159d47e0 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb | |||
| @@ -15,6 +15,7 @@ SRC_URI += "file://x11_disable_makekeys.patch \ | |||
| 15 | " | 15 | " |
| 16 | 16 | ||
| 17 | RPROVIDES_${PN}-dev = "libx11-dev" | 17 | RPROVIDES_${PN}-dev = "libx11-dev" |
| 18 | RPROVIDES_${PN}-locale = "libx11-locale" | ||
| 18 | 19 | ||
| 19 | SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9" | 20 | SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9" |
| 20 | SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d" | 21 | SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d" |
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb index b2c753d900..a86e13a5f5 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb | |||
| @@ -14,6 +14,7 @@ SRC_URI += "file://x11_disable_makekeys.patch \ | |||
| 14 | file://makekeys_crosscompile.patch" | 14 | file://makekeys_crosscompile.patch" |
| 15 | 15 | ||
| 16 | RPROVIDES_${PN}-dev = "libx11-dev" | 16 | RPROVIDES_${PN}-dev = "libx11-dev" |
| 17 | RPROVIDES_${PN}-locale = "libx11-locale" | ||
| 17 | 18 | ||
| 18 | SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9" | 19 | SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9" |
| 19 | SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d" | 20 | SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d" |