diff options
author | Kristi Rifenbark <kristi@buzzcollectivemarketing.com> | 2018-01-18 15:35:58 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-14 15:24:42 +0000 |
commit | 6657e86f00e31bbe2b6ecbfdc34ff61a4977e387 (patch) | |
tree | bc00b6d27ed14f2ee2559dbef426c70e8725c1e2 | |
parent | 759a8085afee51abbe36b0bbfe5bf845f41e0971 (diff) | |
download | poky-6657e86f00e31bbe2b6ecbfdc34ff61a4977e387.tar.gz |
ref-manual, yocto-project-qs, poky.ent: Fixed CentOS package
Fixes [YOCTO #12467]
Changed the CentOS variable to use python34-pip
instead of python3-pip. Removed notes indicating
CentOS 6.x exceptions because this version does
not support CentOS 6.x.
(From yocto-docs rev: 7134eb2ac156b86ef844a9a46c4a8a9444ff6770)
Signed-off-by: Kristi Rifenbark <kristi@buzzcollectivemarketing.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | documentation/poky.ent | 3 | ||||
-rw-r--r-- | documentation/ref-manual/introduction.xml | 12 | ||||
-rw-r--r-- | documentation/yocto-project-qs/yocto-project-qs.xml | 8 |
3 files changed, 1 insertions, 22 deletions
diff --git a/documentation/poky.ent b/documentation/poky.ent index beec7bb56b..0363acf35e 100644 --- a/documentation/poky.ent +++ b/documentation/poky.ent | |||
@@ -71,5 +71,4 @@ | |||
71 | python3-pexpect"> | 71 | python3-pexpect"> |
72 | <!ENTITY CENTOS_HOST_PACKAGES_ESSENTIAL "gawk make wget tar bzip2 gzip python unzip perl patch \ | 72 | <!ENTITY CENTOS_HOST_PACKAGES_ESSENTIAL "gawk make wget tar bzip2 gzip python unzip perl patch \ |
73 | diffutils diffstat git cpp gcc gcc-c++ glibc-devel texinfo chrpath socat \ | 73 | diffutils diffstat git cpp gcc gcc-c++ glibc-devel texinfo chrpath socat \ |
74 | perl-Data-Dumper perl-Text-ParseWords perl-Thread-Queue python3-pip python3-pexpect"> | 74 | perl-Data-Dumper perl-Text-ParseWords perl-Thread-Queue python34-pip python3-pexpect"> |
75 | |||
diff --git a/documentation/ref-manual/introduction.xml b/documentation/ref-manual/introduction.xml index ddf6a860eb..0958db0f7b 100644 --- a/documentation/ref-manual/introduction.xml +++ b/documentation/ref-manual/introduction.xml | |||
@@ -351,18 +351,6 @@ | |||
351 | <para> | 351 | <para> |
352 | The following list shows the required packages by function | 352 | The following list shows the required packages by function |
353 | given a supported CentOS Linux distribution: | 353 | given a supported CentOS Linux distribution: |
354 | <note> | ||
355 | For CentOS 6.x, some of the versions of the components | ||
356 | provided by the distribution are too old (e.g. Git, Python, | ||
357 | and tar). | ||
358 | It is recommended that you install the buildtools in order | ||
359 | to provide versions that will work with the OpenEmbedded | ||
360 | build system. | ||
361 | For information on how to install the buildtools tarball, | ||
362 | see the | ||
363 | "<link linkend='required-git-tar-and-python-versions'>Required Git, Tar, and Python Versions</link>" | ||
364 | section. | ||
365 | </note> | ||
366 | <itemizedlist> | 354 | <itemizedlist> |
367 | <listitem><para><emphasis>Essentials:</emphasis> | 355 | <listitem><para><emphasis>Essentials:</emphasis> |
368 | Packages needed to build an image for a headless | 356 | Packages needed to build an image for a headless |
diff --git a/documentation/yocto-project-qs/yocto-project-qs.xml b/documentation/yocto-project-qs/yocto-project-qs.xml index 950a4ff8be..e3cddd949b 100644 --- a/documentation/yocto-project-qs/yocto-project-qs.xml +++ b/documentation/yocto-project-qs/yocto-project-qs.xml | |||
@@ -322,14 +322,6 @@ | |||
322 | $ sudo yum install &CENTOS_HOST_PACKAGES_ESSENTIAL; \ | 322 | $ sudo yum install &CENTOS_HOST_PACKAGES_ESSENTIAL; \ |
323 | SDL-devel xterm | 323 | SDL-devel xterm |
324 | </literallayout> | 324 | </literallayout> |
325 | <note> | ||
326 | CentOS 6.x users need to ensure that the required | ||
327 | versions of Git, tar and Python are available. | ||
328 | For details, See the | ||
329 | "<ulink url='&YOCTO_DOCS_REF_URL;#required-git-tar-and-python-versions'>Required Git, tar, and Python Versions</ulink>" | ||
330 | section in the Yocto Project Reference Manual for | ||
331 | information. | ||
332 | </note> | ||
333 | </para></listitem> | 325 | </para></listitem> |
334 | </itemizedlist> | 326 | </itemizedlist> |
335 | </para> | 327 | </para> |