Upgrade version to 2.1.0
(cherry picked from commit 7a2939565c6ea77b510616dc4906089712979677)
This commit is contained in:
parent
6f85f0f4e8
commit
5f80356d27
Binary file not shown.
BIN
conmon-bdb4f6e.tar.gz
Normal file
BIN
conmon-bdb4f6e.tar.gz
Normal file
Binary file not shown.
27
conmon.spec
27
conmon.spec
@ -1,22 +1,35 @@
|
||||
Name: conmon
|
||||
Epoch: 2
|
||||
Version: 2.0.2
|
||||
Release: 4
|
||||
Version: 2.1.0
|
||||
Release: 1
|
||||
Summary: Monitoring program for OCI container
|
||||
License: ASL 2.0
|
||||
URL: https://github.com/containers/conmon
|
||||
Source0: https://github.com/containers/conmon/archive/65fe0226d85b69fc9e527e376795c9791199153d/conmon-65fe022.tar.gz
|
||||
BuildRequires: glib2-devel gcc
|
||||
Source0: https://github.com/containers/conmon/archive/bdb4f6e56cd193d40b75ffc9725d4b74a18cb33c/conmon-bdb4f6e.tar.gz
|
||||
Source1: https://github.com/cpuguy83/go-md2man/archive/v1.0.10.tar.gz
|
||||
|
||||
BuildRequires: glib2-devel gcc git libseccomp-devel systemd-devel systemd-libs make golang
|
||||
Requires: glib2 systemd-libs libseccomp
|
||||
|
||||
%description
|
||||
Conmon is a monitoring program and communication tool between a container manager (like podman or CRI-O)
|
||||
and an OCI runtime (like runc or crun) for a single container.
|
||||
|
||||
%prep
|
||||
%autosetup -n conmon-65fe0226d85b69fc9e527e376795c9791199153d -p1
|
||||
%autosetup -n conmon-bdb4f6e56cd193d40b75ffc9725d4b74a18cb33c -p1
|
||||
|
||||
tar -xf %SOURCE1
|
||||
|
||||
%build
|
||||
GO_MD2MAN_PATH="$(pwd)%{_bindir}"
|
||||
mkdir -p _build/bin $GO_MD2MAN_PATH
|
||||
cd go-md2man-*
|
||||
go build -mod=vendor -o ../_build/bin/go-md2man .
|
||||
cp ../_build/bin/go-md2man $GO_MD2MAN_PATH/go-md2man
|
||||
export PATH=$GO_MD2MAN_PATH:$PATH
|
||||
cd -
|
||||
export CFLAGS="${RPM_OPT_FLAGS}"
|
||||
export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
|
||||
%make_build all
|
||||
|
||||
%install
|
||||
@ -27,8 +40,12 @@ make PREFIX=%{buildroot}%{_prefix} install install.crio
|
||||
%doc README.md
|
||||
%{_bindir}/conmon
|
||||
%{_libexecdir}/crio/conmon
|
||||
%{_mandir}/man8/*
|
||||
|
||||
%changelog
|
||||
* Thu Mar 16 2022 liukuo <liukuo@kylinos.cn> - 2:2.1.0-1
|
||||
- Upgrade version to 2.1.0
|
||||
|
||||
* Thu Sep 09 2021 lingsheng <lingsheng@huawei.com> - 2:2.0.2-4
|
||||
- Set CFLAGS to build debug related rpm
|
||||
|
||||
|
||||
BIN
v1.0.10.tar.gz
Normal file
BIN
v1.0.10.tar.gz
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user