starlingx/integ
Code Issues Proposed changes

CentOS 8: Fix containerd build issues and buildrequires dependencies

Browse Source 
(1) buildrequires: pkgconfig(libsystemd-journal) -> systemd-devel
(2) add '%global debug_package %{nil}' to fix
error:Empty %files file /builddir/build/BUILD/src/debugsourcefiles.list
(3) Uncomment packages

Change-Id: Iaad194dc1fae9238f7270919c8b0494e18ab7fc3
Story: 2006729
Task: 39945
Signed-off-by: Yong Fu <fuyong@neusoft.com>
This commit is contained in:
Yong Fu 2020-06-04 10:18:11 +08:00
parent ca71aaa31a
commit 5f6e275021
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
centos_iso_image.inc
View File

@ -124,7 +124,7 @@ lighttpd-mod_mysql_vhost
logrotate logrotate
# novnc # novnc
#novnc novnc
# sudo # sudo
sudo sudo
@ -145,7 +145,7 @@ openldap-clients
openvswitch openvswitch
# libevent # libevent
#libevent libevent
# tpm2-tools # tpm2-tools
tpm2-tools tpm2-tools
@ -153,7 +153,7 @@ tpm2-tools
# audit # audit
# puppet # puppet
#puppet puppet
# systemd # systemd
systemd systemd
@ -165,15 +165,15 @@ tboot
memcached memcached
# kubernetes # kubernetes
#kubernetes kubernetes
#kubernetes-master kubernetes-master
#kubernetes-node kubernetes-node
#kubernetes-kubeadm kubernetes-kubeadm
#kubernetes-client kubernetes-client
#containerd containerd
# resource-agents # resource-agents
#resource-agents resource-agents
# haproxy # haproxy
@ -183,7 +183,7 @@ haproxy
# iptables # iptables
# python-psycopg2 # python-psycopg2
#python-psycopg2 python3-psycopg2
# dnsmasq # dnsmasq
dnsmasq dnsmasq
@ -193,7 +193,7 @@ dnsmasq-utils
parted parted
# python-keyring # python-keyring
#python3-keyring python3-keyring
# grub2 # grub2
grub2-tools grub2-tools

4
centos_pkg_dirs
View File

@ -53,7 +53,7 @@ storage-drivers/python-lefthandclient
storage-drivers/trident-installer storage-drivers/trident-installer
security/tboot security/tboot
docker/python-docker docker/python-docker
#kubernetes/containerd kubernetes/containerd
kubernetes/kubernetes kubernetes/kubernetes
kubernetes/docker-distribution kubernetes/docker-distribution
kubernetes/etcd kubernetes/etcd
@ -79,4 +79,4 @@ virt/kvm-timer-advance
requests-toolbelt requests-toolbelt
python/python-mechanize python/python-mechanize
python/python-html5lib python/python-html5lib
python/python-webencodings #python/python-webencodings

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

@ -21,7 +21,7 @@ Packager: StarlingX
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libseccomp)
BuildRequires: pkgconfig(libsystemd-journal) BuildRequires: systemd-devel
BuildRequires: golang >= 1.12.16 BuildRequires: golang >= 1.12.16
BuildRequires: systemd BuildRequires: systemd
BuildRequires: rsync BuildRequires: rsync
@ -40,6 +40,7 @@ Provides: containerd.io
%global _missing_build_ids_terminate_build 0 %global _missing_build_ids_terminate_build 0
%global debug_package %{nil}
%define CONTAINERD_DIR ${HOME}/go/src/github.com/containerd/containerd %define CONTAINERD_DIR ${HOME}/go/src/github.com/containerd/containerd
%define RUNC_DIR ${HOME}/go/src/github.com/opencontainers/runc %define RUNC_DIR ${HOME}/go/src/github.com/opencontainers/runc