debian/apport-gpu-error-intel.py | 138 ---------------------------------------
debian/changelog | 7 +
debian/control | 5 -
debian/rules | 2
4 files changed, 7 insertions(+), 145 deletions(-)
New commits:
commit 7eda07c4dea6e6f2ae6e6892bf6f77af0834f231
Author: Bryce Harrington <br...@bryceharrington.org>
Date: Wed May 18 05:34:54 2011 +0200
* debian/apport-gpu-error-intel.py, debian/control, debian/rules:
- Migrate apport hook out of video driver, to xdiagnose
diff --git a/debian/apport-gpu-error-intel.py b/debian/apport-gpu-error-intel.py
deleted file mode 100644
index 9cd9fee..0000000
--- a/debian/apport-gpu-error-intel.py
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/usr/bin/python
-
-import os
-import os.path
-import sys
-import re
-
-from apport.hookutils import *
-
-from apport import unicode_gettext as _
-
-pci_devices = [
- { 'name':'i810', 're':'(8086:7121)', 'supported':False },
- { 'name':'i810dc', 're':'(8086:7123)', 'supported':False },
- { 'name':'i810e', 're':'(8086:7125)', 'supported':False },
- { 'name':'i815', 're':'(8086:1132|82815)', 'supported':False },
- { 'name':'i830', 're':'(8086:3577|82830)', 'supported':False },
- { 'name':'i845', 're':'(8086:2562|82845G)', 'supported':False },
- { 'name':'i855', 're':'(8086:3582|855GM)', 'supported':False },
- { 'name':'i865', 're':'(8086:2572|82865G)', 'supported':False },
- { 'name':'i915g', 're':'(8086:2582)' },
- { 'name':'i915gm', 're':'(8086:2592|915GM)' },
- { 'name':'e7221', 're':'(8086:258a)', 'supported':False },
- { 'name':'i945g', 're':'(8086:2772|945G[ \/]|82945G[ \/])' },
- { 'name':'i945gm', 're':'(8086:27a2|945GM[ \/]|82945GM[ \/])' },
- { 'name':'i945gme', 're':'(8086:27ae|945GME|82945GME)' },
- { 'name':'IGDg', 're':'(8086:a001)' },
- { 'name':'IGDgm', 're':'(8086:a011)' },
- { 'name':'pineviewg', 're':'(8086:a001)' },
- { 'name':'pineviewgm', 're':'(8086:a011)' },
- { 'name':'i946gz', 're':'(8086:2972|82946GZ)' },
- { 'name':'g35', 're':'(8086:2982|82G35)' },
- { 'name':'i965q', 're':'(8086:2992|Q965)' },
- { 'name':'i965g', 're':'(8086:29a2|G965)' },
- { 'name':'g33', 're':'(8086:29c2|82G33)' },
- { 'name':'q35', 're':'(8086:29b2)' },
- { 'name':'q33', 're':'(8086:29d2)' },
- { 'name':'i965gm', 're':'(8086:2a02|GM965)' },
- { 'name':'i965gme', 're':'(8086:2a12)' },
- { 'name':'gm45', 're':'(8086:2a42)' },
- { 'name':'IGDeg', 're':'(8086:2e02)' },
- { 'name':'q45', 're':'(8086:2e12)' },
- { 'name':'g45', 're':'(8086:2e22)' },
- { 'name':'g41', 're':'(8086:2e32)' },
- { 'name':'b43', 're':'(8086:2e42)' },
- { 'name':'clarkdale', 're':'(8086:0042)' },
- { 'name':'arrandale', 're':'(8086:0046)' },
- { 'name':'sandybridge-gt1', 're':'(8086:0102)' },
- { 'name':'sandybridge-m-gt1', 're':'(8086:0106)' },
- { 'name':'sandybridge-s', 're':'(8086:010a)' },
- { 'name':'sandybridge-gt2', 're':'(8086:0112)' },
- { 'name':'sandybridge-m-gt2', 're':'(8086:0116)' },
- { 'name':'sandybridge-gt2+', 're':'(8086:0122)' },
- { 'name':'sandybridge-m-gt2+','re':'(8086:0126)' },
- ]
-for device in pci_devices:
- device['rc'] = re.compile(device['re'], re.IGNORECASE)
-
-def get_pci_device(text):
- regex_vga = re.compile('VGA compatible controller (.*)', re.IGNORECASE)
-
- lines = regex_vga.findall(text)
- if len(lines) > 0:
- for l in lines:
- if len(l.strip())>0:
- for device in pci_devices:
- if device['rc'].search(l.strip()):
- return device
- return None
-
-def get_dump_signature(text):
- if not text:
- return None
- codes = []
- for k in ["EIR", "ESR", "PGTBL_ER", "IPEHR"]:
- regex = re.compile(k+": 0x([0-9a-fA-F]+)")
- match = regex.search(text)
- if match and match.group(1) != "00000000":
- codes.append("%s: 0x%s" %(k, match.group(1)))
- if len(codes) > 0:
- return "(%s)" %( string.join(codes, " ") )
- else:
- return ""
-
-def main(argv=None):
- if argv is None:
- argv = sys.argv
-
- from apport.packaging_impl import impl as packaging
- if not packaging.enabled():
- return -1
-
- import apport.report
- report = apport.report.Report(type='Crash')
- report.setdefault('Tags', '')
- report.setdefault('Title', 'GPU lockup')
-
- report.add_os_info()
- report.add_proc_info()
- report.add_user_info()
-
- report['Package'] = 'xserver-xorg-video-intel'
- report['Tags'] += ' freeze'
- report['Lspci'] = command_output(['lspci', '-vvnn'])
- device = get_pci_device(report['Lspci'])
- if device and 'name' in device:
- if 'supported' in device and device['supported'] == False:
- # Unsupported chipset; we don't want bugs reported for this HW
- return -1
- report['Chipset'] = device['name']
- report['Title'] = "[%s] GPU lockup" %(device['name'])
- report['IntelGpuDump'] = root_command_output(['intel_gpu_dump'])
- dump_signature = get_dump_signature(report['IntelGpuDump'])
- if dump_signature:
- report['Title'] += " " + dump_signature
- # TODO: For oneiric set DuplicateSignature to Title
- report['DuplicateSignature'] = dump_signature
-
- attach_hardware(report)
- attach_related_packages(report, ["xserver-xorg", "libdrm2",
"xserver-xorg-video-intel"])
- attach_file_if_exists(report, '/etc/X11/xorg.conf', 'XorgConf')
- attach_file(report, '/var/log/Xorg.0.log', 'XorgLog')
- attach_file_if_exists(report, '/var/log/Xorg.0.log.old', 'XorgLogOld')
- attach_file_if_exists(report, '/sys/kernel/debug/dri/0/i915_error_state',
'i915_error_state')
-
- nowtime = datetime.datetime.now()
- report_filename = '/var/crash/%s.%s.crash' % (report['Package'],
str(nowtime).replace(' ', '_'))
- report_file = os.fdopen(os.open(report_filename,
os.O_WRONLY|os.O_CREAT|os.O_EXCL), 'w')
- os.chmod(report_filename, 0600)
-
- try:
- report.write(report_file)
- finally:
- report_file.close()
- return 0
-
-if __name__ == '__main__':
- sys.exit(main())
diff --git a/debian/changelog b/debian/changelog
index 9c81a8a..65b88dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.14.0-4ubuntu9) oneiric; urgency=low
+
+ * debian/apport-gpu-error-intel.py, debian/control, debian/rules:
+ - Migrate apport hook out of video driver, to xdiagnose
+
+ -- Bryce Harrington <br...@ubuntu.com> Wed, 18 May 2011 05:33:38 +0200
+
xserver-xorg-video-intel (2:2.14.0-4ubuntu8) oneiric; urgency=low
* Add 120_check_privates.patch: Check for null privates pointer
diff --git a/debian/control b/debian/control
index 2d6ddf7..9bc72bf 100644
--- a/debian/control
+++ b/debian/control
@@ -46,11 +46,6 @@ Depends:
${shlibs:Depends},
${misc:Depends},
${xviddriver:Depends},
-Recommends:
- intel-gpu-tools,
- apport,
- intel-gpu-tools,
- python,
Provides:
${xviddriver:Provides}
Description: X.Org X server -- Intel i8xx, i9xx display driver
diff --git a/debian/rules b/debian/rules
index e380cfb..d83fbc1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,6 @@
# Install in debian/tmp to retain control through dh_install:
override_dh_auto_install:
dh_auto_install --destdir=debian/tmp
- install -d $(CURDIR)/debian/tmp/usr/share/apport
- install -m 755 debian/apport-gpu-error-intel.py
$(CURDIR)/debian/tmp/usr/share/apport
# Kill *.la files, and forget no-one:
override_dh_install:
--
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/e1qmm71-0002mg...@alioth.debian.org
