Skip to contentSkip to conversation

piglit: move to meta-oe

PATCH In review Alexander Kanavin 2 participants 9 messages Feb 29, 2020 – Mar 19, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 piglit: move to meta-oe

This recipe is build-heavy, yet is not part of any images and isn't runtime tesed as part of oe-core. There's no evidence of anyone using it, as all commits are revision updates. It also pulls in NumPy, which is also
a significant support item, and wouldn't otherwise be part of core.

---
 meta/conf/distro/include/maintainers.inc      |  1 -
 ...-bash-completions-in-the-right-place.patch | 35 ----------
 ...proper-WAYLAND_INCLUDE_DIRS-variable.patch | 32 ----------
 meta/recipes-graphics/piglit/piglit_git.bb    | 64 -------------------
 4 files changed, 132 deletions(-)
 delete 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-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch
 delete mode 100644 meta/recipes-graphics/piglit/piglit_git.bb
meta/conf/distro/include/maintainers.inc +0 -1
index 10095ffe76..97860676cc 100644
@@ -551,7 +551,6 @@ RECIPE_MAINTAINER_pn-pciutils = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-pcmanfm = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-perf = "Bruce Ashfield <[email protected]>"
 RECIPE_MAINTAINER_pn-perl = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER_pn-piglit = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-pigz = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER_pn-pinentry = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-pixman = "Anuj Mittal <[email protected]>"
meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch deleted +0 -35
deleted file mode 100644
index e07e810a73..0000000000
@@ -1,35 +0,0 @@
-From 26faa2c157a27a18a9f767976730fe0c115e3af4 Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <[email protected]>
-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 <[email protected]>
-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
-
meta/recipes-graphics/piglit/piglit/0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch deleted +0 -32
deleted file mode 100644
index 5d6ec368ba..0000000000
@@ -1,32 +0,0 @@
-From 3bf1beee1ddd19bc536ff2856e04ac269d43daa2 Mon Sep 17 00:00:00 2001
-From: Pascal Bach <[email protected]>
-Date: Thu, 4 Oct 2018 14:43:17 +0200
-Subject: [PATCH] cmake: use proper WAYLAND_INCLUDE_DIRS variable
-
-WAYLAND_wayland-client_INCLUDEDIR is an internal variable and is not correctly
-set when cross compiling. WAYLAND_INCLUDE_DIRS includes the correct path even
-when cross compiling.
-
-Signed-off-by: Pascal Bach <[email protected]>
-
-Upstream-Status: Submitted [[email protected]]
----
- tests/util/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
-index a5f080156..a303a9f58 100644
---- a/tests/util/CMakeLists.txt
-+++ b/tests/util/CMakeLists.txt
-@@ -97,7 +97,7 @@ if(PIGLIT_USE_WAFFLE)
- 			piglit-framework-gl/piglit_wl_framework.c
- 		)
- 		list(APPEND UTIL_GL_INCLUDES
--			${WAYLAND_wayland-client_INCLUDEDIR}
-+			${WAYLAND_INCLUDE_DIRS}
- 		)
- 	endif()
- 	if(PIGLIT_HAS_X11)
--- 
-2.11.0
-
meta/recipes-graphics/piglit/piglit_git.bb deleted +0 -64

64 lines not on this page · raw message

Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/2 python3-numpy: move to meta-python

This recipe is in core only to enable piglit, and isn't otherwise eligible for inclusion.

---
 meta/conf/distro/include/maintainers.inc      |  1 -
 ...-and-so-on-for-libraries-by-default-.patch | 70 -------------------
 ...up.py-remove-the-detection-of-x86-ta.patch | 32 ---------
 .../python-numpy/python-numpy.inc             | 52 --------------
 .../python-numpy/python3-numpy_1.17.4.bb      |  3 -
 5 files changed, 158 deletions(-)
 delete mode 100644 meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
 delete mode 100644 meta/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch
 delete mode 100644 meta/recipes-devtools/python-numpy/python-numpy.inc
 delete mode 100644 meta/recipes-devtools/python-numpy/python3-numpy_1.17.4.bb
meta/conf/distro/include/maintainers.inc +0 -1
index 97860676cc..502636ec3d 100644
@@ -584,7 +584,6 @@ RECIPE_MAINTAINER_pn-python3-libarchive-c = "Joshua Watt <[email protected]>"
 RECIPE_MAINTAINER_pn-python3-magic = "Joshua Watt <[email protected]>"
 RECIPE_MAINTAINER_pn-python3-mako = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python3-nose = "Oleksandr Kravchuk <[email protected]>"
-RECIPE_MAINTAINER_pn-python3-numpy = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python3-pbr = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python3-pip = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python3-pycairo = "Oleksandr Kravchuk <[email protected]>"
meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch deleted +0 -70

70 lines not on this page · raw message

meta/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch deleted +0 -32
deleted file mode 100644
index 9da6a2b3da..0000000000
@@ -1,32 +0,0 @@
-From b881e0b2ba9cf1a4aa351a1c1ea90b1e1776ce21 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Mon, 12 Aug 2019 15:37:36 +0200
-Subject: [PATCH] numpy/random/setup.py: remove the detection of x86 targets
- via uname()
-
-This was badly breaking compilation for ARM targets (and possibly
-other non-x86 targets); if -msse2 is desirable for x86 builds it has
-to be passed through another channel.
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- numpy/random/setup.py | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/numpy/random/setup.py b/numpy/random/setup.py
-index a1bf3b8..60fb534 100644
---- a/numpy/random/setup.py
-+++ b/numpy/random/setup.py
-@@ -49,11 +49,6 @@ def configuration(parent_package='', top_path=None):
-     elif not is_msvc:
-         # Some bit generators require c99
-         EXTRA_COMPILE_ARGS += ['-std=c99']
--        INTEL_LIKE = any(arch in platform.machine() 
--                         for arch in ('x86', 'i686', 'i386', 'amd64'))
--        if INTEL_LIKE:
--            # Assumes GCC or GCC-like compiler
--            EXTRA_COMPILE_ARGS += ['-msse2']
- 
-     # Use legacy integer variable sizes
-     LEGACY_DEFS = [('NP_RANDOM_LEGACY', '1')]
meta/recipes-devtools/python-numpy/python-numpy.inc deleted +0 -52

52 lines not on this page · raw message

meta/recipes-devtools/python-numpy/python3-numpy_1.17.4.bb deleted +0 -3
deleted file mode 100644
index d388e88d25..0000000000
@@ -1,3 +0,0 @@
-inherit setuptools3
-require python-numpy.inc
-
Signature · 1 line
2.25.1
#2 lore raw
In reply to Alexander Kanavin
Quoted 5 lines · Alexander Kanavin

This recipe is build-heavy, yet is not part of any images and isn't runtime tesed as
part of oe-core. There's no evidence of anyone using it, as all commits are revision updates. It also pulls in NumPy, which is also a significant support item, and wouldn't otherwise be part of core.

I'm not sure about this. The intent was to use piglit as a way of improving our graphics testing, particularly allowing it to be automated.

Whilst we've had to focus on getting the basics right, I'm not sure that objective isn't still a worthy goal over time?

Cheers,

Richard

#3 lore raw
Quoted 7 lines · Richard Purdie
Quoted 5 lines · Alexander Kanavin

This recipe is build-heavy, yet is not part of any images and isn't runtime tesed as
part of oe-core. There's no evidence of anyone using it, as all commits are revision updates. It also pulls in NumPy, which is also a significant support item, and wouldn't otherwise be part of core.

Quoted 6 lines

I'm not sure about this. The intent was to use piglit as a way of improving our graphics testing, particularly allowing it to be automated.

Whilst we've had to focus on getting the basics right, I'm not sure that objective isn't still a worthy goal over time?

Piglit is meant for testing and validating OpenGL drivers for real hardware. While we can put it on top of software Mesa driver or virgl, I am not sure there is much value in that? Software rendering might even be too slow to run in practice.

Alex

Quoted 1 line
#4 lore raw
Quoted 16 lines · Alexander Kanavin
Quoted 14 lines · Richard Purdie
Quoted 1 line · Alexander Kanavin

This recipe is build-heavy, yet is not part of any images and

isn't

Quoted 3 lines

runtime tesed as
part of oe-core. There's no evidence of anyone using it, as all commits are revision updates. It also pulls in NumPy, which is

also

Quoted 1 line

a significant support item, and wouldn't otherwise be part of

core.

I'm not sure about this. The intent was to use piglit as a way of improving our graphics testing, particularly allowing it to be automated.

Quoted 7 lines
Quoted 2 lines

Whilst we've had to focus on getting the basics right, I'm not sure that objective isn't still a worthy goal over time?

Piglit is meant for testing and validating OpenGL drivers for real hardware. While we can put it on top of software Mesa driver or virgl, I am not sure there is much value in that? Software rendering might even be too slow to run in practice.

OE-Core is meant to be usable for validating BSPs amongst other things though. Testing virgl does prove the graphics stack is working too from a software perspective so does have some value.

Cheers,

Richard

#5 lore raw
Quoted 20 lines · Richard Purdie
Quoted 19 lines · Alexander Kanavin
Quoted 16 lines · Richard Purdie
Quoted 1 line · Alexander Kanavin

This recipe is build-heavy, yet is not part of any images and

isn't

Quoted 3 lines

runtime tesed as
part of oe-core. There's no evidence of anyone using it, as all commits are revision updates. It also pulls in NumPy, which is

also

Quoted 1 line

a significant support item, and wouldn't otherwise be part of

core.

I'm not sure about this. The intent was to use piglit as a way of improving our graphics testing, particularly allowing it to be automated.

Whilst we've had to focus on getting the basics right, I'm not sure that objective isn't still a worthy goal over time?

Quoted 8 lines
Quoted 4 lines

Piglit is meant for testing and validating OpenGL drivers for real hardware. While we can put it on top of software Mesa driver or virgl, I am not sure there is much value in that? Software rendering might even be too slow to run in practice.

OE-Core is meant to be usable for validating BSPs amongst other things though. Testing virgl does prove the graphics stack is working too from a software perspective so does have some value.

Right, I can put Piglit on top of virgl and see how well that works. It would be good to enable virgl ‘out of the box’ at some point, I’ve been proposing that for a while :)

Alex

Quoted 1 line
#6 lore raw
Quoted 13 lines · Alexander Kanavin
Quoted 13 lines
Quoted 12 lines

I'm not sure about this. The intent was to use piglit as a way of

Quoted 5 lines

improving our graphics testing, particularly allowing it to be automated.

Whilst we've had to focus on getting the basics right, I'm not sure that objective isn't still a worthy goal over time?

Piglit is meant for testing and validating OpenGL drivers for real hardware. While we can put it on top of software Mesa driver or virgl, I am not sure there is much value in that? Software rendering might even be too slow to run in practice.

Quoted 9 lines
Quoted 3 lines

OE-Core is meant to be usable for validating BSPs amongst other things though. Testing virgl does prove the graphics stack is working too from a software perspective so does have some value.

Right, I can put Piglit on top of virgl and see how well that works. It would be good to enable virgl ‘out of the box’ at some point, I’ve been proposing that for a while :)

I found an old ticket where piglit was proposed for the core image testing, and the idea was rejected due to its huge install size, so I won't be pursuing this further.
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10047

Would you still say it's worth to keep the recipe in core? Python-numpy (that piglit and only piglit needs) isn't trivial to maintain either (for instance, update to latest version needs cython to be added to core).

Alex

#7 lore raw
Quoted 35 lines · Alexander Kanavin
Quoted 23 lines · Alexander Kanavin
Quoted 1 line
Quoted 1 line

I'm not sure about this. The intent was to use piglit as a way

of

Quoted 12 lines
Quoted 1 line
Quoted 1 line

improving our graphics testing, particularly allowing it to

be

Quoted 3 lines
Quoted 3 lines

automated.

Whilst we've had to focus on getting the basics right, I'm

not sure

Quoted 3 lines
Quoted 1 line

that objective isn't still a worthy goal over time?

Piglit is meant for testing and validating OpenGL drivers for

real

Quoted 2 lines

hardware. While we can put it on top of software Mesa driver or virgl, I am not sure there is much value in that? Software

Quoted 8 lines

rendering

Quoted 1 line

might even be too slow to run in practice.

OE-Core is meant to be usable for validating BSPs amongst other things
though. Testing virgl does prove the graphics stack is working too from
a software perspective so does have some value.

Quoted 4 lines

Right, I can put Piglit on top of virgl and see how well that works. It would be good to enable virgl ‘out of the box’ at some point, I’ve been proposing that for a while :)

I found an old ticket where piglit was proposed for the core image testing, and the idea was rejected due to its huge install size, so I won't be pursuing this further.
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10047

Quoted 4 lines

Would you still say it's worth to keep the recipe in core? Python- numpy (that piglit and only piglit needs) isn't trivial to maintain either (for instance, update to latest version needs cython to be added to core).

That bug is for piglit as a default in testapps. We decided that was a bad idea, not that testing with piglit was a bad idea overall.

Cheers,

Richard

#8 lore raw
Quoted 5 lines · Richard Purdie
Quoted 5 lines

I found an old ticket where piglit was proposed for the core image testing, and the idea was rejected due to its huge install size, so I won't be pursuing this further.
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10047

Quoted 8 lines
Quoted 4 lines

Would you still say it's worth to keep the recipe in core? Python- numpy (that piglit and only piglit needs) isn't trivial to maintain either (for instance, update to latest version needs cython to be added to core).

That bug is for piglit as a default in testapps. We decided that was a bad idea, not that testing with piglit was a bad idea overall.

So adding piglit to perhaps core-image-sato-ptest would be okay? (with the resulting increase in size and do_rootfs times)

Alex