From 77b632e28f27ab53a840f098fcfbba3db2714a1f Mon Sep 17 00:00:00 2001 From: Don Penney Date: Wed, 5 Feb 2020 11:28:32 -0500 Subject: [PATCH] Fix containerd build failure The 20200205T023000Z CENGN build failed on containerd due to a build ordering issue. In the failed build, containerd was built ahead of rpm, and the mock build environment for the containerd build ran with the stock CentOS version of RPM. Unfortunately, it appears this version of RPM fails when trying to build the debuginfo for a golang package. There are currently two other golang packages in StarlingX, but these have debuginfo disabled in the spec. Adding a version-specific dependency in the containerd spec to ensure the newer RPM is installed resolves the issue. Change-Id: Ia7c85751012bbd0c3b83a2496bd7424e123eef93 Closes-Bug: 1862038 Co-Authored-By: Scott Little Signed-off-by: Don Penney --- kubernetes/containerd/centos/containerd.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kubernetes/containerd/centos/containerd.spec b/kubernetes/containerd/centos/containerd.spec index 39fcb8810..b91f3c43c 100644 --- a/kubernetes/containerd/centos/containerd.spec +++ b/kubernetes/containerd/centos/containerd.spec @@ -26,6 +26,8 @@ BuildRequires: systemd BuildRequires: rsync BuildRequires: go-md2man BuildRequires: go-bindata +BuildRequires: rpm-devel >= 4.14.0 +BuildRequires: rpm-libs >= 4.14.0 # required packages on install Requires: /bin/sh