summaryrefslogtreecommitdiffstats
path: root/doc/environment.rst
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2016-06-07 06:45:52 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2016-06-20 15:04:33 +0200
commit3b42ee9d3adca8683a2e639661a50bc7b0db6e60 (patch)
treed375e7f42323e6311d3bbc88269f0ba9065ff810 /doc/environment.rst
parent9fec8ddfeb1128a34ab1cf09aff8bd998b96916d (diff)
downloadptxdist-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/environment.rst')
-rw-r--r--doc/environment.rst16
1 files changed, 8 insertions, 8 deletions
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>