summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2019-07-01 14:26:07 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-07-01 14:53:18 +0200
commit82cf77569cb8d1ea226b99fe1396a2fec8b22626 (patch)
treea8f008f76623c8358ba072482d58241c04c1e59d
parent48b196eae1f1097de0f1c506d954dd9fceb3b2f0 (diff)
downloadptxdist-82cf77569cb8d1ea226b99fe1396a2fec8b22626.tar.gz
ptxdist-82cf77569cb8d1ea226b99fe1396a2fec8b22626.tar.xz
igt-gpu-tools: version bump 1.23 -> 1.24
- version bump - some configuration options changed from bool to enabled/disabled/auto - igt now has a standalone test runner Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/igt-gpu-tools.in9
-rw-r--r--rules/igt-gpu-tools.make21
2 files changed, 20 insertions, 10 deletions
diff --git a/rules/igt-gpu-tools.in b/rules/igt-gpu-tools.in
index e0a078d7d..92cb4d19a 100644
--- a/rules/igt-gpu-tools.in
+++ b/rules/igt-gpu-tools.in
@@ -14,6 +14,7 @@ menuconfig IGT_GPU_TOOLS
select UDEV
select UDEV_LIBUDEV
select ZLIB
+ select JSON_C if IGT_GPU_TOOLS_TEST_RUNNER
prompt "igt-gpu-tools"
help
igt-gpu-tools is a package of tools for debugging the Intel
@@ -39,4 +40,12 @@ config IGT_GPU_TOOLS_TESTS
bool
prompt "build and install tests"
+if IGT_GPU_TOOLS_TESTS
+
+config IGT_GPU_TOOLS_TEST_RUNNER
+ bool
+ prompt "build and install igt test runner"
+
+endif
+
endif
diff --git a/rules/igt-gpu-tools.make b/rules/igt-gpu-tools.make
index c4b8599a7..027d6d416 100644
--- a/rules/igt-gpu-tools.make
+++ b/rules/igt-gpu-tools.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_IGT_GPU_TOOLS) += igt-gpu-tools
#
# Paths and names
#
-IGT_GPU_TOOLS_VERSION := 1.23
-IGT_GPU_TOOLS_MD5 := 04c1f10d6fd85e079271540b0ea786e9
+IGT_GPU_TOOLS_VERSION := 1.24
+IGT_GPU_TOOLS_MD5 := 0e0b4a1a80dc2e09c2705e0c5159e0a1
IGT_GPU_TOOLS := igt-gpu-tools-$(IGT_GPU_TOOLS_VERSION)
IGT_GPU_TOOLS_SUFFIX := tar.xz
IGT_GPU_TOOLS_URL := $(call ptx/mirror, XORG, individual/app/$(IGT_GPU_TOOLS).$(IGT_GPU_TOOLS_SUFFIX))
@@ -39,16 +39,17 @@ IGT_GPU_TOOLS_LIBDRM-$(PTXCONF_IGT_GPU_TOOLS_NOUVEAU) += nouveau
IGT_GPU_TOOLS_CONF_TOOL := meson
IGT_GPU_TOOLS_CONF_OPT := \
$(CROSS_MESON_USR) \
- -Dbuild_overlay=false \
+ -Dbuild_chamelium=disabled \
+ -Dbuild_docs=disabled \
+ -Dbuild_man=disabled \
+ -Dbuild_overlay=disabled \
+ -Dbuild_runner=$(call ptx/endis,PTXCONF_IGT_GPU_TOOLS_TEST_RUNNER)d \
+ -Dbuild_tests=$(call ptx/endis,PTXCONF_IGT_GPU_TOOLS_TESTS)d \
-Doverlay_backends=auto \
- -Dbuild_audio=false \
- -Dbuild_chamelium=false \
- -Dwith_valgrind=false \
- -Dbuild_man=false \
- -Dbuild_docs=false \
- -Dbuild_tests=$(call ptx/truefalse,PTXCONF_IGT_GPU_TOOLS_TESTS) \
+ -Duse_rpath=false \
-Dwith_libdrm=$(subst $(space),$(comma),$(IGT_GPU_TOOLS_LIBDRM-y)) \
- -Duse_rpath=false
+ -Dwith_libunwind=enabled \
+ -Dwith_valgrind=disabled \
ifdef PTXCONF_KERNEL_HEADER
IGT_GPU_TOOLS_CPPFLAGS := \