mirror of
https://github.com/SCST-project/scst.git
synced 2026-05-14 09:11:27 +00:00
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
This commit is contained in:
@@ -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 @@
|
||||
+
|
||||
|
||||
Reference in New Issue
Block a user