modify build problem

kubeovn · Dec 9, 2020 · 6483d6e · 6483d6e
1 parent fe967ff
commit 6483d6e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/dist/images/Dockerfile b/dist/images/Dockerfile
@@ -5,7 +5,7 @@ ARG RPM_ARCH
 ARG ARCH
 
 RUN yum install dnf-plugins-core -y && \
-    yum config-manager --set-enabled PowerTools && \
+    yum config-manager --set-enabled powertools && \
     yum install python36 git wget openssl-devel gcc \
     make python3-devel openssl-devel kernel-devel kernel-debug-devel \
     autoconf automake rpm-build redhat-rpm-config libtool libcap-ng-devel \

diff --git a/dist/images/Dockerfile.dpdk1911 b/dist/images/Dockerfile.dpdk1911
@@ -2,26 +2,26 @@ FROM centos:8 as dpdk
 ENV BUILD_DATE 20201021
 ENV RPM_ARCH=x86_64
 
-ENV DPDK_VERSION=19.11
-ENV DPDK_SUBVERSION=4
+ENV DPDK_VERSION=19.11.3
+ENV DPDK_SUBVERSION=1
 ENV OVS_VERSION=2.14
 ENV OVN_VERSION=20.06
 
-ENV DPDK_DIR=/usr/src/dpdk-stable-${DPDK_VERSION}.${DPDK_SUBVERSION}
+ENV DPDK_DIR=/usr/src/dpdk-stable-${DPDK_VERSION}
 ENV OVS_DIR=/usr/src/openvswitch-${OVS_VERSION}
 ENV OVN_DIR=/usr/src/ovn
 
 ENV PATH=${PATH}:/usr/share/openvswitch/scripts
 ENV PATH=${PATH}:/usr/share/ovn/scripts/
 
 RUN yum -y install dpdk-devel-${DPDK_VERSION}-${DPDK_SUBVERSION}.el8 && \
-  dnf install -y --enablerepo=PowerTools \
+  dnf install -y --enablerepo=powertools \
   gcc make numactl-devel meson \
   unbound nc iptables ipset hostname && \
 # Install DPDK
   cd /usr/src/ && \
-  curl http://fast.dpdk.org/rel/dpdk-${DPDK_VERSION}.${DPDK_SUBVERSION}.tar.gz | tar xz && \
-  cd dpdk-stable-${DPDK_VERSION}.${DPDK_SUBVERSION} && \
+  curl http://fast.dpdk.org/rel/dpdk-${DPDK_VERSION}.tar.gz | tar xz && \
+  cd dpdk-stable-${DPDK_VERSION} && \
   meson builddir && cd builddir && \
   meson configure -Dapps='pdump proc-info' -Dexamples='' -Dtests=false -Denable_kmods=false -Denable_docs=false && \
   ninja && ninja install && \
@@ -33,7 +33,7 @@ RUN yum -y install dpdk-devel-${DPDK_VERSION}-${DPDK_SUBVERSION}.el8 && \
 
 FROM dpdk as rpm-builder
 
-RUN dnf install -y --enablerepo=PowerTools 'dnf-command(builddep)' python3-sphinx groff rpm-build libpcap-devel libibverbs-devel
+RUN dnf install -y --enablerepo=powertools 'dnf-command(builddep)' python3-sphinx groff rpm-build libpcap-devel libibverbs-devel
 
 # Build OVS-DPDK
 RUN cd /usr/src/ && \

diff --git a/dist/images/generate-ssl.sh b/dist/images/generate-ssl.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-ovs-pki init --force
+ovs-pki init -l /dev/stdout --force
 cp /var/lib/openvswitch/pki/switchca/cacert.pem /etc/ovn/
 cd /etc/ovn
-ovs-pki req ovn --force
-ovs-pki -b sign ovn --force
+ovs-pki req ovn -l /dev/stdout --force
+ovs-pki -b sign ovn -l /dev/stdout --force