No subject

Timo Aaltonen tjaalton at cc.hut.fi
Wed Jan 16 10:29:15 GMT 2008


please include the attached diff for the next l-r-m release, includes 
these changes:

linux-restricted-modules-2.6.24 (2.6.24.4-4.12) hardy; urgency=low

   [ Johan Kiviniemi ]
   * nvidia_supported: New version to support the latest NVIDIA
     release. (LP: #182237)

   [ Timo Aaltonen ]
   * control.stub.in: Add fglrx-amdcccle dummy package for easy transition
     from ATI provided packages.


t
-------------- next part --------------
diff -u linux-restricted-modules-2.6.24-2.6.24.4/debian/control linux-restricted-modules-2.6.24-2.6.24.4/debian/control
--- linux-restricted-modules-2.6.24-2.6.24.4/debian/control
+++ linux-restricted-modules-2.6.24-2.6.24.4/debian/control
@@ -236,6 +236,12 @@
  .
  This package provides the control panel compiled for Qt3.
 
+Package: fglrx-amdcccle
+Architecture: i386 amd64
+Depends: fglrx-control
+Description: control panel for the non-free AMD/ATI r5xx, r6xx display driver
+ This is a dummy package for easy transition with ATI's packages.
+
 # Package: avm-fritz-kernel-source
 # Architecture: amd64 i386
 # Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0)
diff -u linux-restricted-modules-2.6.24-2.6.24.4/debian/changelog linux-restricted-modules-2.6.24-2.6.24.4/debian/changelog
--- linux-restricted-modules-2.6.24-2.6.24.4/debian/changelog
+++ linux-restricted-modules-2.6.24-2.6.24.4/debian/changelog
@@ -1,3 +1,15 @@
+linux-restricted-modules-2.6.24 (2.6.24.4-4.12) hardy; urgency=low
+
+  [ Johan Kiviniemi ]
+  * nvidia_supported: New version to support the latest NVIDIA
+    release. (LP: #182237)
+
+  [ Timo Aaltonen ]
+  * control.stub.in: Add fglrx-amdcccle dummy package for easy transition
+    from ATI provided packages.
+
+ -- Timo Aaltonen <tepsipakki at ubuntu.com>  Wed, 16 Jan 2008 12:14:23 +0200
+
 linux-restricted-modules-2.6.24 (2.6.24.4-4.11) hardy; urgency=low
 
   * Kernel ABI bump to -4
diff -u linux-restricted-modules-2.6.24-2.6.24.4/debian/control.stub.in linux-restricted-modules-2.6.24-2.6.24.4/debian/control.stub.in
--- linux-restricted-modules-2.6.24-2.6.24.4/debian/control.stub.in
+++ linux-restricted-modules-2.6.24-2.6.24.4/debian/control.stub.in
@@ -235,6 +235,12 @@
  .
  This package provides the control panel compiled for Qt3.
 
+Package: fglrx-amdcccle
+Architecture: i386 amd64
+Depends: fglrx-control
+Description: control panel for the non-free AMD/ATI r5xx, r6xx display driver
+ This is a dummy package for easy transition with ATI's packages.
+
 # Package: avm-fritz-kernel-source
 # Architecture: amd64 i386
 # Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0)
diff -u linux-restricted-modules-2.6.24-2.6.24.4/debian/control.stub linux-restricted-modules-2.6.24-2.6.24.4/debian/control.stub
--- linux-restricted-modules-2.6.24-2.6.24.4/debian/control.stub
+++ linux-restricted-modules-2.6.24-2.6.24.4/debian/control.stub
@@ -236,6 +236,12 @@
  .
  This package provides the control panel compiled for Qt3.
 
+Package: fglrx-amdcccle
+Architecture: i386 amd64
+Depends: fglrx-control
+Description: control panel for the non-free AMD/ATI r5xx, r6xx display driver
+ This is a dummy package for easy transition with ATI's packages.
+
 # Package: avm-fritz-kernel-source
 # Architecture: amd64 i386
 # Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0)
diff -u linux-restricted-modules-2.6.24-2.6.24.4/nvidia/nvidia_supported linux-restricted-modules-2.6.24-2.6.24.4/nvidia/nvidia_supported
--- linux-restricted-modules-2.6.24-2.6.24.4/nvidia/nvidia_supported
+++ linux-restricted-modules-2.6.24-2.6.24.4/nvidia/nvidia_supported
@@ -13,48 +13,68 @@
-    echo "USAGE: $0 path/to/nv/nv-kernel.o nvidia \\" >&2
-    echo "           path/to/nv-legacy/nv-kernel.o nvidia_legacy [...]" >&2
-    exit 1
+  echo "USAGE: $0 path/to/nv/nv-kernel.o nvidia \\" >&2
+  echo "    path/to/nv-legacy/nv-kernel.o nvidia_legacy [...]" >&2
+  exit 1
 }
 
 echo "# Listing generated by nvidia_supported. Do not edit manually."
 
 device_ids() {
-	local filename="$1"
+  local filename="$1"
 
-	# Find the first symbol of the .rodata section...
-	objdump --section=.rodata --syms "$filename" |
-	sed -n '/SYMBOL TABLE/,+2 {
-	  s/^\([0-9a-f]\+\)\s\+l\s\+O\s\+\S\+\s\+\([0-9a-f]\+\)\s\+\(\S\+\).*/\1 \2 \3/p
-	}' |
-	while read start length symname; do
-		# ...and grab the IDs from its hex dump.
-		objdump --section=.rodata --full-contents \
-		  --start-address="0x$start" \
-		  --stop-address="$((0x$start+0x$length))" "$filename" |
-		sed -n 's/^ [0-9a-f]\+ \([0-9a-f]\{2\}\)\([0-9a-f]\{2\}\).*/\2\1/p' |
-		sort | uniq
-	done
+  local list_prev="$(mktemp)"
+  local list_cur="$(mktemp)"
+
+  # Find the symbols of the .rodata section...
+  objdump --section=.rodata --syms "$filename" |
+  sed -nr '/SYMBOL TABLE/,/^$/ {
+    s/^([0-9a-f]+)\s+l\s+O\s+\S+\s+([0-9a-f]+)\s+\S+.*/\1 \2/p
+  }' |
+  while read start length; do
+    objdump --section=.rodata --full-contents \
+      --start-address="0x$start" \
+      --stop-address="$((0x$start+0x$length))" "$filename" |
+    sed -nr 's/^ [0-9a-f]+ ([0-9a-f]{2})([0-9a-f]{2}).*/\2\1/p' |
+    sort | uniq | grep -vx "0000" >"$list_cur"
+
+    # The consistent thing between different releases has been that there are
+    # two subsequent symbols with the same PCI ID list near the beginning. Find
+    # them.
+    if [ -s "$list_prev" -a -s "$list_cur" ] &&
+       cmp -s "$list_prev" "$list_cur"; then
+      cat "$list_cur"
+      break
+    fi
+
+    cp "$list_cur" "$list_prev"
+  done
+
+  rm -f "$list_prev" "$list_cur"
 }
 
 seen_ids=' '
 
 while [ -n "$1" ]; do
-	filename="$1"; shift
-	modname="$1";  shift
+  filename="$1"; shift
+  modname="$1";  shift
 
-	orig_ids="$(device_ids "$filename")"
-
-	for id in $orig_ids; do
-		case "$seen_ids" in
-		*" $id "*)
-			# Already seen the ID.
-			;;
-		*)
-			# Not seen it yet.
-			seen_ids="${seen_ids}${id} "
-
-			printf "alias pci:v%08Xd%08Xsv*sd*bc03sc*i* %s\n" \
-			  0x10de "0x$id" "$modname"
-			;;
-		esac
-	done
+  orig_ids="$(device_ids "$filename")"
+  if [ -z "$orig_ids" ]; then
+    echo "WARNING: No IDs were found from $filename" >&2
+  fi
+
+  for id in $orig_ids; do
+    case "$seen_ids" in
+      *" $id "*)
+        # Already seen the ID.
+        ;;
+      *)
+        # Not seen it yet.
+        seen_ids="${seen_ids}${id} "
+
+        printf "alias pci:v%08Xd%08Xsv*sd*bc03sc*i* %s\n" \
+          0x10de "0x$id" "$modname"
+        ;;
+    esac
+  done
 done | sort
+
+# vim:set et sw=2 sts=2:


More information about the kernel-team mailing list