debian/changelog | 15 +++++++- debian/control | 4 ++ debian/patches/100_drmtest_exit_not_abort.patch | 43 ++++++++++++++++++++++++ debian/patches/series | 1 debian/rules | 5 ++ 5 files changed, 67 insertions(+), 1 deletion(-)
New commits: commit 48fbf939b52594799433f6fa6469dbd08c559f18 Author: Tormod Volden <[email protected]> Date: Fri Feb 10 22:33:43 2012 +0100 Add Vcs links to debian/control diff --git a/debian/changelog b/debian/changelog index e954603..5036258 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,6 @@ intel-gpu-tools (1.1-1) UNRELEASED; urgency=low Tormod, and myself as Uploaders. * Wrap Build-Depends/Depends. * Bump libdrm-intel1 build-dep. - * Bump Standards-Version to 3.9.2 (no changes needed) * Update watch file: - Add a reference to upstream git repository. - Switch from tar.bz2 to tar.gz, the former isn't supported by the 1.0 @@ -27,6 +26,10 @@ intel-gpu-tools (1.1-1) UNRELEASED; urgency=low * Add 100_drmtest_exit_not_abort.patch to avoid SIGABRT when running benchmarks as non-root. + [ Tormod Volden ] + * control: Add Vcs links + * Bump Standards-Version to 3.9.2 (no changes needed) + -- Cyril Brulebois <[email protected]> Sun, 25 Dec 2011 18:16:47 +0100 intel-gpu-tools (1.0.2-1) unstable; urgency=low diff --git a/debian/control b/debian/control index ab4d94c..3c8111b 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,8 @@ Build-Depends: xutils-dev (>= 1:7.6+6), Standards-Version: 3.9.2 Homepage: http://www.intellinuxgraphics.org/ +Vcs-Git: git://git.debian.org/git/pkg-xorg/app/intel-gpu-tools.git +Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/intel-gpu-tools.git Package: intel-gpu-tools Architecture: any commit bb2be94945e8365cf3ca0c3fc290f7f5f15eecc3 Author: Tormod Volden <[email protected]> Date: Fri Feb 10 22:23:08 2012 +0100 Add patch to avoid SIGABRT when running non-root Picked from Bryce's ubuntu branch, thanks. diff --git a/debian/changelog b/debian/changelog index d6e40e0..e954603 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,8 @@ intel-gpu-tools (1.1-1) UNRELEASED; urgency=low * Add build dependency on xutils-dev to fix FTBFS. * rules: Add gentarball target to make it easier to update to new git snapshots when needed. + * Add 100_drmtest_exit_not_abort.patch to avoid SIGABRT when running + benchmarks as non-root. -- Cyril Brulebois <[email protected]> Sun, 25 Dec 2011 18:16:47 +0100 diff --git a/debian/patches/100_drmtest_exit_not_abort.patch b/debian/patches/100_drmtest_exit_not_abort.patch new file mode 100644 index 0000000..d539393 --- /dev/null +++ b/debian/patches/100_drmtest_exit_not_abort.patch @@ -0,0 +1,43 @@ +From 73af5dcd1d361543a79189456e66b951bc4c9cb3 Mon Sep 17 00:00:00 2001 +From: Bryce Harrington <[email protected]> +Date: Tue, 24 Jan 2012 19:35:28 -0800 +Subject: [PATCH intel-gpu-tools 1/1] drmtest: exit() rather than abort() for simple usage errors. + +When the benchmarks are run as non-root, they terminate since they can't +read the drm files. However, by terminating with abort(), this raises +SIGABRT which has the side effect of triggering crash reporting +utilities (e.g. apport). As a result we've been accumulating bug +reports about it. + +As the code is displaying a unique error message prior to termination, +it should be discoverable enough where in the code the failure occurs, +so an exit(1) should be sufficient for termination. + +Signed-off-by: Bryce Harrington <[email protected]> +--- + lib/drmtest.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/drmtest.c b/lib/drmtest.c +index fc40ad1..5ebd6d6 100644 +--- a/lib/drmtest.c ++++ b/lib/drmtest.c +@@ -65,7 +65,7 @@ int drm_open_any(void) + close(fd); + } + fprintf(stderr, "failed to open any drm device. retry as root?\n"); +- abort(); ++ exit(1); + } + + +@@ -108,5 +108,5 @@ int drm_open_any_master(void) + return fd; + } + fprintf(stderr, "Couldn't find an un-controlled DRM device\n"); +- abort(); ++ exit(1); + } +-- +1.7.4.1 + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..069dcea --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +100_drmtest_exit_not_abort.patch commit 7db0f8ba9ee8ac5ab5ddc3cbb12cbbdde0d45500 Author: Tormod Volden <[email protected]> Date: Fri Feb 10 22:08:13 2012 +0100 Add gentarball rule (for future convenience) Picked from Bryce's ubuntu branch, thanks. diff --git a/debian/changelog b/debian/changelog index 7da57a4..d6e40e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ intel-gpu-tools (1.1-1) UNRELEASED; urgency=low * control: Add Conflicts with xserver-xorg-video-intel < 2.9.1 due to intel_reg_dumper. (LP: #591203) * Add build dependency on xutils-dev to fix FTBFS. + * rules: Add gentarball target to make it easier to update to new git + snapshots when needed. -- Cyril Brulebois <[email protected]> Sun, 25 Dec 2011 18:16:47 +0100 diff --git a/debian/rules b/debian/rules index 6d954b5..f30014a 100755 --- a/debian/rules +++ b/debian/rules @@ -14,3 +14,8 @@ override_dh_install: %: dh $@ --with quilt,autoreconf --builddirectory=build/ + +# For maintainer use only, generate a tarball: +gentarball: UV=$(shell dpkg-parsechangelog|awk '/^Version:/ {print $$2}'|sed 's/-.*$$//') +gentarball: + git archive --format=tar upstream-unstable --prefix=$(SOURCE)-$(UV)/ | gzip -9 > ../$(SOURCE)_$(UV).orig.tar.gz commit ee7ca2b7a413a0ae763067f1944d0db116b8c2d3 Author: Tormod Volden <[email protected]> Date: Fri Feb 10 22:02:47 2012 +0100 Add xutils-dev build dependency Picked from Bryce's ubuntu branch, thanks. diff --git a/debian/changelog b/debian/changelog index 0c2fa93..7da57a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ intel-gpu-tools (1.1-1) UNRELEASED; urgency=low [ Bryce Harrington ] * control: Add Conflicts with xserver-xorg-video-intel < 2.9.1 due to intel_reg_dumper. (LP: #591203) + * Add build dependency on xutils-dev to fix FTBFS. -- Cyril Brulebois <[email protected]> Sun, 25 Dec 2011 18:16:47 +0100 diff --git a/debian/control b/debian/control index 8ffd7ac..ab4d94c 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Build-Depends: libpciaccess-dev (>= 0.10), libdrm-dev, libdrm-intel1 (>= 2.4.23), + xutils-dev (>= 1:7.6+6), Standards-Version: 3.9.2 Homepage: http://www.intellinuxgraphics.org/ commit 5ea23a8aa89bf8892a8d6d649dcb11ac51ba751d Author: Tormod Volden <[email protected]> Date: Fri Feb 10 21:57:50 2012 +0100 Add conflicts with xserver-xorg-video-intel < 2.9.1 Picked from Bryce's ubuntu branch, thanks. diff --git a/debian/changelog b/debian/changelog index 06ead44..0c2fa93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ intel-gpu-tools (1.1-1) UNRELEASED; urgency=low + [ Cyril Brulebois ] * New upstream release. (Closes: #621721) - Fixes intel_gpu_top MMIO issue. (Closes: #655672) * Make the Debian X Strike Force maintain the package; keeping Eric, @@ -17,6 +18,10 @@ intel-gpu-tools (1.1-1) UNRELEASED; urgency=low - Use --fail-missing and .install accordingly. * Disable test suite, "make test" checks GPU/drm, not the build + [ Bryce Harrington ] + * control: Add Conflicts with xserver-xorg-video-intel < 2.9.1 due to + intel_reg_dumper. (LP: #591203) + -- Cyril Brulebois <[email protected]> Sun, 25 Dec 2011 18:16:47 +0100 intel-gpu-tools (1.0.2-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 44c3950..8ffd7ac 100644 --- a/debian/control +++ b/debian/control @@ -19,6 +19,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, +Conflicts: xserver-xorg-video-intel (<< 2.9.1) Description: tools for debugging the Intel graphics driver intel-gpu-tools is a package of tools for debugging the Intel graphics driver, including a GPU hang dumping program, performance monitor, and performance -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
