Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

fix the quilt apply patch problem. pop -a -f before push

  • Loading branch information...
commit 23797fdfb13d5f5f274ffe7e8dbe1ecd3486f5f8 1 parent 44778ca
authored February 23, 2012

Showing 1 changed file with 4 additions and 2 deletions. Show diff stats Hide diff stats

  1. 6  scripts/compile-milkymist-firmware.sh
6  scripts/compile-milkymist-firmware.sh
@@ -60,7 +60,9 @@ if [ ! -e ${MILKYMIST_GIT_DIR}/wernermisc ]; then
60 60
 fi
61 61
 (cd ${MILKYMIST_GIT_DIR}/wernermisc && git fetch -a && git reset --hard origin/master)
62 62
 (cd ${MILKYMIST_GIT_DIR}/rtems && git reset --hard f80b3a3d825110b5d8826f72db3fa47a6d71b66a)
63  
-(cd ${MILKYMIST_GIT_DIR}/rtems && rm -f patches && ln -s ${MILKYMIST_GIT_DIR}/wernermisc/m1/patches/rtems patches && quilt push -a)
  63
+(cd ${MILKYMIST_GIT_DIR}/rtems && rm -f patches && ln -s ${MILKYMIST_GIT_DIR}/wernermisc/m1/patches/rtems patches)
  64
+(cd ${MILKYMIST_GIT_DIR}/rtems && quilt pop -a -f && quilt push -a)
  65
+(cd ${MILKYMIST_GIT_DIR}/rtems && git diff > ${IMAGES_DIR}/rtems.on.f80b3a3.diff)
64 66
 
65 67
 
66 68
 echo "get git versions ..."
@@ -79,7 +81,7 @@ VERSIONS_NEW=`cat ${VERSIONS}`
79 81
 VERSIONS_OLD=`cat ${IMAGES_DIR}/../firmware-VERSIONS`
80 82
 if [ "${VERSIONS_NEW}" == "${VERSIONS_OLD}" ]; then
81 83
 	echo "No new commit, ignore build"
82  
-	rm -f ${BUILD_LOG} ${VERSIONS}
  84
+	rm -f ${IMAGES_DIR}/*
83 85
 	rmdir ${IMAGES_DIR}
84 86
 	exit 0
85 87
 fi

0 notes on commit 23797fd

Please sign in to comment.
Something went wrong with that request. Please try again.