Compare commits

..

No commits in common. "69ce06d851c36d5baff620b19764688260d86c92" and "65ec28d65a1d6c485fea48d2ebd6cfc2fb13fa37" have entirely different histories.

3 changed files with 5 additions and 20 deletions

Binary file not shown.

BIN
conmon-bdb4f6e.tar.gz Normal file

Binary file not shown.

View File

@ -1,11 +1,11 @@
Name: conmon Name: conmon
Epoch: 2 Epoch: 2
Version: 2.1.10 Version: 2.1.0
Release: 1 Release: 1
Summary: Monitoring program for OCI container Summary: Monitoring program for OCI container
License: ASL 2.0 License: ASL 2.0
URL: https://github.com/containers/conmon URL: https://github.com/containers/conmon
Source0: https://github.com/containers/conmon/archive/v%{version}/%{name}-%{version}.tar.gz 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 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 BuildRequires: glib2-devel gcc git libseccomp-devel systemd-devel systemd-libs make golang
@ -16,17 +16,16 @@ Conmon is a monitoring program and communication tool between a container manage
and an OCI runtime (like runc or crun) for a single container. and an OCI runtime (like runc or crun) for a single container.
%prep %prep
%autosetup -p1 %autosetup -n conmon-bdb4f6e56cd193d40b75ffc9725d4b74a18cb33c -p1
tar -xf %SOURCE1 tar -xf %SOURCE1
%build %build
GO_MD2MAN_PATH="$(pwd)%{_bindir}" GO_MD2MAN_PATH="$(pwd)%{_bindir}"
mkdir -p _build/bin $GO_MD2MAN_PATH tools/build mkdir -p _build/bin $GO_MD2MAN_PATH
cd go-md2man-* cd go-md2man-*
go build -mod=vendor -o ../_build/bin/go-md2man . go build -mod=vendor -o ../_build/bin/go-md2man .
cp ../_build/bin/go-md2man $GO_MD2MAN_PATH/go-md2man cp ../_build/bin/go-md2man $GO_MD2MAN_PATH/go-md2man
cp ../_build/bin/go-md2man ../tools/build/
export PATH=$GO_MD2MAN_PATH:$PATH export PATH=$GO_MD2MAN_PATH:$PATH
cd - cd -
export CFLAGS="${RPM_OPT_FLAGS}" export CFLAGS="${RPM_OPT_FLAGS}"
@ -44,21 +43,7 @@ make PREFIX=%{buildroot}%{_prefix} install install.crio
%{_mandir}/man8/* %{_mandir}/man8/*
%changelog %changelog
* Fri Jan 19 2024 maqi <maqi@uniontech.com> 2:2.1.10-1 * Thu Mar 16 2022 liukuo <liukuo@kylinos.cn> - 2:2.1.0-1
- Upgrade to 2.1.10
* Tue Oct 17 2023 yaoxin <yao_xin001@hoperun.com> 2:2.1.8-1
- Upgrade to 2.1.8
* Thu Feb 02 2023 wenchaofan <349464272@qq.com> - 2:2.1.5-2
- update to 2.1.5
* Thu Jan 12 2023 xu_ping <xuping33@h-partners.com> - 2:2.1.2-2
- Fix build failure caused by missing go-md2man in tools directory.
* Sun Sep 04 2022 tianlijing <tianlijing@kylinos.cn> - 2:2.1.2-1
- update to 2.1.2
* Mon Mar 16 2022 liukuo <liukuo@kylinos.cn> - 2:2.1.0-1
- Upgrade version to 2.1.0 - Upgrade version to 2.1.0
* Thu Sep 09 2021 lingsheng <lingsheng@huawei.com> - 2:2.0.2-4 * Thu Sep 09 2021 lingsheng <lingsheng@huawei.com> - 2:2.0.2-4