summaryrefslogtreecommitdiffstats
path: root/meta
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:32:16 +0000
commit7862ee16890828507f17b0e8e5390e0310776e8a (patch)
treeb8d4e5aa91158a17a9c8e4c6fd616bed91d899da /meta
parentb5f690c27d750357d384876c9ff62b498e667ec0 (diff)
downloadpoky-7862ee16890828507f17b0e8e5390e0310776e8a.tar.gz
libx11: move hashes to inc
This should help keep libx11 and libx11-diet in sync by throwing an error when building (From OE-Core rev: 5d5434e77c60faa78f15c99714e34221d154617b) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 \
11RPROVIDES_${PN}-dev = "libx11-dev" 11RPROVIDES_${PN}-dev = "libx11-dev"
12RPROVIDES_${PN}-locale = "libx11-locale" 12RPROVIDES_${PN}-locale = "libx11-locale"
13 13
14SRC_URI[md5sum] = "034fdd6cc5393974d88aec6f5bc96162"
15SRC_URI[sha256sum] = "910e9e30efba4ad3672ca277741c2728aebffa7bc526f04dcfa74df2e52a1348"
16
17EXTRA_OECONF += "--disable-xlocale" 14EXTRA_OECONF += "--disable-xlocale"
18 15
19PACKAGECONFIG ??= "" 16PACKAGECONFIG ??= ""
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:"
10 10
11PE = "1" 11PE = "1"
12 12
13SRC_URI[md5sum] = "034fdd6cc5393974d88aec6f5bc96162"
14SRC_URI[sha256sum] = "910e9e30efba4ad3672ca277741c2728aebffa7bc526f04dcfa74df2e52a1348"
15
13PROVIDES = "virtual/libx11" 16PROVIDES = "virtual/libx11"
14 17
15XORG_PN = "libX11" 18XORG_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 @@
1require libx11.inc 1require libx11.inc
2 2
3SRC_URI[md5sum] = "034fdd6cc5393974d88aec6f5bc96162"
4SRC_URI[sha256sum] = "910e9e30efba4ad3672ca277741c2728aebffa7bc526f04dcfa74df2e52a1348"
5
6SRC_URI += "file://disable_tests.patch \ 3SRC_URI += "file://disable_tests.patch \
7 file://Fix-hanging-issue-in-_XReply.patch \ 4 file://Fix-hanging-issue-in-_XReply.patch \
8 " 5 "