[kernel] r14327 - in dists/trunk/linux-2.6/debian: . templates/image.plain.bug

[Ben Hutchings]

Author: benh
Date: Sun Oct  4 18:49:10 2009
New Revision: 14327

Log:
Include model information in bug reports

Added:
   dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-model
Modified:
   dists/trunk/linux-2.6/debian/changelog

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Oct  4 18:29:12 2009	(r14326)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Oct  4 18:49:10 2009	(r14327)
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.31-1~experimental.2) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * Include model information in bug reports
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sun, 04 Oct 2009 19:48:35 +0100
+
 linux-2.6 (2.6.31-1~experimental.1) experimental; urgency=low
 
   * New upstream release.

Added: dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-model
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-model	Sun Oct  4 18:49:10 2009	(r14327)
@@ -0,0 +1,52 @@
+grep_model() {
+  case "$(uname -m)" in
+  alpha)
+    egrep '^(system (type|variation|revision)|platform string)\b' /proc/cpuinfo
+    ;;
+  arm)
+    egrep '^(Processor|Hardware|Revision)\b' /proc/cpuinfo
+    ;;
+  i386|ia64|x86_64)
+    local found=
+    for name in {sys,product,chassis,bios,board}_{vendor,name,version}; do
+      if [ -f /sys/class/dmi/id/$name ]; then
+	echo -n "$name: "
+	cat /sys/class/dmi/id/$name
+	found=y
+      fi
+    done
+    test -n "$found"
+    ;;
+  mips|mips64)
+    egrep '^(system type|cpu model)\b' /proc/cpuinfo
+    ;;
+  parisc|parisc64)
+    egrep '^(model|[hs]version)\b' /proc/cpuinfo
+    ;;
+  ppc|ppc64)
+    egrep -i '^(board|machine|model|motherboard|platform|revision|vendor)\b' /proc/cpuinfo
+    ;;
+  s390|s390x)
+    egrep '^processor\b' /proc/cpuinfo
+    ;;
+  sparc|sparc64)
+    egrep '^(cpu|fpu|pmu|prom|type)\b' /proc/cpuinfo
+    ;;
+  *)
+    false
+    ;;
+  esac
+}
+
+add_model() {
+  local found=
+  echo '** Model information' >&3
+  grep_model >&3 2>/dev/null || echo "not available" >&3
+  echo >&3
+}
+
+ask_model() {
+  # This is still valid as long as the bug is being reported on the same
+  # system.
+  add_model
+}