* [PATCHv2 0/5] Upgrade piglit
@ 2016-07-12 11:14 Jussi Kukkonen
2016-07-12 11:14 ` [PATCHv2 1/5] python-six: Add to oe-core Jussi Kukkonen
` (5 more replies)
0 siblings, 6 replies; 10+ messages in thread
From: Jussi Kukkonen @ 2016-07-12 11:14 UTC (permalink / raw)
To: openembedded-core
Changes since v1:
* Sacrifice piglit debug binaries for build speed
* Add a missing signed-off-by
* Do not install .egg for python-six
The python-six .egg install was added to avoid a build problem in
python-cryptography (6b4cee975 in meta-oe). I cannot reproduce the
problem: python-cryptography builds fine without a network connection.
Original cover letter follows:
This set upgrades piglit, adds python-six (new piglit dependency),
moves piglit to python3 and fixes all the python module issues that
popped up.
A word of warning to anyone else using piglit: it was big before and
has now tripled in size (30000 new tests!). The installed size is over
1.5GB and packaging takes a very long time.
For reference, the results with PIGLIT_NO_WINDOW=1 look like this on
a NUC (Haswell with HD5000 graphics) running current master:
name: quick
---- ------
pass: 33717
fail: 438
crash: 5
skip: 30887
warn: 7
total: 65054
Jussi
The following changes since commit 5c11e365e19357f721c49d076971567e7b64b61b:
lib/oeqa: add Galculator to SDK and runtime tests (2016-07-01 16:22:48 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib jku/piglit
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/piglit
Jussi Kukkonen (5):
python-six: Add to oe-core
python3: Add compression to python3-shell dependencies
python3: Add dependencies for python3-misc
python3-native: Add "io" to rprovides
piglit: Upgrade version, use python3
.../python/python-3.5-manifest.inc | 2 +-
meta/recipes-devtools/python/python-six.inc | 16 +++++++++++++
meta/recipes-devtools/python/python-six_1.10.0.bb | 4 ++++
.../python/python3-native_3.5.1.bb | 2 +-
meta/recipes-devtools/python/python3-six_1.10.0.bb | 4 ++++
meta/recipes-devtools/python/python3_3.5.1.bb | 2 +-
...0001-tests-Fix-missing-include-of-Xutil.h.patch | 28 ----------------------
meta/recipes-graphics/piglit/piglit_git.bb | 24 +++++++++++--------
scripts/contrib/python/generate-manifest-3.5.py | 2 +-
9 files changed, 42 insertions(+), 42 deletions(-)
create mode 100644 meta/recipes-devtools/python/python-six.inc
create mode 100644 meta/recipes-devtools/python/python-six_1.10.0.bb
create mode 100644 meta/recipes-devtools/python/python3-six_1.10.0.bb
delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch
--
2.1.4
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCHv2 1/5] python-six: Add to oe-core
2016-07-12 11:14 [PATCHv2 0/5] Upgrade piglit Jussi Kukkonen
@ 2016-07-12 11:14 ` Jussi Kukkonen
2016-07-12 11:14 ` [PATCHv2 2/5] python3: Add compression to python3-shell dependencies Jussi Kukkonen
` (4 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Jussi Kukkonen @ 2016-07-12 11:14 UTC (permalink / raw)
To: openembedded-core
Recipes are moved from meta-openembedded/meta-python
Changes compared to meta-python version:
* Modified to not inherit pypi
* Fix python-io dependency for python3
* Support native, nativesdk
* Do not install .egg
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
meta/recipes-devtools/python/python-six.inc | 16 ++++++++++++++++
meta/recipes-devtools/python/python-six_1.10.0.bb | 4 ++++
meta/recipes-devtools/python/python3-six_1.10.0.bb | 4 ++++
3 files changed, 24 insertions(+)
create mode 100644 meta/recipes-devtools/python/python-six.inc
create mode 100644 meta/recipes-devtools/python/python-six_1.10.0.bb
create mode 100644 meta/recipes-devtools/python/python3-six_1.10.0.bb
diff --git a/meta/recipes-devtools/python/python-six.inc b/meta/recipes-devtools/python/python-six.inc
new file mode 100644
index 0000000..bd12fa9
--- /dev/null
+++ b/meta/recipes-devtools/python/python-six.inc
@@ -0,0 +1,16 @@
+SUMMARY = "Python 2 and 3 compatibility library"
+HOMEPAGE = "https://pypi.python.org/pypi/six/"
+SECTION = "devel/python"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=6f00d4a50713fa859858dd9abaa35b21"
+
+SRC_URI = "https://files.pythonhosted.org/packages/source/s/six/six-${PV}.tar.gz"
+SRC_URI[md5sum] = "34eed507548117b2ab523ab14b2f8b55"
+SRC_URI[sha256sum] = "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a"
+
+UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/six/"
+UPSTREAM_CHECK_REGEX = "/six/(?P<pver>(\d+[\.\-_]*)+)"
+
+BBCLASSEXTEND = "native nativesdk"
+
+S = "${WORKDIR}/six-${PV}"
diff --git a/meta/recipes-devtools/python/python-six_1.10.0.bb b/meta/recipes-devtools/python/python-six_1.10.0.bb
new file mode 100644
index 0000000..4350485
--- /dev/null
+++ b/meta/recipes-devtools/python/python-six_1.10.0.bb
@@ -0,0 +1,4 @@
+inherit setuptools
+require python-six.inc
+
+RDEPENDS_${PN} += "python-io"
diff --git a/meta/recipes-devtools/python/python3-six_1.10.0.bb b/meta/recipes-devtools/python/python3-six_1.10.0.bb
new file mode 100644
index 0000000..38a47b7
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-six_1.10.0.bb
@@ -0,0 +1,4 @@
+inherit setuptools3
+require python-six.inc
+
+RDEPENDS_${PN} += "python3-io"
--
2.1.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCHv2 2/5] python3: Add compression to python3-shell dependencies
2016-07-12 11:14 [PATCHv2 0/5] Upgrade piglit Jussi Kukkonen
2016-07-12 11:14 ` [PATCHv2 1/5] python-six: Add to oe-core Jussi Kukkonen
@ 2016-07-12 11:14 ` Jussi Kukkonen
2016-07-12 11:14 ` [PATCHv2 3/5] python3: Add dependencies for python3-misc Jussi Kukkonen
` (3 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Jussi Kukkonen @ 2016-07-12 11:14 UTC (permalink / raw)
To: openembedded-core
python3-shell needs python3-compression for tarfile.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
meta/recipes-devtools/python/python-3.5-manifest.inc | 2 +-
scripts/contrib/python/generate-manifest-3.5.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/python/python-3.5-manifest.inc b/meta/recipes-devtools/python/python-3.5-manifest.inc
index 335c3ff..eb9857c 100644
--- a/meta/recipes-devtools/python/python-3.5-manifest.inc
+++ b/meta/recipes-devtools/python/python-3.5-manifest.inc
@@ -194,7 +194,7 @@ RDEPENDS_${PN}-resource="${PN}-core"
FILES_${PN}-resource="${libdir}/python3.5/lib-dynload/resource.*.so "
SUMMARY_${PN}-shell="Python shell-like functionality"
-RDEPENDS_${PN}-shell="${PN}-core ${PN}-re"
+RDEPENDS_${PN}-shell="${PN}-core ${PN}-re ${PN}-compression"
FILES_${PN}-shell="${libdir}/python3.5/cmd.* ${libdir}/python3.5/commands.* ${libdir}/python3.5/dircache.* ${libdir}/python3.5/fnmatch.* ${libdir}/python3.5/glob.* ${libdir}/python3.5/popen2.* ${libdir}/python3.5/shlex.* ${libdir}/python3.5/shutil.* "
SUMMARY_${PN}-smtpd="Python Simple Mail Transport Daemon"
diff --git a/scripts/contrib/python/generate-manifest-3.5.py b/scripts/contrib/python/generate-manifest-3.5.py
index e04da1d..44fffa4 100755
--- a/scripts/contrib/python/generate-manifest-3.5.py
+++ b/scripts/contrib/python/generate-manifest-3.5.py
@@ -336,7 +336,7 @@ if __name__ == "__main__":
m.addPackage( "${PN}-resource", "Python resource control interface", "${PN}-core",
"lib-dynload/resource.*.so" )
- m.addPackage( "${PN}-shell", "Python shell-like functionality", "${PN}-core ${PN}-re",
+ m.addPackage( "${PN}-shell", "Python shell-like functionality", "${PN}-core ${PN}-re ${PN}-compression",
"cmd.* commands.* dircache.* fnmatch.* glob.* popen2.* shlex.* shutil.*" )
m.addPackage( "${PN}-subprocess", "Python subprocess support", "${PN}-core ${PN}-io ${PN}-re ${PN}-fcntl ${PN}-pickle",
--
2.1.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCHv2 3/5] python3: Add dependencies for python3-misc
2016-07-12 11:14 [PATCHv2 0/5] Upgrade piglit Jussi Kukkonen
2016-07-12 11:14 ` [PATCHv2 1/5] python-six: Add to oe-core Jussi Kukkonen
2016-07-12 11:14 ` [PATCHv2 2/5] python3: Add compression to python3-shell dependencies Jussi Kukkonen
@ 2016-07-12 11:14 ` Jussi Kukkonen
2016-07-12 11:14 ` [PATCHv2 4/5] python3-native: Add "io" to rprovides Jussi Kukkonen
` (2 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Jussi Kukkonen @ 2016-07-12 11:14 UTC (permalink / raw)
To: openembedded-core
http.server requires email.parser. argparse requires
codecs and textutils.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
meta/recipes-devtools/python/python3_3.5.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/python/python3_3.5.1.bb b/meta/recipes-devtools/python/python3_3.5.1.bb
index 78ae174..0d667d2 100644
--- a/meta/recipes-devtools/python/python3_3.5.1.bb
+++ b/meta/recipes-devtools/python/python3_3.5.1.bb
@@ -213,7 +213,7 @@ INSANE_SKIP_${PN}-dev += "dev-elf"
# catch all the rest (unsorted)
PACKAGES += "${PN}-misc"
-RDEPENDS_${PN}-misc += "${PN}-core"
+RDEPENDS_${PN}-misc += "${PN}-core ${PN}-email ${PN}-codecs ${PN}-textutils"
RDEPENDS_${PN}-modules += "${PN}-misc"
FILES_${PN}-misc = "${libdir}/python${PYTHON_MAJMIN}"
--
2.1.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCHv2 4/5] python3-native: Add "io" to rprovides
2016-07-12 11:14 [PATCHv2 0/5] Upgrade piglit Jussi Kukkonen
` (2 preceding siblings ...)
2016-07-12 11:14 ` [PATCHv2 3/5] python3: Add dependencies for python3-misc Jussi Kukkonen
@ 2016-07-12 11:14 ` Jussi Kukkonen
2016-07-12 11:14 ` [PATCHv2 5/5] piglit: Upgrade version, use python3 Jussi Kukkonen
2016-07-19 12:16 ` [PATCH] piglit: Add build fix patch Jussi Kukkonen
5 siblings, 0 replies; 10+ messages in thread
From: Jussi Kukkonen @ 2016-07-12 11:14 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
meta/recipes-devtools/python/python3-native_3.5.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/python/python3-native_3.5.1.bb b/meta/recipes-devtools/python/python3-native_3.5.1.bb
index fbe04c6..81ea087 100644
--- a/meta/recipes-devtools/python/python3-native_3.5.1.bb
+++ b/meta/recipes-devtools/python/python3-native_3.5.1.bb
@@ -41,7 +41,7 @@ DEPENDS = "openssl-native bzip2-replacement-native zlib-native readline-native s
inherit native
-RPROVIDES += "python3-distutils-native python3-compression-native python3-textutils-native python3-core-native python3-importlib-native"
+RPROVIDES += "python3-distutils-native python3-compression-native python3-textutils-native python3-core-native python3-importlib-native python3-io-native"
EXTRA_OECONF_append = " --bindir=${bindir}/${PN} --without-ensurepip"
--
2.1.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCHv2 5/5] piglit: Upgrade version, use python3
2016-07-12 11:14 [PATCHv2 0/5] Upgrade piglit Jussi Kukkonen
` (3 preceding siblings ...)
2016-07-12 11:14 ` [PATCHv2 4/5] python3-native: Add "io" to rprovides Jussi Kukkonen
@ 2016-07-12 11:14 ` Jussi Kukkonen
2016-07-13 13:41 ` Burton, Ross
2016-07-19 12:16 ` [PATCH] piglit: Add build fix patch Jussi Kukkonen
5 siblings, 1 reply; 10+ messages in thread
From: Jussi Kukkonen @ 2016-07-12 11:14 UTC (permalink / raw)
To: openembedded-core
* Remove backported patch
* Update dependencies to use python3 modules, add depencies added
in the new version
* install only stripped binaries to keep size down
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
...0001-tests-Fix-missing-include-of-Xutil.h.patch | 28 ----------------------
meta/recipes-graphics/piglit/piglit_git.bb | 24 +++++++++++--------
2 files changed, 14 insertions(+), 38 deletions(-)
delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch
diff --git a/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch b/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch
deleted file mode 100644
index c27cc04..0000000
--- a/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-
-From e40e0a25f996d2e205c4bdec2c8a5cc7f74e5065 Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <otavio@ossystems.com.br>
-Date: Mon, 15 Jun 2015 16:25:30 -0300
-Subject: tests: Fix missing include of Xutil.h
-
-The EGL tests rely on Xutil.h being included. Some EGL implementation
-does not explitly include it by default and then the build fails.
-
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-Reviewed-by: Neil Roberts <neil@linux.intel.com>
-
-diff --git a/tests/egl/egl-configless-context.c b/tests/egl/egl-configless-context.c
-index 0504a26..154b55c 100644
---- a/tests/egl/egl-configless-context.c
-+++ b/tests/egl/egl-configless-context.c
-@@ -32,6 +32,7 @@
- /* Chunks of code in this file are taken from egl-util.c */
-
- #include <X11/Xlib.h>
-+#include <X11/Xutil.h>
-
- #include "piglit-util-gl.h"
- #include "piglit-util-egl.h"
---
-cgit v0.10.2
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index 607f236..0783616 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -3,18 +3,18 @@ LICENSE = "MIT & LGPLv2+ & GPLv3 & GPLv2+ & BSD-3-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
SRC_URI = "git://anongit.freedesktop.org/piglit \
- file://0001-tests-Fix-missing-include-of-Xutil.h.patch"
+ "
-# From 2015-02-19
-SRCREV = "c4585427913e4cb28994b4bfb11d49778273aa2c"
+# From 2016-07-07
+SRCREV = "c39e41a86551eb390b8da23232dc8577639403d0"
# (when PV goes above 1.0 remove the trailing r)
PV = "1.0+gitr${SRCPV}"
S = "${WORKDIR}/git"
-DEPENDS = "virtual/libx11 libxrender waffle virtual/libgl libglu python-mako-native python-numpy-native"
+DEPENDS = "libpng virtual/libx11 libxrender waffle virtual/libgl libglu python3-mako-native python3-numpy-native python3-six-native"
-inherit cmake pythonnative distro_features_check
+inherit cmake python3native distro_features_check
# depends on virtual/libx11
REQUIRED_DISTRO_FEATURES = "x11"
@@ -34,10 +34,14 @@ do_configure_prepend() {
fi
}
-RDEPENDS_${PN} = "waffle python python-mako python-json python-subprocess \
- python-argparse python-importlib python-unixadmin python-xml \
- python-multiprocessing python-textutils python-netserver python-shell \
- mesa-demos bash \
+do_install() {
+ oe_runmake -C ${B} 'DESTDIR=${D}' install/strip
+}
+
+RDEPENDS_${PN} = "waffle python3 python3-mako python3-json \
+ python3-subprocess python3-misc python3-importlib \
+ python3-unixadmin python3-xml python3-multiprocessing \
+ python3-six python3-shell python3-io mesa-demos bash \
"
-INSANE_SKIP_${PN} += "dev-so"
+INSANE_SKIP_${PN} += "dev-so already-stripped"
--
2.1.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCHv2 5/5] piglit: Upgrade version, use python3
2016-07-12 11:14 ` [PATCHv2 5/5] piglit: Upgrade version, use python3 Jussi Kukkonen
@ 2016-07-13 13:41 ` Burton, Ross
2016-07-13 17:00 ` [PATCHv3] " Jussi Kukkonen
0 siblings, 1 reply; 10+ messages in thread
From: Burton, Ross @ 2016-07-13 13:41 UTC (permalink / raw)
To: Jussi Kukkonen; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 677 bytes --]
On 12 July 2016 at 12:14, Jussi Kukkonen <jussi.kukkonen@intel.com> wrote:
> * Remove backported patch
> * Update dependencies to use python3 modules, add depencies added
> in the new version
> * install only stripped binaries to keep size down
>
> Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
>
ERROR: piglit-1.0+gitrAUTOINC+c39e41a865-r0 do_package: QA Issue: piglit:
Files/directories were installed but not shipped in any package:
/usr/usr
/usr/usr/share
/usr/usr/share/bash-completion
/usr/usr/share/bash-completion/completions
/usr/usr/share/bash-completion/completions/piglit
I had previously built bash-completion.
Ross
[-- Attachment #2: Type: text/html, Size: 1424 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCHv3] piglit: Upgrade version, use python3
2016-07-13 13:41 ` Burton, Ross
@ 2016-07-13 17:00 ` Jussi Kukkonen
0 siblings, 0 replies; 10+ messages in thread
From: Jussi Kukkonen @ 2016-07-13 17:00 UTC (permalink / raw)
To: openembedded-core
* Remove backported patch
* Update dependencies to use python3 modules, add depencies added
in the new version
* Install only stripped binaries to keep size down
* Fix bash-completion install location
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
The bash-completion failure does not happen on master but it does
if Alexanders bash-completion upgrade patch is used. This patch v3
includes a fix for the issue.
I've updated the branch (and rebased on master, so only two commits
left):
git://git.yoctoproject.org/poky-contrib jku/piglit
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/piglit
Thanks,
Jussi
...stall-bash-completions-in-the-right-place.patch | 35 ++++++++++++++++++++++
...0001-tests-Fix-missing-include-of-Xutil.h.patch | 28 -----------------
meta/recipes-graphics/piglit/piglit_git.bb | 25 +++++++++-------
3 files changed, 50 insertions(+), 38 deletions(-)
create mode 100644 meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch
delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch
diff --git a/meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch b/meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch
new file mode 100644
index 0000000..e07e810
--- /dev/null
+++ b/meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch
@@ -0,0 +1,35 @@
+From 26faa2c157a27a18a9f767976730fe0c115e3af4 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Wed, 13 Jul 2016 19:19:02 +0300
+Subject: [PATCH] cmake: install bash-completions in the right place
+
+The completionsdir variable is a full path and should not be
+prefixed.
+
+This does mean the files may be installed outside of
+CMAKE_INSTALL_PREFIX -- the alternative is more difficult and
+means that bash completion files may be installed where
+bash-completion can't find them.
+
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Upstream-Status: Submitted [mailing list]
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8e2abba..784a8f9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -532,7 +532,7 @@ install (
+ if (BASH_COMPLETION_FOUND)
+ install(
+ FILES completions/bash/piglit
+- DESTINATION ${CMAKE_INSTALL_PREFIX}/${BASH_COMPLETION_COMPLETIONSDIR}/
++ DESTINATION ${BASH_COMPLETION_COMPLETIONSDIR}/
+ )
+ endif (BASH_COMPLETION_FOUND)
+
+--
+2.8.1
+
diff --git a/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch b/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch
deleted file mode 100644
index c27cc04..0000000
--- a/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-
-From e40e0a25f996d2e205c4bdec2c8a5cc7f74e5065 Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <otavio@ossystems.com.br>
-Date: Mon, 15 Jun 2015 16:25:30 -0300
-Subject: tests: Fix missing include of Xutil.h
-
-The EGL tests rely on Xutil.h being included. Some EGL implementation
-does not explitly include it by default and then the build fails.
-
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-Reviewed-by: Neil Roberts <neil@linux.intel.com>
-
-diff --git a/tests/egl/egl-configless-context.c b/tests/egl/egl-configless-context.c
-index 0504a26..154b55c 100644
---- a/tests/egl/egl-configless-context.c
-+++ b/tests/egl/egl-configless-context.c
-@@ -32,6 +32,7 @@
- /* Chunks of code in this file are taken from egl-util.c */
-
- #include <X11/Xlib.h>
-+#include <X11/Xutil.h>
-
- #include "piglit-util-gl.h"
- #include "piglit-util-egl.h"
---
-cgit v0.10.2
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index 607f236..f5ef364 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -3,18 +3,19 @@ LICENSE = "MIT & LGPLv2+ & GPLv3 & GPLv2+ & BSD-3-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
SRC_URI = "git://anongit.freedesktop.org/piglit \
- file://0001-tests-Fix-missing-include-of-Xutil.h.patch"
+ file://0001-cmake-install-bash-completions-in-the-right-place.patch \
+ "
-# From 2015-02-19
-SRCREV = "c4585427913e4cb28994b4bfb11d49778273aa2c"
+# From 2016-07-07
+SRCREV = "c39e41a86551eb390b8da23232dc8577639403d0"
# (when PV goes above 1.0 remove the trailing r)
PV = "1.0+gitr${SRCPV}"
S = "${WORKDIR}/git"
-DEPENDS = "virtual/libx11 libxrender waffle virtual/libgl libglu python-mako-native python-numpy-native"
+DEPENDS = "libpng virtual/libx11 libxrender waffle virtual/libgl libglu python3-mako-native python3-numpy-native python3-six-native"
-inherit cmake pythonnative distro_features_check
+inherit cmake python3native distro_features_check bash-completion
# depends on virtual/libx11
REQUIRED_DISTRO_FEATURES = "x11"
@@ -34,10 +35,14 @@ do_configure_prepend() {
fi
}
-RDEPENDS_${PN} = "waffle python python-mako python-json python-subprocess \
- python-argparse python-importlib python-unixadmin python-xml \
- python-multiprocessing python-textutils python-netserver python-shell \
- mesa-demos bash \
+do_install() {
+ oe_runmake -C ${B} 'DESTDIR=${D}' install/strip
+}
+
+RDEPENDS_${PN} = "waffle python3 python3-mako python3-json \
+ python3-subprocess python3-misc python3-importlib \
+ python3-unixadmin python3-xml python3-multiprocessing \
+ python3-six python3-shell python3-io mesa-demos bash \
"
-INSANE_SKIP_${PN} += "dev-so"
+INSANE_SKIP_${PN} += "dev-so already-stripped"
--
2.1.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH] piglit: Add build fix patch
2016-07-12 11:14 [PATCHv2 0/5] Upgrade piglit Jussi Kukkonen
` (4 preceding siblings ...)
2016-07-12 11:14 ` [PATCHv2 5/5] piglit: Upgrade version, use python3 Jussi Kukkonen
@ 2016-07-19 12:16 ` Jussi Kukkonen
2016-07-19 12:52 ` Martin Jansa
5 siblings, 1 reply; 10+ messages in thread
From: Jussi Kukkonen @ 2016-07-19 12:16 UTC (permalink / raw)
To: openembedded-core
Fixes [YOCTO #9851] (fingers crossed).
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
This is a potential build fix for a problem Martin reported that I
couldn't reproduce myself.
I've pushed this on top of the piglit branch that isn't yet merged.
git://git.yoctoproject.org/poky-contrib jku/piglit
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/piglit
Thanks,
Jussi
create mode 100644 meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch
diff --git a/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch b/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch
new file mode 100644
index 0000000..d591da5
--- /dev/null
+++ b/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch
@@ -0,0 +1,54 @@
+From 73e4fbc5777eddd89bb0fb16e90343551fe3e0ef Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Tue, 5 Jul 2016 10:56:23 +0300
+Subject: [PATCH] cmake: Link utils with xcb explicitly
+
+Linking with g++ can reportedly lead to:
+
+libpiglitutil_gl.so.0: error: undefined reference to 'xcb_connect'
+libpiglitutil_gl.so.0: error: undefined reference to 'xcb_get_setup'
+libpiglitutil_gl.so.0: error: undefined reference to 'xcb_setup_roots_iterator'
+
+This may have appeared now because xcb-dri2 used to overlink publicly
+but now does not.
+
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Upstream-Status: Pending
+---
+ CMakeLists.txt | 1 +
+ tests/util/CMakeLists.txt | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8e2abba..2e1a473 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -151,6 +151,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+
+ pkg_check_modules(LIBDRM QUIET libdrm)
+ pkg_check_modules(LIBDRM_INTEL QUIET libdrm_intel)
++ pkg_check_modules(XCB QUIET xcb)
+ pkg_check_modules(XCB_DRI2 QUIET xcb-dri2)
+ pkg_check_modules(GLPROTO QUIET glproto)
+ ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
+index fb22ffa..e1f8073 100644
+--- a/tests/util/CMakeLists.txt
++++ b/tests/util/CMakeLists.txt
+@@ -121,11 +121,13 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+
+ list(APPEND UTIL_GL_LIBS
+ ${LIBDRM_LDFLAGS}
++ ${XCB_LDFLAGS}
+ ${XCB_DRI2_LDFLAGS}
+ )
+
+ list(APPEND UTIL_GL_INCLUDES
+ ${LIBDRM_INCLUDE_DIRS}
++ ${XCB_INCLUDE_DIRS}
+ ${XCB_DRI2_INCLUDE_DIRS}
+ )
+
+--
+2.1.4
+
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index f5ef364..f14a7b4 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
SRC_URI = "git://anongit.freedesktop.org/piglit \
file://0001-cmake-install-bash-completions-in-the-right-place.patch \
+ file://0001-cmake-Link-utils-with-xcb-explicitly.patch \
"
# From 2016-07-07
--
2.1.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] piglit: Add build fix patch
2016-07-19 12:16 ` [PATCH] piglit: Add build fix patch Jussi Kukkonen
@ 2016-07-19 12:52 ` Martin Jansa
0 siblings, 0 replies; 10+ messages in thread
From: Martin Jansa @ 2016-07-19 12:52 UTC (permalink / raw)
To: Jussi Kukkonen; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 4099 bytes --]
On Tue, Jul 19, 2016 at 03:16:35PM +0300, Jussi Kukkonen wrote:
> Fixes [YOCTO #9851] (fingers crossed).
>
> Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
> ---
>
> This is a potential build fix for a problem Martin reported that I
> couldn't reproduce myself.
I'm sorry I haven't replied in the ticket yet, it's because my jenkins
build servers are down for last 18 days, because of some power failure
in datacenter where they are hosted, so I haven't executed any builds in
last 3 weeks and don't know when I'll be able to return to it.
+Tom who may provide some updated info about that datacenter issue
> I've pushed this on top of the piglit branch that isn't yet merged.
>
> git://git.yoctoproject.org/poky-contrib jku/piglit
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/piglit
>
> Thanks,
> Jussi
>
>
> create mode 100644 meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch
>
> diff --git a/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch b/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch
> new file mode 100644
> index 0000000..d591da5
> --- /dev/null
> +++ b/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch
> @@ -0,0 +1,54 @@
> +From 73e4fbc5777eddd89bb0fb16e90343551fe3e0ef Mon Sep 17 00:00:00 2001
> +From: Jussi Kukkonen <jussi.kukkonen@intel.com>
> +Date: Tue, 5 Jul 2016 10:56:23 +0300
> +Subject: [PATCH] cmake: Link utils with xcb explicitly
> +
> +Linking with g++ can reportedly lead to:
> +
> +libpiglitutil_gl.so.0: error: undefined reference to 'xcb_connect'
> +libpiglitutil_gl.so.0: error: undefined reference to 'xcb_get_setup'
> +libpiglitutil_gl.so.0: error: undefined reference to 'xcb_setup_roots_iterator'
> +
> +This may have appeared now because xcb-dri2 used to overlink publicly
> +but now does not.
> +
> +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
> +Upstream-Status: Pending
> +---
> + CMakeLists.txt | 1 +
> + tests/util/CMakeLists.txt | 2 ++
> + 2 files changed, 3 insertions(+)
> +
> +diff --git a/CMakeLists.txt b/CMakeLists.txt
> +index 8e2abba..2e1a473 100644
> +--- a/CMakeLists.txt
> ++++ b/CMakeLists.txt
> +@@ -151,6 +151,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
> +
> + pkg_check_modules(LIBDRM QUIET libdrm)
> + pkg_check_modules(LIBDRM_INTEL QUIET libdrm_intel)
> ++ pkg_check_modules(XCB QUIET xcb)
> + pkg_check_modules(XCB_DRI2 QUIET xcb-dri2)
> + pkg_check_modules(GLPROTO QUIET glproto)
> + ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
> +diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
> +index fb22ffa..e1f8073 100644
> +--- a/tests/util/CMakeLists.txt
> ++++ b/tests/util/CMakeLists.txt
> +@@ -121,11 +121,13 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
> +
> + list(APPEND UTIL_GL_LIBS
> + ${LIBDRM_LDFLAGS}
> ++ ${XCB_LDFLAGS}
> + ${XCB_DRI2_LDFLAGS}
> + )
> +
> + list(APPEND UTIL_GL_INCLUDES
> + ${LIBDRM_INCLUDE_DIRS}
> ++ ${XCB_INCLUDE_DIRS}
> + ${XCB_DRI2_INCLUDE_DIRS}
> + )
> +
> +--
> +2.1.4
> +
> diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
> index f5ef364..f14a7b4 100644
> --- a/meta/recipes-graphics/piglit/piglit_git.bb
> +++ b/meta/recipes-graphics/piglit/piglit_git.bb
> @@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
>
> SRC_URI = "git://anongit.freedesktop.org/piglit \
> file://0001-cmake-install-bash-completions-in-the-right-place.patch \
> + file://0001-cmake-Link-utils-with-xcb-explicitly.patch \
> "
>
> # From 2016-07-07
> --
> 2.1.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2016-07-19 12:52 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-12 11:14 [PATCHv2 0/5] Upgrade piglit Jussi Kukkonen
2016-07-12 11:14 ` [PATCHv2 1/5] python-six: Add to oe-core Jussi Kukkonen
2016-07-12 11:14 ` [PATCHv2 2/5] python3: Add compression to python3-shell dependencies Jussi Kukkonen
2016-07-12 11:14 ` [PATCHv2 3/5] python3: Add dependencies for python3-misc Jussi Kukkonen
2016-07-12 11:14 ` [PATCHv2 4/5] python3-native: Add "io" to rprovides Jussi Kukkonen
2016-07-12 11:14 ` [PATCHv2 5/5] piglit: Upgrade version, use python3 Jussi Kukkonen
2016-07-13 13:41 ` Burton, Ross
2016-07-13 17:00 ` [PATCHv3] " Jussi Kukkonen
2016-07-19 12:16 ` [PATCH] piglit: Add build fix patch Jussi Kukkonen
2016-07-19 12:52 ` Martin Jansa
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.