summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristi Rifenbark <kristi@buzzcollectivemarketing.com>2018-01-18 15:35:58 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-14 15:24:54 +0000
commitb22da61ea88e00747530a33e4ee95c015864d2e8 (patch)
treeaf5e3d5c96f79a49dd0698919a7e4f32ff513b2a
parent46d9c400414cd76dc6d84289d2be58f8583e7a56 (diff)
downloadpoky-b22da61ea88e00747530a33e4ee95c015864d2e8.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: ad9328b660deced90d13315cff968fb92569eef9) Signed-off-by: Kristi Rifenbark <kristi@buzzcollectivemarketing.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--documentation/poky.ent2
-rw-r--r--documentation/ref-manual/introduction.xml12
-rw-r--r--documentation/yocto-project-qs/yocto-project-qs.xml9
3 files changed, 1 insertions, 22 deletions
diff --git a/documentation/poky.ent b/documentation/poky.ent
index a9e61ae518..c924d2619b 100644
--- a/documentation/poky.ent
+++ b/documentation/poky.ent
@@ -74,5 +74,5 @@
74 $ sudo yum makecache 74 $ sudo yum makecache
75 $ sudo yum install gawk make wget tar bzip2 gzip python unzip perl patch \ 75 $ sudo yum install gawk make wget tar bzip2 gzip python unzip perl patch \
76 diffutils diffstat git cpp gcc gcc-c++ glibc-devel texinfo chrpath socat \ 76 diffutils diffstat git cpp gcc gcc-c++ glibc-devel texinfo chrpath socat \
77 perl-Data-Dumper perl-Text-ParseWords perl-Thread-Queue python3-pip xz \ 77 perl-Data-Dumper perl-Text-ParseWords perl-Thread-Queue python34-pip xz \
78 which"> 78 which">
diff --git a/documentation/ref-manual/introduction.xml b/documentation/ref-manual/introduction.xml
index c06a748867..eec6cb34f1 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 6182b97fdd..b4b3f4bd0e 100644
--- a/documentation/yocto-project-qs/yocto-project-qs.xml
+++ b/documentation/yocto-project-qs/yocto-project-qs.xml
@@ -340,15 +340,6 @@
340 <note><title>Notes</title> 340 <note><title>Notes</title>
341 <itemizedlist> 341 <itemizedlist>
342 <listitem><para> 342 <listitem><para>
343 CentOS 6.x users need to ensure that the
344 required versions of Git, tar and Python
345 are available.
346 For details, See the
347 "<ulink url='&YOCTO_DOCS_REF_URL;#required-git-tar-and-python-versions'>Required Git, tar, and Python Versions</ulink>"
348 section in the Yocto Project Reference
349 Manual for information.
350 </para></listitem>
351 <listitem><para>
352 Extra Packages for Enterprise Linux 343 Extra Packages for Enterprise Linux
353 (i.e. <filename>epel-release</filename>) 344 (i.e. <filename>epel-release</filename>)
354 is a collection of packages from Fedora 345 is a collection of packages from Fedora