diff options
author | Scott Rifenbark <srifenbark@gmail.com> | 2017-06-12 09:25:05 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-14 10:19:41 +0100 |
commit | e707865a6ac2ffc729c929df580cc3ba30cef484 (patch) | |
tree | f5806ba48052a5a3358fc15c1bcdfd34e2ff7b00 | |
parent | 47fc2d6139dbe34fcd752b3e91de59c25a9aa03d (diff) | |
download | poky-e707865a6ac2ffc729c929df580cc3ba30cef484.tar.gz |
yocto-project-qs, poky.ent: Fixed pip3 and pexpect package names
Fixes [YOCTO #11578]
The package names "pip3" and "pexpect" do not exist for Ubuntu
and Debian. They need to be "python3-pip3" and "python3-pexpect".
I changed them in the poky.ent file and did some reformatting so
the install lines appear nice. I updated the other distributions
as well.
(From yocto-docs rev: 43c92b88c40815d906cfc5fabb3190b0aa4778c7)
Signed-off-by: Scott Rifenbark <srifenbark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | documentation/poky.ent | 9 | ||||
-rw-r--r-- | documentation/yocto-project-qs/yocto-project-qs.xml | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/documentation/poky.ent b/documentation/poky.ent index 3756927305..364020792a 100644 --- a/documentation/poky.ent +++ b/documentation/poky.ent | |||
@@ -61,14 +61,15 @@ | |||
61 | <!ENTITY OE_INIT_PATH "&YOCTO_POKY;/oe-init-build-env"> | 61 | <!ENTITY OE_INIT_PATH "&YOCTO_POKY;/oe-init-build-env"> |
62 | <!ENTITY OE_INIT_FILE "oe-init-build-env"> | 62 | <!ENTITY OE_INIT_FILE "oe-init-build-env"> |
63 | <!ENTITY UBUNTU_HOST_PACKAGES_ESSENTIAL "gawk wget git-core diffstat unzip texinfo gcc-multilib \ | 63 | <!ENTITY UBUNTU_HOST_PACKAGES_ESSENTIAL "gawk wget git-core diffstat unzip texinfo gcc-multilib \ |
64 | build-essential chrpath socat cpio python python3 pip3 pexpect"> | 64 | build-essential chrpath socat cpio python python3 python3-pip python3-pexpect"> |
65 | <!ENTITY FEDORA_HOST_PACKAGES_ESSENTIAL "gawk make wget tar bzip2 gzip python3 unzip perl patch \ | 65 | <!ENTITY FEDORA_HOST_PACKAGES_ESSENTIAL "gawk make wget tar bzip2 gzip python3 unzip perl patch \ |
66 | diffutils diffstat git cpp gcc gcc-c++ glibc-devel texinfo chrpath \ | 66 | diffutils diffstat git cpp gcc gcc-c++ glibc-devel texinfo chrpath \ |
67 | ccache perl-Data-Dumper perl-Text-ParseWords perl-Thread-Queue perl-bignum socat \ | 67 | ccache perl-Data-Dumper perl-Text-ParseWords perl-Thread-Queue perl-bignum socat \ |
68 | findutils which file cpio python pip3 pexpect"> | 68 | findutils which file cpio python python3-pip python3-pexpect"> |
69 | <!ENTITY OPENSUSE_HOST_PACKAGES_ESSENTIAL "python gcc gcc-c++ git chrpath make wget python-xml \ | 69 | <!ENTITY OPENSUSE_HOST_PACKAGES_ESSENTIAL "python gcc gcc-c++ git chrpath make wget python-xml \ |
70 | diffstat makeinfo python-curses patch socat python3 python3-curses tar pip3 pexpect"> | 70 | diffstat makeinfo python-curses patch socat python3 python3-curses tar python3-pip \ |
71 | python3-pexpect"> | ||
71 | <!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 \ |
72 | 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 \ |
73 | perl-Data-Dumper perl-Text-ParseWords perl-Thread-Queue pip3 pexpect"> | 74 | perl-Data-Dumper perl-Text-ParseWords perl-Thread-Queue python3-pip python3-pexpect"> |
74 | 75 | ||
diff --git a/documentation/yocto-project-qs/yocto-project-qs.xml b/documentation/yocto-project-qs/yocto-project-qs.xml index 7f3d1896c1..950a4ff8be 100644 --- a/documentation/yocto-project-qs/yocto-project-qs.xml +++ b/documentation/yocto-project-qs/yocto-project-qs.xml | |||
@@ -302,7 +302,8 @@ | |||
302 | <itemizedlist> | 302 | <itemizedlist> |
303 | <listitem><para><emphasis>Ubuntu and Debian</emphasis> | 303 | <listitem><para><emphasis>Ubuntu and Debian</emphasis> |
304 | <literallayout class='monospaced'> | 304 | <literallayout class='monospaced'> |
305 | $ sudo apt-get install &UBUNTU_HOST_PACKAGES_ESSENTIAL; libsdl1.2-dev xterm | 305 | $ sudo apt-get install &UBUNTU_HOST_PACKAGES_ESSENTIAL; \ |
306 | libsdl1.2-dev xterm | ||
306 | </literallayout> | 307 | </literallayout> |
307 | </para></listitem> | 308 | </para></listitem> |
308 | <listitem><para><emphasis>Fedora</emphasis> | 309 | <listitem><para><emphasis>Fedora</emphasis> |
@@ -318,7 +319,8 @@ | |||
318 | </para></listitem> | 319 | </para></listitem> |
319 | <listitem><para><emphasis>CentOS</emphasis> | 320 | <listitem><para><emphasis>CentOS</emphasis> |
320 | <literallayout class='monospaced'> | 321 | <literallayout class='monospaced'> |
321 | $ sudo yum install &CENTOS_HOST_PACKAGES_ESSENTIAL; SDL-devel xterm | 322 | $ sudo yum install &CENTOS_HOST_PACKAGES_ESSENTIAL; \ |
323 | SDL-devel xterm | ||
322 | </literallayout> | 324 | </literallayout> |
323 | <note> | 325 | <note> |
324 | CentOS 6.x users need to ensure that the required | 326 | CentOS 6.x users need to ensure that the required |