Compare commits

..

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
69ce06d851
!13 Upgrade to 2.1.10
From: @maqi77 
Reviewed-by: @wang--ge 
Signed-off-by: @wang--ge
2024-02-29 01:11:36 +00:00
maqi
9b0ca2810c Upgrade to 2.1.10 2024-01-17 19:32:53 +08:00
openeuler-ci-bot
c334f0b370
!12 Upgrade to 2.1.8
From: @starlet-dx 
Reviewed-by: @wang--ge 
Signed-off-by: @wang--ge
2023-10-17 11:52:14 +00:00
starlet-dx
9f847ba7c1 Upgrade to 2.1.8 2023-10-17 17:15:51 +08:00
openeuler-ci-bot
938deb94b0
!11 conmon在master进行升级,到2.1.5
From: @json-book 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
2023-03-13 06:41:20 +00:00
json_book
99be75980f update version 2.1.5 2023-02-28 00:52:00 +08:00
openeuler-ci-bot
58605d02f4
!10 修复由于tools目录下缺少go-md2man导致的编译失败
From: @cherry530 
Reviewed-by: @gitee-cmd 
Signed-off-by: @gitee-cmd
2023-01-12 06:52:56 +00:00
cherry530
7cee442213 Fix build failure caused by missing go-md2man in tools directory.
Signed-off-by: cherry530 <xuping33@huawei.com>
2023-01-12 14:36:15 +08:00
openeuler-ci-bot
5baf5a37bc
!8 update to 2.1.2
From: @tianlijing 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
2022-09-21 02:56:31 +00:00
tianlijing
6d9ca9204d update to 2.1.2 2022-09-19 18:05:05 +08:00
3 changed files with 20 additions and 5 deletions

BIN
conmon-2.1.10.tar.gz Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,11 +1,11 @@
Name: conmon Name: conmon
Epoch: 2 Epoch: 2
Version: 2.1.0 Version: 2.1.10
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/bdb4f6e56cd193d40b75ffc9725d4b74a18cb33c/conmon-bdb4f6e.tar.gz Source0: https://github.com/containers/conmon/archive/v%{version}/%{name}-%{version}.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,16 +16,17 @@ 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 -n conmon-bdb4f6e56cd193d40b75ffc9725d4b74a18cb33c -p1 %autosetup -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 mkdir -p _build/bin $GO_MD2MAN_PATH tools/build
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}"
@ -43,7 +44,21 @@ make PREFIX=%{buildroot}%{_prefix} install install.crio
%{_mandir}/man8/* %{_mandir}/man8/*
%changelog %changelog
* Thu Mar 16 2022 liukuo <liukuo@kylinos.cn> - 2:2.1.0-1 * Fri Jan 19 2024 maqi <maqi@uniontech.com> 2:2.1.10-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