From: Jan-Benedict G. <jb...@us...> - 2005-04-15 08:43:28
|
Update of /cvsroot/linux-vax/toolchain/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7549 Modified Files: generate_and_apply_upstream_patches.sh generate_upstream_patches.sh Log Message: - Use correct variable. Index: generate_and_apply_upstream_patches.sh =================================================================== RCS file: /cvsroot/linux-vax/toolchain/scripts/generate_and_apply_upstream_patches.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- generate_and_apply_upstream_patches.sh 14 Apr 2005 21:33:10 -0000 1.2 +++ generate_and_apply_upstream_patches.sh 15 Apr 2005 08:43:17 -0000 1.3 @@ -30,7 +30,7 @@ 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" + [ ! -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 Index: generate_upstream_patches.sh =================================================================== RCS file: /cvsroot/linux-vax/toolchain/scripts/generate_upstream_patches.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- generate_upstream_patches.sh 14 Apr 2005 21:33:10 -0000 1.3 +++ generate_upstream_patches.sh 15 Apr 2005 08:43:18 -0000 1.4 @@ -26,7 +26,7 @@ > "${UPSTREAM_PATCHES_PATH}/`basename "${COMPONENT}"`-${NOW}-nocvs.patch" || true 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" + [ ! -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 |