#! /bin/sh # edk-ecos-import-upstream -- imports the latest eCos from upstream CVS into # the local ecos repository. # # Instructions: # 1. Run # $ edk-ecos-import-upstream # 2. Manually fix conflicts in /ecos-merged # 3. Run # $ edk-ecos-import-upstream set -e if [ -z "$1" ]; then echo "Usage:" echo " $(basename $0) " exit 1 fi TOPDIR=$1 LATEST_IMPORT_TAG=ECOS_LATEST_IMPORT TAG_DATE=$(date "+%Y%m%d") HUMAN_DATE=$(date) if [ -e ${TOPDIR}/ecos -o -e ${TOPDIR}/ecos-merged ]; then echo "$(basename $0): \`${TOPDIR}' contains a possible ecos repository already" exit 1 fi # Grab the latest eCos upstream... cd $TOPDIR cvs -d :pserver:anoncvs@sources.redhat.com:/cvs/ecos login cvs -z3 -d :pserver:anoncvs@sources.redhat.com:/cvs/ecos co -P ecos cd ecos find -type d -a -name CVS | xargs rm -r cvs import -m "Imported from upstream CVS (${HUMAN_DATE})." ecos upstream ECOS_${TAG_DATE} cd $TOPDIR cvs co -j$LATEST_IMPORT_TAG -jECOS_${TAG_DATE} -d ecos-merged ecos echo -e "\n*\n* Manually fix conflicts in \`${TOPDIR}/ecos-merged'.\n*\n" echo "Then run \`edk-ecos-commit-merge ${TOPDIR}'."