From c7e1baf19973a23bb15ad653aef74c0ebc024bf5 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 3 Jun 2012 22:20:59 +0000 Subject: [PATCH] test-patches: Recognise the rt featureset automatically Also update the example featureset and flavour names. svn path=/dists/sid/linux/; revision=19074 --- debian/bin/test-patches | 6 +++--- debian/changelog | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/bin/test-patches b/debian/bin/test-patches index ae3d7ebb7..b687089f0 100755 --- a/debian/bin/test-patches +++ b/debian/bin/test-patches @@ -8,7 +8,7 @@ arch="$(dpkg --print-architecture)" kernelabi="$(uname -r)" ff="${kernelabi#+([^-])-@(trunk|+([0-9]))-}" if [ "x$ff" != "x$kernelabi" ]; then - flavour="${ff#@(openvz|vserver|xen)-}" + flavour="${ff#@(openvz|rt|vserver|xen)-}" if [ "x$flavour" != "x$ff" ]; then featureset="${ff%-$flavour}" else @@ -33,9 +33,9 @@ if [ $# -lt 1 ]; then echo >&2 "Usage: $0 [] ..." cat >&2 < specify the 'flavour' of kernel to build, e.g. 686 + -f specify the 'flavour' of kernel to build, e.g. 686-pae -j specify number of compiler jobs to run in parallel - -s specify an optional featureset to apply, e.g. xen + -s specify an optional featureset to apply, e.g. rt EOF exit 2 fi diff --git a/debian/changelog b/debian/changelog index 389cf6d43..92680c651 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ linux (3.2.19-2) UNRELEASED; urgency=low * README.source: Update description of patch system to match current usage * linux-patch-debian: Remove; it is no longer necessary for GPL compliance and does not work with our current patch management + * test-patches: Recognise the rt featureset automatically -- Ben Hutchings Sat, 02 Jun 2012 20:31:53 +0100