From e4e8947c8d6687badfea0232e8a8e340c40c9bc1 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 16 Oct 2010 14:39:52 +0000 Subject: [PATCH] ibmvstgt: Generate clean patches, even if the input contains #ifdefs on LINUX_VERSION_CODE. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2415 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- ibmvstgt/generate-in-tree-patches | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/ibmvstgt/generate-in-tree-patches b/ibmvstgt/generate-in-tree-patches index 873c869b0..56908c3f1 100755 --- a/ibmvstgt/generate-in-tree-patches +++ b/ibmvstgt/generate-in-tree-patches @@ -1,5 +1,16 @@ #!/bin/bash +function file_to_patch { + echo "--- $1 " + echo "+++ $1 " + echo "@@ -1,0 +1,$(wc --lines $1) @@" + sed 's/^/+/' "$1" +} + +function patch_to_file { + tail -n +4 | sed 's/^.//' +} + kernel_version="$1" if [ "$1" = "" ]; then @@ -27,6 +38,10 @@ do fi f3="in-tree-patches/${kernel_version}/$g.patch" if [ "$f1" -nt "$f3" -o "$f2" -nt "$f3" ]; then - diff -up "$f1" "$f2" > "$f3" + file_to_patch "$f2" | \ + ../scripts/specialize-patch -v kernel_version="$1" \ + -v generating_upstream_patch_defined=1 | \ + patch_to_file | \ + diff -up "$f1" - > "$f3" fi done