Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-06-11 20:14:25 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-11 20:14:25 -0700
commit774ea79a234a517aabf6021d6d086e617fcd8cec (patch)
tree84869681ff936fb212bb2172176165e5402afd5f
parent1b1ebc88a6b26bfe09a71d832b2789398a575973 (diff)
- scripts/sequence-patch.sh: fix bug in ketchup usage
-rw-r--r--kernel-source.changes5
-rwxr-xr-xscripts/sequence-patch.sh19
2 files changed, 14 insertions, 10 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index 4e6f2a53e2..0854b292fc 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Fri Jun 12 05:14:11 CEST 2009 - greg@suse.de
+
+- scripts/sequence-patch.sh: fix bug in ketchup usage
+
+-------------------------------------------------------------------
Wed Jun 10 16:12:01 CEST 2009 - jeffm@suse.com
- Update to 2.6.30-final.
diff --git a/scripts/sequence-patch.sh b/scripts/sequence-patch.sh
index 0b1d8d8082..b7039760db 100755
--- a/scripts/sequence-patch.sh
+++ b/scripts/sequence-patch.sh
@@ -125,16 +125,15 @@ if [ ! -d $ORIG_DIR ]; then
fi
done
if [ -z "$LINUX_ORIG_TARBALL" ]; then
- if type ketchup 2>/dev/null; then
- cd $SCRATCH_AREA && \
- rm -rf linux-$SRCVERSION && \
- mkdir linux-$SRCVERSION && \
- cd linux-$SRCVERSION && \
- ketchup $SRCVERSION && \
- cd $SCRATCH_AREA && \
- mv linux-$SRCVERSION linux-$SRCVERSION.orig
- fi
- if [ -z "$LINUX_ORIG_TARBALL" ]; then
+ echo Source version is $SRCVERSION. Original tarball not found,
+ echo trying ketchup.
+ (
+ cd $SCRATCH_AREA
+ mkdir linux-$SRCVERSION.orig
+ cd linux-$SRCVERSION.orig
+ ketchup $SRCVERSION
+ )
+ if [ ! -d $ORIG_DIR ]; then
echo "Kernel source archive \`linux-$SRCVERSION.tar.gz' not found," >&2
echo "alternatively you can put an unpatched kernel tree to" >&2
echo "$ORIG_DIR." >&2