[rt] genpatch.py: Fix parsing of upstream patches with no header
svn path=/dists/sid/linux/; revision=20451
This commit is contained in:
parent
4cef35b5d8
commit
7666bbcb16
|
@ -79,6 +79,7 @@ linux (3.10.5-1) UNRELEASED; urgency=low
|
||||||
(Closes: #718505)
|
(Closes: #718505)
|
||||||
* [rt] genpatch.py: Accept missing series-rt
|
* [rt] genpatch.py: Accept missing series-rt
|
||||||
* [rt] Update to 3.10.4-rt1 and reenable
|
* [rt] Update to 3.10.4-rt1 and reenable
|
||||||
|
* [rt] genpatch.py: Fix parsing of upstream patches with no header
|
||||||
|
|
||||||
-- Ben Hutchings <ben@decadent.org.uk> Tue, 30 Jul 2013 18:09:20 +0200
|
-- Ben Hutchings <ben@decadent.org.uk> Tue, 30 Jul 2013 18:09:20 +0200
|
||||||
|
|
||||||
|
|
|
@ -33,8 +33,10 @@ def main(source_dir, version):
|
||||||
with open(path, 'w') as patch:
|
with open(path, 'w') as patch:
|
||||||
in_header = True
|
in_header = True
|
||||||
for line in source_patch:
|
for line in source_patch:
|
||||||
if in_header and line == '\n':
|
if in_header and re.match(r'^(\n|[^\w\s]|Index:)', line):
|
||||||
patch.write('Origin: %s\n' % origin)
|
patch.write('Origin: %s\n' % origin)
|
||||||
|
if line != '\n':
|
||||||
|
patch.write('\n')
|
||||||
in_header = False
|
in_header = False
|
||||||
patch.write(line)
|
patch.write(line)
|
||||||
series_fh.write(name)
|
series_fh.write(name)
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/3.10/patches-3.10.4-rt1.tar.xz
|
||||||
|
|
||||||
---
|
---
|
||||||
init/Kconfig | 1 +
|
init/Kconfig | 1 +
|
||||||
mm/slab.h | 2 +-
|
mm/slab.h | 2 +-
|
||||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||||
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/3.10/patches-3.10.4-rt1.tar.xz
|
|
||||||
|
|
||||||
Index: linux-stable/init/Kconfig
|
Index: linux-stable/init/Kconfig
|
||||||
===================================================================
|
===================================================================
|
||||||
|
|
Loading…
Reference in New Issue