Skip to content

Commit

Permalink
fix the quilt apply patch problem. pop -a -f before push
Browse files Browse the repository at this point in the history
Xiangfu Liu committed Feb 23, 2012
1 parent 44778ca commit 23797fd
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions scripts/compile-milkymist-firmware.sh
Original file line number Diff line number Diff line change
@@ -60,7 +60,9 @@ if [ ! -e ${MILKYMIST_GIT_DIR}/wernermisc ]; then
fi
(cd ${MILKYMIST_GIT_DIR}/wernermisc && git fetch -a && git reset --hard origin/master)
(cd ${MILKYMIST_GIT_DIR}/rtems && git reset --hard f80b3a3d825110b5d8826f72db3fa47a6d71b66a)
(cd ${MILKYMIST_GIT_DIR}/rtems && rm -f patches && ln -s ${MILKYMIST_GIT_DIR}/wernermisc/m1/patches/rtems patches && quilt push -a)
(cd ${MILKYMIST_GIT_DIR}/rtems && rm -f patches && ln -s ${MILKYMIST_GIT_DIR}/wernermisc/m1/patches/rtems patches)
(cd ${MILKYMIST_GIT_DIR}/rtems && quilt pop -a -f && quilt push -a)
(cd ${MILKYMIST_GIT_DIR}/rtems && git diff > ${IMAGES_DIR}/rtems.on.f80b3a3.diff)


echo "get git versions ..."
@@ -79,7 +81,7 @@ VERSIONS_NEW=`cat ${VERSIONS}`
VERSIONS_OLD=`cat ${IMAGES_DIR}/../firmware-VERSIONS`
if [ "${VERSIONS_NEW}" == "${VERSIONS_OLD}" ]; then
echo "No new commit, ignore build"
rm -f ${BUILD_LOG} ${VERSIONS}
rm -f ${IMAGES_DIR}/*
rmdir ${IMAGES_DIR}
exit 0
fi

0 comments on commit 23797fd

Please sign in to comment.