diff options
| author | Gui Chen <gui.chen@intel.com> | 2012-12-19 14:42:48 +0800 |
|---|---|---|
| committer | Gui Chen <gui.chen@intel.com> | 2012-12-19 14:42:48 +0800 |
| commit | f20bfb944246f5f6f89963d1f41f32ac6dc19acf (patch) | |
| tree | 0767057396e10d42fc5ba4214546c903f4bae6fb /etc | |
| parent | aaee947d5ad2c0efdbcb270346c5176647686c88 (diff) | |
| parent | a4253604bfc4c6e35085e0f74580ac09c4a55fc1 (diff) | |
| download | mic-f20bfb944246f5f6f89963d1f41f32ac6dc19acf.tar.gz mic-f20bfb944246f5f6f89963d1f41f32ac6dc19acf.tar.bz2 mic-f20bfb944246f5f6f89963d1f41f32ac6dc19acf.zip | |
Merge branch 'release-0.15' into devel
Conflicts:
etc/bootstrap.conf
mic/bootstrap.py
mic/creator.py
mic/imager/raw.py
mic/msger.py
mic/utils/misc.py
setup.py
Signed-off-by: Gui Chen <gui.chen@intel.com>
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/mic.conf.in | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/etc/mic.conf.in b/etc/mic.conf.in index b79603e..3d41eff 100644 --- a/etc/mic.conf.in +++ b/etc/mic.conf.in @@ -9,7 +9,7 @@ plugin_dir = @PREFIX@/lib/mic/plugins tmpdir= /var/tmp/mic cachedir= /var/tmp/mic/cache outdir= ./mic-output -bootstrapdir= /var/tmp/mic/bootstrap +runtime=bootstrap pkgmgr = auto @@ -29,8 +29,7 @@ pkgmgr = auto [chroot] ; settings for chroot subcommand -[bootstrap1] -name=micbootstrap -bootstrap=http://download.tizen.org/tools/micbootstrap/ -; bootstrap_proxy=http://proxy.yourcompany.com:port +[bootstrap] +rootdir=/var/tmp/mic-bootstrap +packages=mic-bootstrap-x86-arm |