summaryrefslogtreecommitdiffstats
path: root/src/doc/src
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@digia.com>2014-03-25 15:33:14 +0200
committerSamuli Piippo <samuli.piippo@digia.com>2014-03-26 11:39:49 +0200
commit7f3399fee5014b1cbfc42b6c0e1384d834742947 (patch)
tree39dfe1fa2d386a1d42c0f833fe19e00ecacdaf3f /src/doc/src
parent72cd3653d1c7818d02fabb30ea4c19da1463a114 (diff)
doc: use same directory for yocto and qt
The init script in b2qt-build-script can now use the toolchain and image from yocto build, if the same build directory is used. Change-Id: Ifffd5206cb2aaa7e50546c27ceb330900c1bf951 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'src/doc/src')
-rw-r--r--src/doc/src/b2qt.qdoc16
1 files changed, 5 insertions, 11 deletions
diff --git a/src/doc/src/b2qt.qdoc b/src/doc/src/b2qt.qdoc
index e86024b..4a4d668 100644
--- a/src/doc/src/b2qt.qdoc
+++ b/src/doc/src/b2qt.qdoc
@@ -943,7 +943,7 @@
Run the setup script that initializes the Yocto environment:
\code
- cd <YoctoBuildDir>
+ cd <BuildDir>
<INSTALL_DIR>/Boot2Qt-2.x/sources/b2qt-yocto-meta/b2qt-init-build-env .
\endcode
@@ -978,21 +978,15 @@
\e {Build scripts} source package contains scripts that can be used to
build Qt and all additional Qt addons that are part of \B2QL image.
- To setup build environment for your target hardware, create new build
- directory and run the initialization script. Using Raspberry Pi as
- an example:
+ To setup build environment for your target hardware, run the initialization
+ script. Using Raspberry Pi as an example:
\code
- cd <B2QtBuildDir>
<INSTALL_DIR>/Boot2Qt-2.x/sources/b2qt-build-scripts/embedded-common/init_build_env.sh <INSTALL_DIR>/Boot2Qt-2.x/sources/b2qt-build-scripts/embedded-linux/config.raspberrypi
\endcode
- \note You should use different build directories for Qt and the Yocto image.
-
- If you have rebuilt your own Yocto target image and toolchain, you can replace the
- \c rootfs.tar.gz and \c toolchain.sh in the current Qt build directory with the ones generated by bitbake.
- Bitbake does not generate the \c boot.tar.gz packages used by \B2Q, so you may need to update it manually
- with files from bitbake.
+ \note You can use the same build directory for Qt and the Yocto image.
+ The toolchain and the target image are then used from the Yocto build directory.
You can use following scripts to build different parts of the \B2Q stack.