From baf536c62cb5c935f87eb97618f2834c554cc3bd Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Mon, 3 Oct 2011 12:07:21 -0700 Subject: [PATCH] documentation/adt-manual: changes for Jessica's review. I made several changes based on feedback from Jessica Zhang. 1. Removed "SDKVERSION" as a way of identifying the directory in which a toolchain tarball is installed. I replaced with "1.1" 2. Cleaned up the bitbake command verbage to consistently use 'bitbake' command. 3. Cleaned up an erroneous reference to the toolchain environment setup scripts. I was referring the user to the oe-init-build-env area. 4. Changed wording to indicate that the toolchain tarball is generated after running bitbake rather than installing the toolchain. 5. Replaced the gmae tarball file used in an example to be the regular taball. (From yocto-docs rev: f7c3e4f4a666121a29825099d451eab1accb0616) Signed-off-by: Scott Rifenbark Signed-off-by: Richard Purdie --- documentation/adt-manual/adt-eclipse.xml | 2 +- documentation/adt-manual/adt-prepare.xml | 30 +++++++++++------------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/documentation/adt-manual/adt-eclipse.xml b/documentation/adt-manual/adt-eclipse.xml index 8272bae0be..df70bd4e49 100644 --- a/documentation/adt-manual/adt-eclipse.xml +++ b/documentation/adt-manual/adt-eclipse.xml @@ -294,7 +294,7 @@ Point to the Toolchain: If you are using a stand-alone pre-built toolchain, you should be pointing to the - /opt/poky/$SDKVERSION directory. + /opt/poky/1.1 directory. This is the location for toolchains installed by the ADT Installer or by hand. Sections "Configuring and Running the ADT Installer Script" and diff --git a/documentation/adt-manual/adt-prepare.xml b/documentation/adt-manual/adt-prepare.xml index a9fb15e87e..8c98498daf 100644 --- a/documentation/adt-manual/adt-prepare.xml +++ b/documentation/adt-manual/adt-prepare.xml @@ -181,7 +181,7 @@ Once the installation completes, the ADT, which includes the cross-toolchain, is installed. You will notice environment setup files for the cross-toolchain in - /opt/poky/$SDKVERSION, + /opt/poky/1.1, and image tarballs in the adt-installer directory according to your installer configurations, and the target sysroot located according to the YOCTOADT_TARGET_SYSROOT_LOC_<arch> variable @@ -204,7 +204,7 @@ Follow these steps: Go to - + and find the folder that matches your host development system (i.e. i586 for 32-bit machines or x86_64 for 64-bit machines). @@ -214,10 +214,8 @@ you are going to use your cross-toolchain for an Intel-based 32-bit target, go into the x86_64 folder and download the following tarball: - yocto-eglibc-x86_64-i586-toolchain-gmae-1.1.tar.bz2 - - The cross-toolchain tarballs provided by the Yocto Project support development - of GNOME platforms on mobile devices (GMAE). + yocto-eglibc-x86_64-i586-toolchain-1.1.tar.bz2 + As an alternative to steps one and two, you can build the toolchain tarball if you have a Yocto Project build tree. If you need GMAE, you should use the bitbake meta-toolchain-gmae @@ -233,7 +231,7 @@ Make sure you are in the root directory with root privileges and then expand the tarball. - The tarball expands into /opt/poky/$SDKVERSION. + The tarball expands into /opt/poky/1.1. Once the tarball is expanded, the cross-toolchain is installed. You will notice environment setup files for the cross-toolchain in the directory. @@ -260,8 +258,8 @@ files. At this point, you should be sure that the MACHINE variable - in the local.conf file found in the Yocto Project - file structure's conf directory + in the local.conf file found in the + conf directory of the Yocto Project build directory is set for the target architecture. Comments within the local.conf file list the values you can use for the MACHINE variable. @@ -274,12 +272,12 @@ cross-toolchain installation. If change out of your working directory after you source the environment setup script and before you run - the BitBake command, the command might not work. + the bitbake command, the command might not work. Be sure to run the bitbake command immediately after checking or editing the local.conf but without changing out of your working directory. - Once BitBake finishes, the cross-toolchain is installed within the Yocto Project - build tree. + Once the bitbake command finishes, + the tarball for the cross-toolchain is generated within the Yocto Project build tree. You will notice environment setup files for the cross-toolchain in the Yocto Project build tree in the tmp directory. Setup script filenames contain the strings environment-setup. @@ -294,12 +292,12 @@ Before you can develop using the cross-toolchain, you need to set up the - cross-development environment by sourcing the environment setup script. + cross-development environment by sourcing the toolchain's environment setup script. If you used the ADT Installer or used an existing ADT tarball to install the ADT, - then you can find this script in the /opt/poky/$SDKVERSION + then you can find this script in the /opt/poky/1.1 directory. If you installed the toolchain in the build tree, you can find the environment setup - scripts in the Yocto Project build tree's tmp directory. + script for the toolchain in the Yocto Project build tree's tmp directory. @@ -307,7 +305,7 @@ which you are developing. Environment setup scripts begin with the string “environment-setup” and include as part of their name the architecture. - For example, the environment setup script for a 64-bit IA-based architecture would + For example, the toolchain environment setup script for a 64-bit IA-based architecture would be the following: /opt/poky/1.1/environment-setup-x86_64-poky-linux