Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2011-09-14 14:51:29 +0200
committerMichal Marek <mmarek@suse.cz>2011-09-14 14:51:29 +0200
commit165c304c9a1ef1d5f3875e10e1161c67b7fc720e (patch)
tree7106f4e390094651af7cf51b157a11e8d4fdfa05
parent2be41bdb019b306f294d91edc3e43343d09d0d40 (diff)
parent73541ad95fdafbb990bc8e957096c997bd427c89 (diff)
Merge branch 'scripts'
-rwxr-xr-xscripts/sequence-patch.sh16
-rwxr-xr-xscripts/series2git2
2 files changed, 12 insertions, 6 deletions
diff --git a/scripts/sequence-patch.sh b/scripts/sequence-patch.sh
index 2d70aeabbe..2bad36d0df 100755
--- a/scripts/sequence-patch.sh
+++ b/scripts/sequence-patch.sh
@@ -40,8 +40,8 @@ usage() {
cat <<END
SYNOPSIS: $0 [-qv] [--symbol=...] [--dir=...]
[--combine] [--fast] [last-patch-name] [--vanilla] [--fuzz=NUM]
- [--build-dir=PATH] [--config=ARCH-FLAVOR [--kabi]] [--ctags]
- [--cscope]
+ [--patch-dir=PATH] [--build-dir=PATH] [--config=ARCH-FLAVOR [--kabi]]
+ [--ctags] [--cscope]
The --build-dir option supports internal shell aliases, like ~, and variable
expansion when the variables are properly escaped. Environment variables
@@ -66,7 +66,7 @@ if $have_arch_patches; then
else
arch_opt=""
fi
-options=`getopt -o qvd:F: --long quilt,no-quilt,$arch_opt,symbol:,dir:,combine,fast,vanilla,fuzz,build-dir:,config:,kabi,ctags,cscope -- "$@"`
+options=`getopt -o qvd:F: --long quilt,no-quilt,$arch_opt,symbol:,dir:,combine,fast,vanilla,fuzz,patch-dir:,build-dir:,config:,kabi,ctags,cscope -- "$@"`
if [ $? -ne 0 ]
then
@@ -129,6 +129,10 @@ while true; do
fuzz="-F$2"
shift
;;
+ --patch-dir)
+ PATCH_DIR=$2
+ shift
+ ;;
--build-dir)
SP_BUILD_DIR="$2"
shift
@@ -208,7 +212,6 @@ TAG=${TAG//\//_}
if [ "$VANILLA" = "true" ]; then
TAG=${TAG}-vanilla
fi
-PATCH_DIR=$SCRATCH_AREA/linux-$SRCVERSION${TAG:+-$TAG}
PATCH_LOG=$SCRATCH_AREA/patch-$SRCVERSION${TAG:+-$TAG}.log
LAST_LOG=$SCRATCH_AREA/last-$SRCVERSION${TAG:+-$TAG}.log
@@ -260,7 +263,10 @@ fi
EXT=${EXTRA_SYMBOLS// /-}
EXT=${EXT//\//}
-PATCH_DIR=${PATCH_DIR}${EXT:+-}$EXT
+
+if test -z "$PATCH_DIR"; then
+ PATCH_DIR=$SCRATCH_AREA/linux-$SRCVERSION${TAG:+-$TAG}{$EXT:+-}$EXT
+fi
if [ -n "$SP_BUILD_DIR" ]; then
# This allows alias (~) and variable expansion
diff --git a/scripts/series2git b/scripts/series2git
index 7e8d025d5c..292a3890c8 100755
--- a/scripts/series2git
+++ b/scripts/series2git
@@ -210,7 +210,7 @@ apply_patch()
case "$patch" in
patches.kernel.org/patch-2.6.*.*-rc*)
;;
- patches.kernel.org/patch-2.6.*)
+ patches.kernel.org/patch-[23].*.*)
if $skip; then
echo "skipping $patch"
continue