Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: m-labs/scripts
base: 697246de9791
...
head fork: m-labs/scripts
compare: 66d9bf016101
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 23 additions and 5 deletions.
  1. +18 −1 README.html
  2. +5 −4 compile-flickernoise/Makefile
View
19 README.html
@@ -100,7 +100,24 @@ <h1 align="center">Milkymist Scripts README</h1>
<h3><a name="secUbuntu">Ubuntu 12.04 Desktop</a></h3>
<p>
-Ubuntu 12.04 comes with autotools 2.68 but rtems needs autotools 2.69. Some of the autotools have hard coded paths so any existing installtion interfers with an installation done in an alternate path. (There's probably a way around this but I don't know what it is.) To get around this we remove the old autotools and install news ones.
+Ubuntu 12.04 comes with autotools 2.68 and automake 1.11 but rtems needs autotools 2.69 and automake 1.12. Some of the autotools have hard coded paths so any existing installtion interfers with an installation done in an alternate path. (There's probably a way around this but I don't know what it is.) To get around this we remove the old autotools and install news ones.
+</p>
+<p>
+<b>OR you can simply download the following two debian packages:</b>
+<ul>
+<li>Automake 1.12.6 for Ubuntu 12.04 : <a href="https://launchpad.net/~rbose-debianizer/+archive/automake/+packages">https://launchpad.net/~rbose-debianizer/+archive/automake/+packages</a></li>
+<li>Autoconf 2.69 for Ubuntu 12.04 : <a href="https://launchpad.net/~dns/+archive/gnu/+build/3647209">https://launchpad.net/~dns/+archive/gnu/+build/3647209</a></li>
+</ul>
+
+And then install them by doing:<br />
+<pre>
+$ sudo dpkg -i autoconf_2.69-1gnu1~12.04_all.deb
+$ sudo dpkg -i automake_1.12.6-0gnu0~12.04_all.deb
+</pre>
+</p>
+
+If you really want to install them by compiling sources, then you can do the following:
+
<OL>
<LI>Remove the folowing packages (sudo apt-get remove `packagename`):
<UL>
View
9 compile-flickernoise/Makefile
@@ -201,10 +201,10 @@ $(BUILD_DIR)/jansson: $(DL)/$(JANSSON).ok
REPO_DIRS=milkymist flickernoise rtems-yaffs2 liboscparse mtk autotest-m1
milkymist-git-clone:
mkdir -p $(MILKYMIST_GIT_DIR)
- git clone git://git.rtems.org/rtems.git $(MILKYMIST_GIT_DIR)/rtems
+ if [ ! -d "$(MILKYMIST_GIT_DIR)/rtems" ] ; then git clone git://git.rtems.org/rtems.git $(MILKYMIST_GIT_DIR)/rtems ; fi
for d in $(REPO_DIRS); \
- do (git clone $(MILKYMIST_GIT_URL)/$$d.git \
- $(MILKYMIST_GIT_DIR)/$$d) || exit 1; \
+ do if [ ! -d "$(MILKYMIST_GIT_DIR)/$$d" ] ; then (git clone $(MILKYMIST_GIT_URL)/$$d.git \
+ $(MILKYMIST_GIT_DIR)/$$d) || exit 1; fi \
done
milkymist-git-update:
@@ -237,7 +237,8 @@ $(BUILD_DIR)/bsp-milkymist/Makefile:
git clone git://projects.qi-hardware.com/wernermisc.git ${MILKYMIST_GIT_DIR}/wernermisc
cd ${MILKYMIST_GIT_DIR}/wernermisc && git fetch -a && git reset --hard origin/master
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 && quilt pop -a -f
+ cd ${MILKYMIST_GIT_DIR}/rtems && quilt push -a
cd $(MILKYMIST_GIT_DIR)/rtems && \
./bootstrap -c && ./bootstrap -p && ./bootstrap
cd $(BUILD_DIR)/bsp-milkymist && \

No commit comments for this range

Something went wrong with that request. Please try again.