aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-11-19 06:41:56 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-20 10:11:24 +0000
commit5d5434e77c60faa78f15c99714e34221d154617b (patch)
treefe804e9f42b494fa8f998d6e2f16193c587b2374
parentb9bc0ab578d86baa2d7e1988b0c3485bc7a632a3 (diff)
downloadopenembedded-core-contrib-5d5434e77c60faa78f15c99714e34221d154617b.tar.gz
libx11: move hashes to inc
This should help keep libx11 and libx11-diet in sync by throwing an error when building Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet_1.6.7.bb3
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11.inc3
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb3
3 files changed, 3 insertions, 6 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.7.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.7.bb
index 0bc08fcf7d..9c773a09dd 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.7.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.7.bb
@@ -11,9 +11,6 @@ SRC_URI += "file://X18NCMSstubs.patch \
RPROVIDES_${PN}-dev = "libx11-dev"
RPROVIDES_${PN}-locale = "libx11-locale"
-SRC_URI[md5sum] = "034fdd6cc5393974d88aec6f5bc96162"
-SRC_URI[sha256sum] = "910e9e30efba4ad3672ca277741c2728aebffa7bc526f04dcfa74df2e52a1348"
-
EXTRA_OECONF += "--disable-xlocale"
PACKAGECONFIG ??= ""
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index 36c950ad34..ea2ebfb8b9 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -10,6 +10,9 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:"
PE = "1"
+SRC_URI[md5sum] = "034fdd6cc5393974d88aec6f5bc96162"
+SRC_URI[sha256sum] = "910e9e30efba4ad3672ca277741c2728aebffa7bc526f04dcfa74df2e52a1348"
+
PROVIDES = "virtual/libx11"
XORG_PN = "libX11"
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb
index f0f1bfd341..6141f571c5 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb
@@ -1,8 +1,5 @@
require libx11.inc
-SRC_URI[md5sum] = "034fdd6cc5393974d88aec6f5bc96162"
-SRC_URI[sha256sum] = "910e9e30efba4ad3672ca277741c2728aebffa7bc526f04dcfa74df2e52a1348"
-
SRC_URI += "file://disable_tests.patch \
file://Fix-hanging-issue-in-_XReply.patch \
"