summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 14350e8)
raw | patch | inline | side by side (parent: 14350e8)
author | Jason Kridner <jdk@ti.com> | |
Fri, 16 Sep 2011 15:02:10 +0000 (11:02 -0400) | ||
committer | Jason Kridner <jdk@ti.com> | |
Fri, 16 Sep 2011 22:06:12 +0000 (18:06 -0400) |
Set to stop on errors to avoid continuing to mess up the tree.
Adjusted tags to include the major tag first, ie. v3.0.4-sgx, rather
than sgx-3.0.
Signed-off-by: Jason Kridner <jdk@ti.com>
Cc: Koen Kooi <koen@dominion.thruhere.net>
Adjusted tags to include the major tag first, ie. v3.0.4-sgx, rather
than sgx-3.0.
Signed-off-by: Jason Kridner <jdk@ti.com>
Cc: Koen Kooi <koen@dominion.thruhere.net>
recipes-kernel/linux/linux-3.0/patch.sh | patch | blob | history |
index d4065fec770587573a19473b6ce8a44dd1b335cc..3e5324e703e2d5a4eae1bdf585c5c8d6e56ed58d 100755 (executable)
# (c) 2009 - 2011 Koen Kooi <koen@dominion.thruhere.net>
# This script will take a set of directories with patches and make a git tree out of it
# After all the patches are applied it will output a SRC_URI fragment you can copy/paste into a recipe
+set -e
TAG="v3.0.4"
-EXTRATAG="-3.0"
+EXTRATAG=""
PATCHPATH=$(dirname $0)
-git am --abort
+git am --abort || echo "Do you need to make sure the patches apply cleanly first?"
git reset --hard ${TAG}
rm export -rf
# apply patches
for patchset in ${PATCHSET} ; do
- git am $PATCHPATH/$patchset/* && git tag "${patchset}${EXTRATAG}" -f
+ git am $PATCHPATH/$patchset/*
+ git tag "${TAG}-${patchset}${EXTRATAG}" -f
done
# export patches and output SRC_URI for them
for patchset in ${PATCHSET} ; do
mkdir export/$patchset -p
- ( cd export/$patchset && git format-patch ${previous}..${patchset}${EXTRATAG} >& /dev/null && for i in *.patch ; do echo " file://${patchset}/$i \\" ; done )
- previous=${patchset}${EXTRATAG}
+ ( cd export/$patchset && git format-patch ${previous}..${TAG}-${patchset}${EXTRATAG} >& /dev/null && for i in *.patch ; do echo " file://${patchset}/$i \\" ; done )
+ previous=${TAG}-${patchset}${EXTRATAG}
done