build: fix the build on centos8 69/27469/2
authorYichen Wang <yicwang@cisco.com>
Tue, 9 Jun 2020 00:13:01 +0000 (17:13 -0700)
committerBenoît Ganne <bganne@cisco.com>
Mon, 15 Jun 2020 16:12:48 +0000 (16:12 +0000)
Add missing dependencies and correct the building to support CentOS8

Type: make

Change-Id: Ie15b9b1174fa9b6d5ae02bace36ebc77e17d770c
Signed-off-by: Yichen Wang <yicwang@cisco.com>
Makefile

index d06120b..a35fac5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -105,6 +105,8 @@ RPM_DEPENDS += selinux-policy selinux-policy-devel
 RPM_DEPENDS += ninja-build
 RPM_DEPENDS += libuuid-devel
 RPM_DEPENDS += mbedtls-devel
+RPM_DEPENDS += ccache
+RPM_DEPENDS += xmlto
 
 ifeq ($(OS_ID),fedora)
        RPM_DEPENDS += dnf-utils
@@ -118,7 +120,7 @@ ifeq ($(OS_ID),fedora)
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
        RPM_DEPENDS += yum-utils
        RPM_DEPENDS += compat-openssl10
-       RPM_DEPENDS += python36-devel python3-ply
+       RPM_DEPENDS += python2-devel python36-devel python3-ply
        RPM_DEPENDS += python3-virtualenv python3-jsonschema
        RPM_DEPENDS += cmake
        RPM_DEPENDS_GROUPS = 'Development Tools'
@@ -318,6 +320,8 @@ ifeq ($(OS_ID),rhel)
        @sudo -E yum install $(CONFIRM) $(RPM_DEPENDS)
        @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
+       @sudo -E dnf install $(CONFIRM) epel-release
+       @sudo -E dnf config-manager --set-enabled PowerTools
        @sudo -E dnf groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
        @sudo -E dnf install $(CONFIRM) $(RPM_DEPENDS)
 else ifeq ($(OS_ID),centos)