debian/changelog | 16 +++++++-
debian/patches/100_drmtest_exit_not_abort.patch | 43 ++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 57 insertions(+), 3 deletions(-)
New commits:
commit 5ac9fb8a31ce75e44e740b0cde1fc5ead74cd34c
Author: Bryce Harrington <br...@canonical.com>
Date: Wed Jan 25 09:48:02 2012 -0800
Patch to stop triggering apport on usage errors
diff --git a/debian/changelog b/debian/changelog
index 9152e90..f6bfe78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+intel-gpu-tools (1.1-0ubuntu2) precise; urgency=low
+
+ * Add 100_drmtest_exit_not_abort.patch
+ + Fix SEGV when running benchmarks as non-root.
+ (LP: #657529)
+
+ -- Bryce Harrington <br...@ubuntu.com> Tue, 24 Jan 2012 22:38:04 -0800
+
intel-gpu-tools (1.1-0ubuntu1) precise; urgency=low
* Pre-release merge of Debian's packaging of new upstream release.
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 <br...@canonical.com>
+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 <br...@canonical.com>
+---
+ 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 340ece96e431139b4a450f5b129ae1fddf105a9d
Author: Bryce Harrington <br...@canonical.com>
Date: Tue Jan 24 19:10:12 2012 -0800
Update changelog for 1.1-0ubuntu1
diff --git a/debian/changelog b/debian/changelog
index 6ef4625..9152e90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,11 @@ intel-gpu-tools (1.1-0ubuntu1) precise; urgency=low
+ Adds GPU test suite, GPU debugger, intel_backlight,
intel_disable_clock_gating, intel_gpu_abrt, intel_reg_checker,
intel_reg_snapshot, forcewaked.
- + Fixes LP: #752967 - intel_gpu_top crash in libx_start_main()
- * control: Add Conflicts with -intel<2.9.1 due to intel_reg_dumper.
- (LP: #591203)
+ + Many bug fixes (LP: #752967, #740252, #758437)
+ * control:
+ + Add dependency on xutils-dev. Fixes FTBS.
+ + Add Conflicts with -intel<2.9.1 due to intel_reg_dumper.
+ (LP: #591203)
* rules: Add gentarball target to make it easier to update to new git
snapshots when needed.
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rq6xf-0005dz...@vasks.debian.org
