[meta-intel] [PATCH v3] intel-gpu-tools: upgrade to version 1.11
Pengyu Ma
pengyu.ma at windriver.com
Tue Aug 11 20:42:20 PDT 2015
Disable gtk-doc to fix building error.
Add libunwind package config to fix denpendece.
Changes since v2:
* Remove bash dependency.
Changes since v1:
* Add libunwind package config.
Signed-off-by: Pengyu Ma <pengyu.ma at windriver.com>
---
...001-test-script-remove-dependency-on-bash.patch | 146 +++++++++++++++++++++
...el-gpu-tools_1.9.bb => intel-gpu-tools_1.11.bb} | 12 +-
2 files changed, 156 insertions(+), 2 deletions(-)
create mode 100644 common/recipes-graphics/intel-gpu-tools/intel-gpu-tools/0001-test-script-remove-dependency-on-bash.patch
rename common/recipes-graphics/intel-gpu-tools/{intel-gpu-tools_1.9.bb => intel-gpu-tools_1.11.bb} (62%)
diff --git a/common/recipes-graphics/intel-gpu-tools/intel-gpu-tools/0001-test-script-remove-dependency-on-bash.patch b/common/recipes-graphics/intel-gpu-tools/intel-gpu-tools/0001-test-script-remove-dependency-on-bash.patch
new file mode 100644
index 0000000..e93ab64
--- /dev/null
+++ b/common/recipes-graphics/intel-gpu-tools/intel-gpu-tools/0001-test-script-remove-dependency-on-bash.patch
@@ -0,0 +1,146 @@
+From a46007ee1644522775c5e429310e0637946818fd Mon Sep 17 00:00:00 2001
+From: Pengyu Ma <pengyu.ma at windriver.com>
+Date: Wed, 12 Aug 2015 11:01:36 +0800
+Subject: [PATCH] test/script: remove dependency on bash
+
+use /bin/sh instead.
+
+Signed-off-by: Pengyu Ma <pengyu.ma at windriver.com>
+---
+ scripts/run-tests.sh | 2 +-
+ scripts/who.sh | 2 +-
+ tests/check_drm_clients | 2 +-
+ tests/ddx_intel_after_fbdev | 2 +-
+ tests/debugfs_emon_crash | 2 +-
+ tests/drv_debugfs_reader | 2 +-
+ tests/drv_missed_irq_hang | 2 +-
+ tests/drv_module_reload | 2 +-
+ tests/kms_sysfs_edid_timing | 2 +-
+ tests/sysfs_l3_parity | 2 +-
+ tests/test_rte_check | 2 +-
+ tests/tools_test | 2 +-
+ 12 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
+index d72fc05..f269567 100755
+--- a/scripts/run-tests.sh
++++ b/scripts/run-tests.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # Copyright © 2014 Intel Corporation
+ #
+diff --git a/scripts/who.sh b/scripts/who.sh
+index b221639..205cdca 100755
+--- a/scripts/who.sh
++++ b/scripts/who.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # usage: sudo who.sh
+ #
+diff --git a/tests/check_drm_clients b/tests/check_drm_clients
+index eb12416..fed00cd 100755
+--- a/tests/check_drm_clients
++++ b/tests/check_drm_clients
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
+ . $SOURCE_DIR/drm_lib.sh
+diff --git a/tests/ddx_intel_after_fbdev b/tests/ddx_intel_after_fbdev
+index bcd2c29..cc3b7cf 100755
+--- a/tests/ddx_intel_after_fbdev
++++ b/tests/ddx_intel_after_fbdev
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # Testcase: Load Intel DDX after fbdev was loaded
+ #
+diff --git a/tests/debugfs_emon_crash b/tests/debugfs_emon_crash
+index 809bfab..2e18963 100755
+--- a/tests/debugfs_emon_crash
++++ b/tests/debugfs_emon_crash
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # This check if we can crash the kernel with segmentation-fault
+ # by reading /sys/kernel/debug/dri/0/i915_emon_status too quickly
+diff --git a/tests/drv_debugfs_reader b/tests/drv_debugfs_reader
+index 9e2845e..23e9c32 100755
+--- a/tests/drv_debugfs_reader
++++ b/tests/drv_debugfs_reader
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
+ . $SOURCE_DIR/drm_lib.sh
+diff --git a/tests/drv_missed_irq_hang b/tests/drv_missed_irq_hang
+index 6e8cfc2..8285bc0 100755
+--- a/tests/drv_missed_irq_hang
++++ b/tests/drv_missed_irq_hang
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # Testcase: Simulate missed breadcrumb interrupts
+ #
+diff --git a/tests/drv_module_reload b/tests/drv_module_reload
+index bb29a64..e0398d0 100755
+--- a/tests/drv_module_reload
++++ b/tests/drv_module_reload
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # Testcase: Reload the drm module
+ #
+diff --git a/tests/kms_sysfs_edid_timing b/tests/kms_sysfs_edid_timing
+index ec704f6..e90e374 100755
+--- a/tests/kms_sysfs_edid_timing
++++ b/tests/kms_sysfs_edid_timing
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # This check the time we take to read the content of all the possible connectors.
+ # Without the edid -ENXIO patch (http://permalink.gmane.org/gmane.comp.video.dri.devel/62083),
+diff --git a/tests/sysfs_l3_parity b/tests/sysfs_l3_parity
+index 9bd1724..02f763b 100755
+--- a/tests/sysfs_l3_parity
++++ b/tests/sysfs_l3_parity
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
+ . $SOURCE_DIR/drm_lib.sh
+diff --git a/tests/test_rte_check b/tests/test_rte_check
+index eb12416..fed00cd 100755
+--- a/tests/test_rte_check
++++ b/tests/test_rte_check
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+
+ SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )"
+ . $SOURCE_DIR/drm_lib.sh
+diff --git a/tests/tools_test b/tests/tools_test
+index a6178e1..5f2d1dc 100755
+--- a/tests/tools_test
++++ b/tests/tools_test
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ # Test some of the most critical tools we have accidentally broken before.
+ # TODO: Possibly make tests parse output
+
+--
+2.4.3
+
diff --git a/common/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.9.bb b/common/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.11.bb
similarity index 62%
rename from common/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.9.bb
rename to common/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.11.bb
index b98fc75..41aecab 100644
--- a/common/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.9.bb
+++ b/common/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.11.bb
@@ -3,13 +3,21 @@ require ${COREBASE}/meta/recipes-graphics/xorg-app/xorg-app-common.inc
SUMMARY = "Intel GPU tools"
DESCRIPTION = "Variety of small tools for testing intel graphics."
-SRC_URI[md5sum] = "1e768f2b1edc8613911b1d33bb361a7f"
-SRC_URI[sha256sum] = "1de4c28ae0fe1e6c198ab559dbffcec6762798dc4adbdfdac54b2c7a9b0a1ed3"
+SRC_URI += "file://0001-test-script-remove-dependency-on-bash.patch \
+ "
+
+SRC_URI[md5sum] = "836e9fd084f63da2a29fe81a47eb3db8"
+SRC_URI[sha256sum] = "48823450452b57c52c74e00c8c763ed7cdd0c81cc877e8c2f619f7f6c45dade4"
LIC_FILES_CHKSUM = "file://COPYING;md5=0918806acfedc3e8c0488f2dd61616dd"
+inherit autotools gtk-doc
+
DEPENDS += "libdrm libpciaccess cairo udev glib-2.0 libxv libx11 libxext libxrandr"
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind,libunwind"
+
EXTRA_OECONF = "--disable-nouveau --disable-shader-debugger --disable-dumper"
COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux"
--
2.4.3
More information about the meta-intel
mailing list