[LV-tools-commit] toolchain/scripts generate_and_apply_upstream_patches.sh,NONE,1.1 README,1.6,1.7

[Jan-Benedict G. <jb...@us...>]

Update of /cvsroot/linux-vax/toolchain/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24005

Modified Files:
	README 
Added Files:
	generate_and_apply_upstream_patches.sh 
Log Message:
- This is the 2nd (and last) script for creating upstream patches.
- I'll check-in the remainder of my scripts (and one GCC patch) tomorrow.


Index: README
===================================================================
RCS file: /cvsroot/linux-vax/toolchain/scripts/README,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- README	14 Apr 2005 21:16:55 -0000	1.6
+++ README	14 Apr 2005 21:30:37 -0000	1.7
@@ -67,6 +67,14 @@
 sandboxes! The broken out patches will be placed into ${UPSTREAM_PATCHES_PATH}.
 
 
+generate_and_apply_upstream_patches.sh
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This script basically does the same as generate_upstream_patches.sh, but will
+also patch the *-HEAD-last/ sources. So after diffing out the changes and
+applying the patch, both *-HEAD/ and *-HEAD-last/ will contain the same
+sources.
+
+
 try_patches.sh
 ~~~~~~~~~~~~~~
 This script gets three arguments (component (like binutils, gcc, glibc, ports),

--- NEW FILE: generate_and_apply_upstream_patches.sh ---
#!/bin/sh

set -e

if [ ! -d "${UPSTREAM_SANDBOXES_PATH}" ]; then
	echo "\$UPSTREAM_SANDBOXES_PATH isn't set--please source vax_toolchain_config" >&2
	exit 1
fi

NOW="`date -u '+%Y%m%d-%H%M%S'`"

for COMPONENT in binutils/binutils-upstream-HEAD	\
			glibc/libc-upstream-HEAD	\
			glibc/ports-upstream-HEAD	\
			gcc/gcc-upstream-HEAD; do
	pushd "${UPSTREAM_SANDBOXES_PATH}/`dirname "${COMPONENT}"`"
		diff -Nurp "`basename "${COMPONENT}"`-last"		\
			"`basename "${COMPONENT}"`"			\
			> "${UPSTREAM_PATCHES_PATH}/`basename "${COMPONENT}"`-${NOW}.patch" || true
		diff -Nurp -x CVS "`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"
	popd

	[ ! -s "${UPSTREAM_SANDBOXES_PATH}/`basename "${COMPONENT}"`-${NOW}.patch" ] && rm "${UPSTREAM_SANDBOXES_PATH}/`basename "${COMPONENT}"`-${NOW}.patch"
	[ ! -s "${UPSTREAM_SANDBOXES_PATH}/`basename "${COMPONENT}"`-${NOW}-nocvs.patch" ] && rm "${UPSTREAM_SANDBOXES_PATH}/`basename "${COMPONENT}"`-${NOW}-nocvs.patch"
done