Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/scripts
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a6c6d0b
Choose a base ref
...
head repository: m-labs/scripts
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b50d529
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jan 13, 2012

  1. rtems is changed to git. cvs not working anymore

    Xiangfu Liu committed Jan 13, 2012
    Copy the full SHA
    bf51064 View commit details

  2. compile-milkymist-firmware.sh: no needs handle cvs rtems

    Xiangfu Liu committed Jan 13, 2012
    Copy the full SHA
    b50d529 View commit details
Showing with 4 additions and 6 deletions.
  1. +3 −3 compile-flickernoise/Makefile
  2. +1 −3 scripts/compile-milkymist-firmware.sh
6 changes: 3 additions & 3 deletions compile-flickernoise/Makefile
View file
Original file line number Diff line number Diff line change
@@ -182,15 +182,15 @@ $(BUILD_DIR)/expat: $(DL)/$(EXPAT).ok
REPO_DIRS=milkymist flickernoise rtems-yaffs2 liboscparse mtk autotest-m1
milkymist-git-clone:
mkdir -p $(MILKYMIST_GIT_DIR)
(cd $(MILKYMIST_GIT_DIR) && \
cvs -d :pserver:anoncvs@www.rtems.com:/usr1/CVS co rtems)
git clone git://git.rtems.org/rtems.git $(MILKYMIST_GIT_DIR)/rtems
for d in $(REPO_DIRS); \
do (git clone $(MILKYMIST_GIT_URL)/$$d.git \
$(MILKYMIST_GIT_DIR)/$$d) || exit 1; \
done

milkymist-git-update:
#(cd $(MILKYMIST_GIT_DIR)/rtems && cvs -q -z3 update -PdC)
(cd $(MILKYMIST_GIT_DIR)/rtems && git fetch -a && \
git reset --hard origin/master) || exit 1;
for d in $(REPO_DIRS); \
do (cd $(MILKYMIST_GIT_DIR)/$$d && git fetch -a && \
git reset --hard origin/master) || exit 1; \
4 changes: 1 addition & 3 deletions scripts/compile-milkymist-firmware.sh
View file
Original file line number Diff line number Diff line change
@@ -54,9 +54,7 @@ if [ "$?" != "0" ]; then
fi

#this needs you manully clont the wernermisc to MILKYMIST_GIT_DIR
echo "handle cvs rtems and werner's patch ..."
rm -rf ${MILKYMIST_GIT_DIR}/rtems
(cd ${MILKYMIST_GIT_DIR} && cvs -d :pserver:anoncvs@www.rtems.com:/usr1/CVS co rtems)
echo "handle werner's patch on rtems ..."
(cd ${MILKYMIST_GIT_DIR}/rtems && rm -f patches && ln -s ../wernermisc/m1/patches/rtems/ patches)
(cd ${MILKYMIST_GIT_DIR}/rtems/patches && git fetch -a && git reset --hard origin/master)
(cd ${MILKYMIST_GIT_DIR}/rtems && quilt push -a)