From: Jan-Benedict G. <jb...@us...> - 2005-04-15 10:48:26
|
Update of /cvsroot/linux-vax/toolchain/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4589 Modified Files: README try_patches.sh vax_toolchain_config Log Message: - Move over from three to six digits. After thinking about some kind of "estimated lifetime" for these scripts and local patches, I wanted to reach more than one thousand... Index: README =================================================================== RCS file: /cvsroot/linux-vax/toolchain/scripts/README,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- README 15 Apr 2005 09:08:30 -0000 1.9 +++ README 15 Apr 2005 10:48:17 -0000 1.10 @@ -103,7 +103,7 @@ patches). All patches (in the patches directory) are expected to follow this filename convention: - ${3}/COMPONENT-nnn-some_description.patch + ${3}/COMPONENT-nnnnnn-some_description.patch copy_directory.sh Index: try_patches.sh =================================================================== RCS file: /cvsroot/linux-vax/toolchain/scripts/try_patches.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- try_patches.sh 14 Apr 2005 20:11:46 -0000 1.1 +++ try_patches.sh 15 Apr 2005 10:48:17 -0000 1.2 @@ -7,14 +7,14 @@ # function try_patches() { echo -n "Looking for ${1} patches... " - if ! ls ${3}/${1}-[0-9][0-9][0-9]-*.patch > /dev/null 2>&1; then + if ! ls ${3}/${1}-[0-9][0-9][0-9][0-9][0-9][0-9]-*.patch > /dev/null 2>&1; then echo "none." return else - echo "found `ls ${3}/${1}-[0-9][0-9][0-9]-*.patch | wc -l`." + echo "found `ls ${3}/${1}-[0-9][0-9][0-9][0-9][0-9][0-9]-*.patch | wc -l`." fi - for patchfile in ${3}/${1}-[0-9][0-9][0-9]-*.patch; do + for patchfile in ${3}/${1}-[0-9][0-9][0-9][0-9][0-9][0-9]-*.patch; do echo "Applying `basename "${patch}"` ..." pushd "${2}" patch -p1 --verbose < "${patchfile}" @@ -27,9 +27,9 @@ echo "All patches are expected to apply with -p1 within directory-to-patch." >&2 echo "Their names are expected to be in this form:" >&2 echo "" >&2 - echo " COMPONENT-nnn-description.patch" >&2 + echo " COMPONENT-nnnnnn-description.patch" >&2 echo "" >&2 - echo "nnn is exactly three decimal digits; description mustn't contain spaces." >&2 + echo "nnnnnn is exactly six decimal digits; description mustn't contain spaces." >&2 exit 1 fi Index: vax_toolchain_config =================================================================== RCS file: /cvsroot/linux-vax/toolchain/scripts/vax_toolchain_config,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- vax_toolchain_config 15 Apr 2005 09:10:28 -0000 1.3 +++ vax_toolchain_config 15 Apr 2005 10:48:17 -0000 1.4 @@ -51,10 +51,10 @@ # All patches _must_ match this specific filename convention to be # recognized: # -# ${VAX_PATCHES_PATH}/COMPONENT-nnn-some_description.patch +# ${VAX_PATCHES_PATH}/COMPONENT-nnnnnn-some_description.patch # -# COMPONENT is one of binutils, gcc, glibc, ports. nnn is a decimal -# number (three digits with leading zero). Patches are applied in order +# COMPONENT is one of binutils, gcc, glibc, ports. nnnnnn is a decimal +# number (six digits with leading zero). Patches are applied in order # of the given number. # # BUILD_BASE_DIR |