[kernel] r16458 - in dists/sid/linux-2.6/debian: . bin

[Ben Hutchings]

Author: benh
Date: Tue Oct 19 02:19:51 2010
New Revision: 16458

Log:
debian/bin/test-patches: Restrict patches to featureset when building with a featureset (thanks to Tim Small)

Modified:
   dists/sid/linux-2.6/debian/bin/test-patches
   dists/sid/linux-2.6/debian/changelog

Modified: dists/sid/linux-2.6/debian/bin/test-patches
==============================================================================
--- dists/sid/linux-2.6/debian/bin/test-patches	Tue Oct 19 01:59:00 2010	(r16457)
+++ dists/sid/linux-2.6/debian/bin/test-patches	Tue Oct 19 02:19:51 2010	(r16458)
@@ -19,12 +19,14 @@
     featureset=none
 fi
 
+restrictfeature=
+
 eval "set -- $(getopt -n "$0" -- "f:j:s:" "$@")"
 while true; do
     case "$1" in
 	-f) flavour="$2"; shift 2 ;;
 	-j) export DEBIAN_KERNEL_JOBS="$2"; shift 2 ;;
-	-s) featureset="$2"; shift 2 ;;
+	-s) featureset="$2"; restrictfeature=" featureset=$2"; shift 2 ;;
 	--) shift 1; break ;;
     esac
 done
@@ -54,7 +56,11 @@
     version="$version"a~test
     dch -v "$version" --distribution UNRELEASED "Testing patches $*"
 fi
-debversion="${version##*-}"
+series="${version##*-}"
+
+if [ "$restrictfeature" != "" ]; then
+    series="${series}-extra"
+fi
 
 # Copy all patches into a new directory
 rm -rf debian/patches/test/
@@ -62,9 +68,9 @@
 cp -t debian/patches/test/ "$@"
 
 # Generate patch series for the new version
->debian/patches/series/"$debversion"
+>debian/patches/series/"$series"
 for patch in "$@"; do
-    echo "+ test/$(basename "$patch")" >>debian/patches/series/"$debversion"
+    echo "+ test/$(basename "$patch")${restrictfeature}" >>debian/patches/series/"$series"
 done
 
 # Regenerate control and included rules

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Tue Oct 19 01:59:00 2010	(r16457)
+++ dists/sid/linux-2.6/debian/changelog	Tue Oct 19 02:19:51 2010	(r16458)
@@ -19,6 +19,8 @@
   * debian/.../patches.py: Open files as needed, rather than all at once
     (Closes: #600423)
   * [openvz] printk: Handle global log buffer reallocation (Closes: #600299)
+  * debian/bin/test-patches: Restrict patches to featureset when building
+    with a featureset (thanks to Tim Small)
 
   [ dann frazier ]
   * Force enable DMA on MBP w/ MCP 7,1