starlingx/integ
Code Issues Proposed changes

Fix containerd build failure

Browse Source 
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 <scott.little@windriver.com>
Signed-off-by: Don Penney <don.penney@windriver.com>
This commit is contained in:
Don Penney 2020-02-05 11:28:32 -05:00
parent 8442e616cc
commit 77b632e28f
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kubernetes/containerd/centos/containerd.spec
View File

@ -26,6 +26,8 @@ BuildRequires: systemd
BuildRequires: rsync BuildRequires: rsync
BuildRequires: go-md2man BuildRequires: go-md2man
BuildRequires: go-bindata BuildRequires: go-bindata
BuildRequires: rpm-devel >= 4.14.0
BuildRequires: rpm-libs >= 4.14.0
# required packages on install # required packages on install
Requires: /bin/sh Requires: /bin/sh