Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update makefile to use rtems cvs repository instead of deleted milkym…

…ist git clone.
  • Loading branch information...
commit bb03f0d2dc9fbdb3fda5c9c8777b064701bd6b44 1 parent 282c36d
@jpbonn jpbonn authored
Showing with 5 additions and 7 deletions.
  1. +5 −7 compile-flickernoise/Makefile
View
12 compile-flickernoise/Makefile
@@ -187,7 +187,7 @@ milkymist-git-clone:
git clone $(MILKYMIST_GIT_URL)/milkymist.git $(MILKYMIST_GIT_DIR)/milkymist.git
git clone $(MILKYMIST_GIT_URL)/flickernoise.git $(MILKYMIST_GIT_DIR)/flickernoise.git
git clone $(MILKYMIST_GIT_URL)/rtems-yaffs2.git $(MILKYMIST_GIT_DIR)/rtems-yaffs2.git
- git clone -b mmstaging $(MILKYMIST_GIT_URL)/rtems.git $(MILKYMIST_GIT_DIR)/rtems.git
+ (cd $(MILKYMIST_GIT_DIR); cvs -d :pserver:anoncvs@www.rtems.com:/usr1/CVS co rtems)
git clone $(MILKYMIST_GIT_URL)/liboscparse.git $(MILKYMIST_GIT_DIR)/liboscparse.git
git clone $(MILKYMIST_GIT_URL)/mtk.git $(MILKYMIST_GIT_DIR)/mtk.git
git clone $(MILKYMIST_GIT_URL)/autotest-m1.git $(MILKYMIST_GIT_DIR)/autotest-m1.git
@@ -196,7 +196,7 @@ milkymist-git-update:
(cd $(MILKYMIST_GIT_DIR)/milkymist.git; git fetch -a; git reset --hard origin/master)
(cd $(MILKYMIST_GIT_DIR)/flickernoise.git; git fetch -a; git reset --hard origin/master)
(cd $(MILKYMIST_GIT_DIR)/rtems-yaffs2.git; git fetch -a; git reset --hard origin/master)
- (cd $(MILKYMIST_GIT_DIR)/rtems.git; git fetch -a; git reset --hard origin/mmstaging)
+ (cd $(MILKYMIST_GIT_DIR)/rtems; cvs update)
(cd $(MILKYMIST_GIT_DIR)/liboscparse.git; git fetch -a; git reset --hard origin/master)
(cd $(MILKYMIST_GIT_DIR)/mtk.git; git fetch -a; git reset --hard origin/master)
(cd $(MILKYMIST_GIT_DIR)/autotest-m1.git; git fetch -a; git reset --hard origin/master)
@@ -220,10 +220,8 @@ rtems: $(BUILD_DIR)/bsp-milkymist/Makefile
$(BUILD_DIR)/bsp-milkymist/Makefile:
mkdir -p $(BUILD_DIR)/bsp-milkymist
- (cd $(MILKYMIST_GIT_DIR)/rtems.git && patch -Np1 < ${CURDIR}/patches/rtems-0001-zlib-git-cvs-bug.patch)
- #workaround git cvs bug
- (cd $(MILKYMIST_GIT_DIR)/rtems.git && ./bootstrap -c && ./bootstrap -p && ./bootstrap)
- (cd $(BUILD_DIR)/bsp-milkymist && $(MILKYMIST_GIT_DIR)/rtems.git/configure $(RTEMS_CONFIGURE_FLAGS))
+ (cd $(MILKYMIST_GIT_DIR)/rtems && ./bootstrap -c && ./bootstrap -p && ./bootstrap)
+ (cd $(BUILD_DIR)/bsp-milkymist && $(MILKYMIST_GIT_DIR)/rtems/configure $(RTEMS_CONFIGURE_FLAGS))
#you will need clang for compile milkymist tools
flickernoise.fbi: rtems libfpvm mtk liboscparse rtems-yaffs2 $(BUILD_DIR)/mupdf $(BUILD_DIR)/curl $(BUILD_DIR)/expat
@@ -298,5 +296,5 @@ clean:
rm -rf build_dir/*
clean-rtems:
- (cd $(MILKYMIST_GIT_DIR)/rtems.git && git checkout cpukit/zlib/zconf.h.in)
+ (cd $(MILKYMIST_GIT_DIR)/rtems && git checkout cpukit/zlib/zconf.h.in)
rm -rf build_dir/bsp-milkymist/
Please sign in to comment.
Something went wrong with that request. Please try again.