From 2d5f13701e053064765005e77fe66fdaa7bae0cb Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 22 Jul 2012 22:13:12 +0000 Subject: [PATCH] [rt] linux-source: Include -rt version suffix There is no good reason to drop the patches adding the -rt version suffix; we will override them in official packages but the suffix is likely to be desirable in custom packages. svn path=/dists/sid/linux/; revision=19281 --- debian/changelog | 1 + debian/patches/features/all/rt/check-series | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7a5e380bb..68859cb88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,7 @@ linux (3.2.23-1) UNRELEASED; urgency=low * fs: Remove easily user-triggerable BUG from generic_setlease * tcp: drop SYN+FIN messages * fifo: Do not restart open() if it already found a partner (Closes: #678852) + * [rt] linux-source: Include -rt version suffix [ Arnaud Patard ] * [mipsel] add r8169 to d-i udeb. diff --git a/debian/patches/features/all/rt/check-series b/debian/patches/features/all/rt/check-series index edfb05958..6e5a1e0d1 100755 --- a/debian/patches/features/all/rt/check-series +++ b/debian/patches/features/all/rt/check-series @@ -5,9 +5,8 @@ rt_series="$(mktemp)" trap 'rm "$rt_series"' INT QUIT EXIT -# Remove comments and empty lines. Drop localversion patch as uname version -# shouldn't be touched. Reformat to match series format. -sed -r -e 's/ *#.*//; /^$/d; /^....-(localversion\.patch|Linux-.*-REBASE)\.patch$/d; s,.*,features/all/rt/&,' "debian/patches/features/all/rt/series" > "$rt_series" +# Remove comments and empty lines. Reformat to match series format. +sed -r -e 's/ *#.*//; /^$/d; s,.*,features/all/rt/&,' "debian/patches/features/all/rt/series" > "$rt_series" # removed lines are OK if the rt patch contains fixes that are applied on # featureset=none kernels, too.