diff options
| author | Scott Rifenbark <srifenbark@gmail.com> | 2016-03-09 13:30:27 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-23 21:56:08 +0000 |
| commit | 4c5157f7dcfecab3b4e4483cd122e0ae74b377ee (patch) | |
| tree | 03c0812d79db78ebfd454b540338b66e2dc20521 /documentation/ref-manual/introduction.xml | |
| parent | 4306f7f97a2ea05ebf141947294729584795d832 (diff) | |
| download | poky-4c5157f7dcfecab3b4e4483cd122e0ae74b377ee.tar.gz | |
ref-manual: Resolving a conflict
(From yocto-docs rev: b364516928d04da38ef3188f07f190ffac64762b)
Signed-off-by: Scott Rifenbark <srifenbark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/ref-manual/introduction.xml')
| -rw-r--r-- | documentation/ref-manual/introduction.xml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/documentation/ref-manual/introduction.xml b/documentation/ref-manual/introduction.xml index e82f8340fb..ecabaaa421 100644 --- a/documentation/ref-manual/introduction.xml +++ b/documentation/ref-manual/introduction.xml | |||
| @@ -245,9 +245,9 @@ | |||
| 245 | <literallayout class='monospaced'> | 245 | <literallayout class='monospaced'> |
| 246 | $ sudo apt-get install make xsltproc docbook-utils fop dblatex xmlto | 246 | $ sudo apt-get install make xsltproc docbook-utils fop dblatex xmlto |
| 247 | </literallayout></para></listitem> | 247 | </literallayout></para></listitem> |
| 248 | <listitem><para><emphasis>ADT Installer Extras:</emphasis> | 248 | <listitem><para><emphasis>SDK Installer Extras:</emphasis> |
| 249 | Packages needed if you are going to be using the | 249 | Packages needed if you are going to be using the |
| 250 | <ulink url='&YOCTO_DOCS_ADT_URL;#using-the-adt-installer'>Application Development Toolkit (ADT) Installer</ulink>: | 250 | the standard or extensible SDK: |
| 251 | <literallayout class='monospaced'> | 251 | <literallayout class='monospaced'> |
| 252 | $ sudo apt-get install autoconf automake libtool libglib2.0-dev libarchive-dev | 252 | $ sudo apt-get install autoconf automake libtool libglib2.0-dev libarchive-dev |
| 253 | </literallayout></para></listitem> | 253 | </literallayout></para></listitem> |
| @@ -289,9 +289,9 @@ | |||
| 289 | $ sudo dnf install make docbook-style-dsssl docbook-style-xsl \ | 289 | $ sudo dnf install make docbook-style-dsssl docbook-style-xsl \ |
| 290 | docbook-dtds docbook-utils fop libxslt dblatex xmlto xsltproc | 290 | docbook-dtds docbook-utils fop libxslt dblatex xmlto xsltproc |
| 291 | </literallayout></para></listitem> | 291 | </literallayout></para></listitem> |
| 292 | <listitem><para><emphasis>ADT Installer Extras:</emphasis> | 292 | <listitem><para><emphasis>SDK Installer Extras:</emphasis> |
| 293 | Packages needed if you are going to be using the | 293 | Packages needed if you are going to be using the |
| 294 | <ulink url='&YOCTO_DOCS_ADT_URL;#using-the-adt-installer'>Application Development Toolkit (ADT) Installer</ulink>: | 294 | standard or extensible SDK: |
| 295 | <literallayout class='monospaced'> | 295 | <literallayout class='monospaced'> |
| 296 | $ sudo dnf install autoconf automake libtool glib2-devel libarchive-devel | 296 | $ sudo dnf install autoconf automake libtool glib2-devel libarchive-devel |
| 297 | </literallayout></para></listitem> | 297 | </literallayout></para></listitem> |
| @@ -332,9 +332,9 @@ | |||
| 332 | <literallayout class='monospaced'> | 332 | <literallayout class='monospaced'> |
| 333 | $ sudo zypper install make fop xsltproc dblatex xmlto | 333 | $ sudo zypper install make fop xsltproc dblatex xmlto |
| 334 | </literallayout></para></listitem> | 334 | </literallayout></para></listitem> |
| 335 | <listitem><para><emphasis>ADT Installer Extras:</emphasis> | 335 | <listitem><para><emphasis>SDK Installer Extras:</emphasis> |
| 336 | Packages needed if you are going to be using the | 336 | Packages needed if you are going to be using the |
| 337 | <ulink url='&YOCTO_DOCS_ADT_URL;#using-the-adt-installer'>Application Development Toolkit (ADT) Installer</ulink>: | 337 | standard or extensible SDK: |
| 338 | <literallayout class='monospaced'> | 338 | <literallayout class='monospaced'> |
| 339 | $ sudo zypper install autoconf automake libtool glib2-devel libarchive-devel | 339 | $ sudo zypper install autoconf automake libtool glib2-devel libarchive-devel |
| 340 | </literallayout></para></listitem> | 340 | </literallayout></para></listitem> |
| @@ -387,9 +387,9 @@ | |||
| 387 | $ sudo yum install make docbook-style-dsssl docbook-style-xsl \ | 387 | $ sudo yum install make docbook-style-dsssl docbook-style-xsl \ |
| 388 | docbook-dtds docbook-utils fop libxslt dblatex xmlto xsltproc | 388 | docbook-dtds docbook-utils fop libxslt dblatex xmlto xsltproc |
| 389 | </literallayout></para></listitem> | 389 | </literallayout></para></listitem> |
| 390 | <listitem><para><emphasis>ADT Installer Extras:</emphasis> | 390 | <listitem><para><emphasis>SDK Installer Extras:</emphasis> |
| 391 | Packages needed if you are going to be using the | 391 | Packages needed if you are going to be using the |
| 392 | <ulink url='&YOCTO_DOCS_ADT_URL;#using-the-adt-installer'>Application Development Toolkit (ADT) Installer</ulink>: | 392 | standard or extensible SDK: |
| 393 | <literallayout class='monospaced'> | 393 | <literallayout class='monospaced'> |
| 394 | $ sudo yum install autoconf automake libtool glib2-devel libarchive-devel | 394 | $ sudo yum install autoconf automake libtool glib2-devel libarchive-devel |
| 395 | </literallayout></para></listitem> | 395 | </literallayout></para></listitem> |