From: Jan-Benedict G. <jb...@us...> - 2007-07-07 17:08:03
|
Update of /cvsroot/linux-vax/toolchain/scripts In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12926 Modified Files: generate_and_apply_upstream_patches.sh Log Message: * Should work with POSIX sh. * Also ignore .git/ . Index: generate_and_apply_upstream_patches.sh =================================================================== RCS file: /cvsroot/linux-vax/toolchain/scripts/generate_and_apply_upstream_patches.sh,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- generate_and_apply_upstream_patches.sh 28 Dec 2005 18:27:44 -0000 1.7 +++ generate_and_apply_upstream_patches.sh 7 Jul 2007 17:07:59 -0000 1.8 @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh set -e @@ -23,7 +23,7 @@ _Diff "`basename "${COMPONENT}"`-last" \ "`basename "${COMPONENT}"`" \ > "${UPSTREAM_PATCHES_PATH}/`basename "${COMPONENT}"`-${NOW}.patch" || true - _Diff -x CVS -x .svn "`basename "${COMPONENT}"`-last" \ + _Diff -x CVS -x .svn -x .git "`basename "${COMPONENT}"`-last" \ "`basename "${COMPONENT}"`" \ > "${UPSTREAM_PATCHES_PATH}/`basename "${COMPONENT}"`-${NOW}-nocvs.patch" || true popd @@ -35,4 +35,3 @@ [ ! -s "${UPSTREAM_PATCHES_PATH}/`basename "${COMPONENT}"`-${NOW}.patch" ] && rm "${UPSTREAM_PATCHES_PATH}/`basename "${COMPONENT}"`-${NOW}.patch" [ ! -s "${UPSTREAM_PATCHES_PATH}/`basename "${COMPONENT}"`-${NOW}-nocvs.patch" ] && rm "${UPSTREAM_PATCHES_PATH}/`basename "${COMPONENT}"`-${NOW}-nocvs.patch" done - |