From 2e86cc70aa5002ef972dd2882fe9aa26fb5f6f7b Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 4 Nov 2018 04:28:11 +0000
Subject: [PATCH] Merge r7441 from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7694 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scripts/generate-kernel-patch | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch
index c3221eaf0..2ff3ca1e3 100755
--- a/scripts/generate-kernel-patch
+++ b/scripts/generate-kernel-patch
@@ -48,8 +48,8 @@ function add_patch {
     exit 1
   fi
 
-  sed -e "s:^--- [^ ]*:--- orig/linux-${kver}/$2:" \
-      -e "s:^+++ [^ ]*:+++ linux-${kver}/$2:"      \
+  sed -e "s:^--- [^ ]*:--- linux-${kver}/$2:" \
+      -e "s:^+++ [^ ]*:+++ linux-${kver}/$2:" \
       < "$1"
 }
 
@@ -70,8 +70,8 @@ function add_file {
   # -- skip *.mod.c.
   if [ "$1" = "${1%.mod.c}" ] && [ "$1" ]; then
     cat <<EOF
-diff -uprN orig/linux-${kver}/$2 linux-${kver}/$2
---- orig/linux-${kver}/$2
+diff -uprN linux-${kver}/$2 linux-${kver}/$2
+--- linux-${kver}/$2
 +++ linux-${kver}/$2
 @@ -0,0 +1,$(wc -l "$1" | { read -r a b; echo "$a"; echo "$b" >/dev/null; }) @@
 EOF
@@ -94,8 +94,8 @@ EOF
 
 function add_empty_file {
   cat <<EOF
-diff -uprN orig/linux-${kver}/$1 linux-${kver}/$1
---- orig/linux-${kver}/$1
+diff -uprN linux-${kver}/$1 linux-${kver}/$1
+--- linux-${kver}/$1
 +++ linux-${kver}/$1
 @@ -0,0 +1,1 @@
 +