From 84a3b526010b7170c7cb7cd60a56217a11a58adf Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Mon, 4 Jan 2021 13:03:37 +0100 Subject: [PATCH] conmon-2.0.22-0.10.dev.git%{shortcommit0}.el9 - exclude i686 as golang is not suppoerted there Signed-off-by: Jindrich Novy --- .gitignore | 78 +------------------------------------------ README.md | 3 -- conmon.spec | 46 +++++++++++-------------- gating.yaml | 14 -------- sources | 2 +- tests/test_podman.sh | 17 ---------- tests/test_podman.yml | 23 ------------- tests/tests.yml | 1 - 8 files changed, 22 insertions(+), 162 deletions(-) delete mode 100644 README.md delete mode 100644 gating.yaml delete mode 100755 tests/test_podman.sh delete mode 100644 tests/test_podman.yml delete mode 100644 tests/tests.yml diff --git a/.gitignore b/.gitignore index 49b5f0b..f6a3a77 100644 --- a/.gitignore +++ b/.gitignore @@ -1,77 +1 @@ -/conmon-e217fdf.tar.gz -/conmon-422ce21.tar.gz -/conmon-4dc8bcf.tar.gz -/conmon-bc758d8.tar.gz -/conmon-002da25.tar.gz -/conmon-098fcce.tar.gz -/conmon-f6d23b5.tar.gz -/conmon-42bce45.tar.gz -/conmon-df8c6aa.tar.gz -/conmon-fd5ac47.tar.gz -/conmon-c792503.tar.gz -/conmon-bc9e976.tar.gz -/conmon-ba14d9c.tar.gz -/conmon-8ba9575.tar.gz -/conmon-95ed45a.tar.gz -/conmon-4100fb2.tar.gz -/conmon-036ff29.tar.gz -/conmon-c8f7443.tar.gz -/conmon-c2e2e67.tar.gz -/conmon-b17d81b.tar.gz -/conmon-1560392.tar.gz -/conmon-b7bfc7b.tar.gz -/conmon-6e39a83.tar.gz -/conmon-26f6817.tar.gz -/conmon-ad05887.tar.gz -/conmon-5039b44.tar.gz -/conmon-ccfdbb6.tar.gz -/conmon-77f4a51.tar.gz -/conmon-86aa80b.tar.gz -/conmon-51c0e7b.tar.gz -/conmon-849ab62.tar.gz -/conmon-1b53637.tar.gz -/conmon-b97c274.tar.gz -/conmon-ff29dd6.tar.gz -/conmon-89b2478.tar.gz -/conmon-3ea6c68.tar.gz -/conmon-9c9b3e7.tar.gz -/conmon-b763fdd.tar.gz -/conmon-e34c6d6.tar.gz -/conmon-42cb289.tar.gz -/conmon-6fa9c2a.tar.gz -/conmon-edd4aaa.tar.gz -/conmon-82e9358.tar.gz -/conmon-27eb304.tar.gz -/conmon-27bb67e.tar.gz -/conmon-d0f367d.tar.gz -/conmon-63d0e3d.tar.gz -/conmon-d951a5a.tar.gz -/conmon-f12e90b.tar.gz -/conmon-50aeae4.tar.gz -/conmon-f951578.tar.gz -/conmon-2c32b99.tar.gz -/conmon-96ea3a2.tar.gz -/conmon-ab8f5e5.tar.gz -/conmon-42414b8.tar.gz -/conmon-9a1d403.tar.gz -/conmon-eff699e.tar.gz -/conmon-4fea27e.tar.gz -/conmon-3c396d4.tar.gz -/conmon-5bc12e0.tar.gz -/conmon-fe1563c.tar.gz -/conmon-5a6b2ac.tar.gz -/conmon-7ab6aa1.tar.gz -/conmon-76548e1.tar.gz -/conmon-9d61f0f.tar.gz -/conmon-6eb222d.tar.gz -/conmon-1d7b3a5.tar.gz -/conmon-668b748.tar.gz -/conmon-bc88ac5.tar.gz -/conmon-dd4fc17.tar.gz -/conmon-eb93261.tar.gz -/conmon-d213bfa.tar.gz -/conmon-59c2817.tar.gz -/conmon-162c363.tar.gz -/conmon-e5e2b93.tar.gz -/conmon-a0ddcb9.tar.gz -/conmon-2fbeb9f.tar.gz +/*.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index cca17b0..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# conmon - -The conmon package \ No newline at end of file diff --git a/conmon.spec b/conmon.spec index e65948c..718bfb2 100644 --- a/conmon.spec +++ b/conmon.spec @@ -1,54 +1,45 @@ -%global with_debug 1 %global with_check 0 -%if 0%{?with_debug} %global _find_debuginfo_dwz_opts %{nil} %global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%endif -%global provider github -%global provider_tld com -%global project containers -%global repo conmon # https://github.com/containers/conmon -%global import_path %{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 2fbeb9f01d65b1feecffb4816f0d3ec9e3265351 -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%global import_path github.com/containers/%{name} %global git0 https://%{import_path} -# Used for comparing with latest upstream tag -# to decide whether to autobuild (non-rawhide only) -%global built_tag v2.0.20 - -Name: %{repo} +Name: conmon Epoch: 2 Version: 2.0.22 -Release: 0.9.dev.git%{shortcommit0}%{?dist} +Release: 1 Summary: OCI container runtime monitor License: ASL 2.0 URL: %{git0} -Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz +Source0: %{git0}/archive/v%{version}.tar.gz +# https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures +#ExclusiveArch: %%{go_arches} +# still use arch exclude as the macro above still refers %%{ix86} in RHEL8.4: +# https://bugzilla.redhat.com/show_bug.cgi?id=1905383 +ExcludeArch: %{ix86} BuildRequires: gcc BuildRequires: git BuildRequires: glib2-devel BuildRequires: systemd-devel -BuildRequires: systemd-libs -Requires: glib2 -Requires: systemd-libs +BuildRequires: golang >= 1.12.12-4 +BuildRequires: go-md2man %description %{summary}. %prep -%autosetup -Sgit -n %{name}-%{commit0} +%autosetup -Sgit %build -%{__make} DEBUGTAG="enable_debug" all +export CFLAGS="%{optflags} -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" +export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" +%{__make} all %install -%{__make} PREFIX=%{buildroot}%{_prefix} install install.crio +%{__make} PREFIX=%{buildroot}%{_prefix} install #define license tag if not already defined %{!?_licensedir:%global license %doc} @@ -57,9 +48,12 @@ Requires: systemd-libs %license LICENSE %doc README.md %{_bindir}/%{name} -%{_libexecdir}/crio/%{name} +%{_mandir}/man8/* %changelog +* Mon Jan 04 2021 Jindrich Novy - 2:2.0.22-1 +- exclude i686 as golang is not suppoerted there + * Fri Nov 13 2020 RH Container Bot - 2:2.0.22-0.9.dev.git2fbeb9f - autobuilt 2fbeb9f diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index c8a218f..0000000 --- a/gating.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- !Policy -product_versions: - - fedora-* -decision_context: bodhi_update_push_stable -subject_type: koji_build -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} ---- !Policy -product_versions: - - fedora-* -decision_context: bodhi_update_push_testing -subject_type: koji_build -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/sources b/sources index 6e2a465..58b036a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (conmon-2fbeb9f.tar.gz) = bdd25b9c1ff0ac4607428aa1808f81fa77ef79bb2cfd4e6dbd0be9814fa3c88e79590239b141a2717047fc48f0c3f99406bb8bff278e7690fa9a057346432be7 +SHA512 (v2.0.22.tar.gz) = fcde9bb05916d19926082bc7343a484069691ea5d6acf46461258d34bb47421fb9851f6783297bb4b0336d84aa30f9fc2fbd586806bafbfad95dd53f62aa1a39 diff --git a/tests/test_podman.sh b/tests/test_podman.sh deleted file mode 100755 index 75bcc53..0000000 --- a/tests/test_podman.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -e -# -# Simple podman tests -# - -# Log program and kernel versions -echo "Important package versions:" -( - uname -r - rpm -qa | egrep 'podman|conmon|crun|runc|iptable|slirp|systemd|container-selinux' | sort -) | sed -e 's/^/ /' - -# Log environment; or at least the useful bits -echo "Environment:" -env | grep -v LS_COLORS= | sort | sed -e 's/^/ /' - -bats /usr/share/podman/test/system diff --git a/tests/test_podman.yml b/tests/test_podman.yml deleted file mode 100644 index afd80c6..0000000 --- a/tests/test_podman.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - - container - required_packages: - - bats - - conmon - - podman - - podman-tests - tests: - - root-test: - dir: ./ - run: ./test_podman.sh - timeout: 15m - - rootless-test: - # running the test with su doesn't create the directory for fedora user on /run/user/ - # so create it manually - dir: ./ - run: loginctl enable-linger fedora; su -c ${PWD}/test_podman.sh - fedora - timeout: 15m diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 80caee7..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1 +0,0 @@ -- import_playbook: test_podman.yml