Package: linux-2.6 Version: 2.6.32-23 Severity: normal Thanks, tested and confirmed working against svn sid (686), and svn lenny (amd64) and applies cleanly to both.
Tested-By: t...@seoss.co.uk Would you like me to check upstream OpenVZ, and open a bug in their tracker if relevant? BTW, I fixed up the test-patches script so that it works for patches like the one you supplied (i.e. patches which need to be applied only when a particular featureset is being built). HTH. Cheers, Tim. Index: debian/bin/test-patches =================================================================== --- debian/bin/test-patches (revision 16455) +++ debian/bin/test-patches (working copy) @@ -19,12 +19,15 @@ featureset=none fi -eval "set -- $(getopt -n "$0" -- "f:j:s:" "$@")" +restrictfeature= + +eval "set -- $(getopt -n "$0" -- "f:j:s:r:" "$@")" while true; do case "$1" in -f) flavour="$2"; shift 2 ;; -j) export DEBIAN_KERNEL_JOBS="$2"; shift 2 ;; -s) featureset="$2"; shift 2 ;; + -r) restrictfeature=" featureset=$2"; shift 2 ;; --) shift 1; break ;; esac done @@ -36,6 +39,8 @@ -f <flavour> specify the 'flavour' of kernel to build, e.g. 686 -j <jobs> specify number of compiler jobs to run in parallel -s <featureset> specify an optional featureset to apply, e.g. xen + -r <featureset> specify that the patch should only apply to a given + featureset EOF exit 2 fi @@ -56,6 +61,15 @@ fi debversion="${version##*-}" +echo X $debversion + +if [ "$restrictfeature" != "" ]; then +# debversion="${debversion%a~test}-extraa~test" + debversion="${debversion}-extra" +fi + +echo XX $debversion + # Copy all patches into a new directory rm -rf debian/patches/test/ mkdir debian/patches/test @@ -64,7 +78,8 @@ # Generate patch series for the new version >debian/patches/series/"$debversion" for patch in "$@"; do - echo "+ test/$(basename "$patch")" >>debian/patches/series/"$debversion" + echo echo "+ test/$(basename "$patch")${restrictfeature}" TO debian/patches/series/"$debversion" + echo "+ test/$(basename "$patch")${restrictfeature}" >>debian/patches/series/"$debversion" done # Regenerate control and included rules -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20101018183359.17419.18014.report...@ermintrude.seoss.co.uk