aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Vinciguerra <pvinci@vinciconsulting.com>2019-04-05 06:45:56 -0700
committerDave Wallace <dwallacelf@gmail.com>2019-04-05 16:13:30 +0000
commitccf65fbc0ebc2541a58f67d5e57297b7b1429658 (patch)
treeea41cccccf74550d8a142b5cc2fe38ec2dcaac91
parentae605b89035b26248f245597291474be6ae8ec5e (diff)
Fix failing centos jobs due to yum replacing python34 with python36.
vppapigen is failing because the ply library is installed under python34. 09:04:49 Dependencies Resolved 09:04:49 09:04:49 ================================================================================ 09:04:49 Package Arch Version Repository Size 09:04:49 ================================================================================ 09:04:49 Installing: 09:04:49 python36 x86_64 3.6.6-5.el7 epel 66 k 09:04:49 replacing python34.x86_64 3.4.9-2.el7 09:04:49 python36-libs x86_64 3.6.6-5.el7 epel 8.5 M 09:04:49 replacing python34-libs.x86_64 3.4.9-2.el7 ---- 09:07:27 cd /w/workspace/vpp-verify-master-centos7/build-root/build-vpp-native/vpp/vlibmemory && mkdir -p /w/workspace/vpp-verify-master-centos7/build-root/build-vpp-native/vpp/vlibmemory && /w/workspace/vpp-verify-master-centos7/src/tools/vppapigen/vppapigen --includedir /w/workspace/vpp-verify-master-centos7/src --input /w/workspace/vpp-verify-master-centos7/src/vlibmemory/memclnt.api JSON --output /w/workspace/vpp-verify-master-centos7/build-root/build-vpp-native/vpp/vlibmemory/memclnt.api.json 09:07:27 Traceback (most recent call last): 09:07:27 File "/w/workspace/vpp-verify-master-centos7/src/tools/vppapigen/vppapigen", line 4, in <module> 09:07:27 import ply.lex as lex 09:07:27 ModuleNotFoundError: No module named 'ply' Change-Id: Ica3b408991d26262418576cffc848fb2a8cb0224 Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 57225a41d89..8c7f3523f77 100644
--- a/Makefile
+++ b/Makefile
@@ -100,8 +100,8 @@ ifeq ($(OS_ID),fedora)
else
RPM_DEPENDS += yum-utils
RPM_DEPENDS += openssl-devel
- RPM_DEPENDS += python-devel python34-ply
- RPM_DEPENDS += python34-devel python34-pip
+ RPM_DEPENDS += python-devel python36-ply
+ RPM_DEPENDS += python36-devel python36-pip
RPM_DEPENDS += python-virtualenv
RPM_DEPENDS += devtoolset-7
RPM_DEPENDS += cmake3