diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-06-07 06:45:52 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-06-20 15:04:33 +0200 |
| commit | 3b42ee9d3adca8683a2e639661a50bc7b0db6e60 (patch) | |
| tree | d375e7f42323e6311d3bbc88269f0ba9065ff810 /doc | |
| parent | 9fec8ddfeb1128a34ab1cf09aff8bd998b96916d (diff) | |
| download | ptxdist-3b42ee9d3adca8683a2e639661a50bc7b0db6e60.tar.gz ptxdist-3b42ee9d3adca8683a2e639661a50bc7b0db6e60.tar.xz | |
doc: remove oselasTCNVendorPatchLevel variable
The toolchain version should contain the patch-level version in all cases
so a separate variable is not needed. This fixes several instances where
the toolchain version was used incorrectly without the patch-level version.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/conf.py | 3 | ||||
| -rw-r--r-- | doc/environment.rst | 16 | ||||
| -rw-r--r-- | doc/user_manual.rst | 4 |
3 files changed, 11 insertions, 12 deletions
diff --git a/doc/conf.py b/doc/conf.py index 9b03cf496..bd2ca1917 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -101,8 +101,7 @@ rst_epilog = """ .. |ptxdistPlatformDir| replace:: ``platform-versatilepb`` .. |oselasTCNarch| replace:: arm .. |oselasTCNvariant| replace:: v5te -.. |oselasTCNVendorVersion| replace:: 2014.12 -.. |oselasTCNVendorPatchLevel| replace:: .0 +.. |oselasTCNVendorVersion| replace:: 2014.12.0 .. |oselasTCNVendorptxdistversion| replace:: 2014.12.0 .. |oselasToolchainName| replace:: arm-v5te-linux-gnueabi_gcc-4.8.2_glibc-2.18_binutils-2.24_kernel-3.12-sanitized .. |ptxdistBSPName| replace:: OSELAS.BSP-Pengutronix-Generic-2015.03.1 diff --git a/doc/environment.rst b/doc/environment.rst index 40fe821ed..f840c9581 100644 --- a/doc/environment.rst +++ b/doc/environment.rst @@ -448,7 +448,7 @@ the board support package: .. parsed-literal:: - $ apt-get install oselas.toolchain-\ |oselasTCNVendorVersion|\ |oselasTCNVendorPatchLevel|\ -\ |ptxdistCompilerName|\ -<ptxdistCompilerVersion> + $ apt-get install oselas.toolchain-\ |oselasTCNVendorVersion|\ -\ |ptxdistCompilerName|\ -<ptxdistCompilerVersion> These package names are very long and hard to type without making typos. An easier way is to ask the package manager for available toolchains and @@ -457,7 +457,7 @@ just use the name by copy and paste it. .. parsed-literal:: $ apt-cache search "oselas.toolchain-.*-\ |oselasTCNarch|\ .*\ |oselasTCNvariant|\ .*" - oselas.toolchain-\ |oselasTCNVendorVersion|\ |oselasTCNVendorPatchLevel|\ -\ |ptxdistCompilerName|\ -<ptxdistCompilerVersion> + oselas.toolchain-\ |oselasTCNVendorVersion|\ -\ |ptxdistCompilerName|\ -<ptxdistCompilerVersion> The binary OSELAS Toolchain Package for non-Debian Distributions ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -469,11 +469,11 @@ The related OSELAS toolchain package can be found here: Subpath is: -| oselas.toolchain-\ |oselasTCNVendorVersion|\ |oselasTCNVendorPatchLevel|\ -\ |ptxdistCompilerName|\ -\ |ptxdistCompilerVersion|\ / +| oselas.toolchain-\ |oselasTCNVendorVersion|\ -\ |ptxdistCompilerName|\ -\ |ptxdistCompilerVersion|\ / Package filename is: -| oselas.toolchain-\ |oselasTCNVendorVersion|\ |oselasTCNVendorPatchLevel|\ -\ |ptxdistCompilerName|\ -\ |ptxdistCompilerVersion|\ \*.deb +| oselas.toolchain-\ |oselasTCNVendorVersion|\ -\ |ptxdistCompilerName|\ -\ |ptxdistCompilerVersion|\ \*.deb Package filenames for 32 bit host machines are ending on ``*_i386.deb`` and for 64 bit host machines on ``*_amd64.deb``. @@ -551,8 +551,8 @@ So the steps to build this toolchain are: .. parsed-literal:: - $ tar xf OSELAS.Toolchain-\ |oselasTCNVendorVersion|\ |oselasTCNVendorPatchLevel|.tar.bz2 - $ cd OSELAS.Toolchain-\ |oselasTCNVendorVersion|\ |oselasTCNVendorPatchLevel| + $ tar xf OSELAS.Toolchain-\ |oselasTCNVendorVersion|.tar.bz2 + $ cd OSELAS.Toolchain-\ |oselasTCNVendorVersion| $ ptxdist-\ |oselasTCNVendorptxdistversion| select ptxconfigs/\ |oselasToolchainName|\ .ptxconfig $ ptxdist-\ |oselasTCNVendorptxdistversion| go @@ -607,10 +607,10 @@ new one. All toolchains will be installed side by side architecture dependent into directory -| /opt/OSELAS.Toolchain-\ |oselasTCNVendorVersion|\ |oselasTCNVendorPatchLevel|/<architecture> +| /opt/OSELAS.Toolchain-\ |oselasTCNVendorVersion|/<architecture> Different toolchains for the same architecture will be installed side by side version dependent into directory -| /opt/OSELAS.Toolchain-\ |oselasTCNVendorVersion|\ |oselasTCNVendorPatchLevel|/<architecture>/<version> +| /opt/OSELAS.Toolchain-\ |oselasTCNVendorVersion|/<architecture>/<version> diff --git a/doc/user_manual.rst b/doc/user_manual.rst index 353a6b2c6..f011edcd0 100644 --- a/doc/user_manual.rst +++ b/doc/user_manual.rst @@ -345,7 +345,7 @@ platforms to build for. In this case we want to build for the : .. parsed-literal:: found and using toolchain: - '/opt/OSELAS.Toolchain-\ |oselasTCNVendorVersion|\ |oselasTCNVendorPatchLevel|\ /\ |ptxdistCompilerName|\ /\ + '/opt/OSELAS.Toolchain-\ |oselasTCNVendorVersion|\ /\ |ptxdistCompilerName|\ /\ |ptxdistCompilerVersion|\ /bin' If it fails you can continue to select the toolchain manually as @@ -376,7 +376,7 @@ for the target. .. parsed-literal:: - $ ptxdist toolchain /opt/OSELAS.Toolchain-\ |oselasTCNVendorVersion|\ |oselasTCNVendorPatchLevel|\ /\ |ptxdistCompilerName|\ /\ |ptxdistCompilerVersion|\ /bin + $ ptxdist toolchain /opt/OSELAS.Toolchain-\ |oselasTCNVendorVersion|\ /\ |ptxdistCompilerName|\ /\ |ptxdistCompilerVersion|\ /bin Building the Root Filesystem Content ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |