Update of /cvsroot/linux-vax/toolchain/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15980
Modified Files:
generate_and_apply_upstream_patches.sh
generate_upstream_patches.sh
Log Message:
- Portability fixes.
Index: generate_and_apply_upstream_patches.sh
===================================================================
RCS file: /cvsroot/linux-vax/toolchain/scripts/generate_and_apply_upstream_patches.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- generate_and_apply_upstream_patches.sh 23 Sep 2005 14:05:40 -0000 1.5
+++ generate_and_apply_upstream_patches.sh 28 Dec 2005 17:16:14 -0000 1.6
@@ -20,16 +20,16 @@
uclibc/uclibc-upstream-HEAD \
gcc/gcc-upstream-HEAD; do
pushd "${UPSTREAM_SANDBOXES_PATH}/`dirname "${COMPONENT}"`"
- diff -Nurp "`basename "${COMPONENT}"`-last" \
- "`basename "${COMPONENT}"`" \
+ _Diff "`basename "${COMPONENT}"`-last" \
+ "`basename "${COMPONENT}"`" \
> "${UPSTREAM_PATCHES_PATH}/`basename "${COMPONENT}"`-${NOW}.patch" || true
- diff -Nurp -x CVS -x .svn "`basename "${COMPONENT}"`-last" \
+ _Diff -x CVS -x .svn "`basename "${COMPONENT}"`-last" \
"`basename "${COMPONENT}"`" \
> "${UPSTREAM_PATCHES_PATH}/`basename "${COMPONENT}"`-${NOW}-nocvs.patch" || true
popd
pushd "${UPSTREAM_SANDBOXES_PATH}/${COMPONENT}-last"
- patch -p1 < "${UPSTREAM_PATCHES_PATH}/`basename "${COMPONENT}"`-${NOW}.patch"
+ _Patch -p1 < "${UPSTREAM_PATCHES_PATH}/`basename "${COMPONENT}"`-${NOW}.patch"
popd
[ ! -s "${UPSTREAM_PATCHES_PATH}/`basename "${COMPONENT}"`-${NOW}.patch" ] && rm "${UPSTREAM_PATCHES_PATH}/`basename "${COMPONENT}"`-${NOW}.patch"
Index: generate_upstream_patches.sh
===================================================================
RCS file: /cvsroot/linux-vax/toolchain/scripts/generate_upstream_patches.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- generate_upstream_patches.sh 23 Sep 2005 14:05:40 -0000 1.6
+++ generate_upstream_patches.sh 28 Dec 2005 17:16:14 -0000 1.7
@@ -20,10 +20,10 @@
linux/linux-upstream-HEAD \
uclibc/uclibc-upstream-HEAD; do
pushd "${UPSTREAM_SANDBOXES_PATH}/`dirname "${COMPONENT}"`"
- diff -Nurp "`basename "${COMPONENT}"`-last" \
+ _Diff "`basename "${COMPONENT}"`-last" \
"`basename "${COMPONENT}"`" \
> "${UPSTREAM_PATCHES_PATH}/`basename "${COMPONENT}"`-${NOW}.patch" || true
- diff -Nurp -x CVS -x .svn "`basename "${COMPONENT}"`-last" \
+ _Diff -x CVS -x .svn "`basename "${COMPONENT}"`-last" \
"`basename "${COMPONENT}"`" \
> "${UPSTREAM_PATCHES_PATH}/`basename "${COMPONENT}"`-${NOW}-nocvs.patch" || true
popd
|
