From 06669ea3438098ed926090a75875b5edee6692d4 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 28 Sep 2022 14:41:13 -0400 Subject: [PATCH 01/35] local build --- crun.spec | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/crun.spec b/crun.spec index d57b4a2..29a5774 100644 --- a/crun.spec +++ b/crun.spec @@ -43,7 +43,6 @@ BuildRequires: systemd-devel BuildRequires: yajl-devel %if "%{krun_support}" == "enabled" BuildRequires: libkrun-devel -Provides: krun %endif BuildRequires: libseccomp-devel BuildRequires: libselinux-devel @@ -72,19 +71,29 @@ Provides: oci-runtime %install %make_install rm -rf %{buildroot}%{_prefix}/lib* - %if "%{krun_support}" == "enabled" -ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/krun +ln -s ../bin/%{name} %{buildroot}%{_bindir}/krun %endif %files %license COPYING %{_bindir}/%{name} -%if "%{krun_support}" == "enabled" -%{_bindir}/krun -%endif %{_mandir}/man1/* +%if "%{krun_support}" == "enabled" +%package krun +Summary: OCI Runtime providing Virtualization-based process isolation capabilities. +Provides: krun +Requires: libkrun + +%description krun +%{name}-krun OCI Runtime providing Virtualization-based process isolation capabilities. + +%files krun +%{_bindir}/krun + +%endif + %changelog %if "%{_vendor}" != "debbuild" %autochangelog From 13af637c995a1c4521460ceada566c123fbb9b64 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 4 Oct 2022 15:02:13 -0400 Subject: [PATCH 02/35] remove debbuild macros to comply with fedora guidelines Signed-off-by: Lokesh Mandvekar (cherry picked from commit 263de70111d4a49a0ac3fdda1c005997101b1578) Signed-off-by: Lokesh Mandvekar --- crun.spec | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/crun.spec b/crun.spec index 29a5774..503b1de 100644 --- a/crun.spec +++ b/crun.spec @@ -7,34 +7,21 @@ %endif %endif -%global built_tag_strip 1.6 +%global built_tag 1.6 +%global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C Name: crun -Version: 1.6 +Version: %{gen_version} URL: https://github.com/containers/%{name} +# Fetched from upstream Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz -%if "%{_vendor}" == "debbuild" -Packager: Podman Debbuild Maintainers -License: GPL-2.0+ -Release: 0%{?dist} -%else License: GPLv2+ Release: %autorelease -%endif BuildRequires: autoconf BuildRequires: automake BuildRequires: go-md2man BuildRequires: libtool -%if "%{_vendor}" == "debbuild" -BuildRequires: git -BuildRequires: libcap-dev -BuildRequires: libseccomp-dev -BuildRequires: libsystemd-dev -BuildRequires: libyajl-dev -BuildRequires: pkg-config -Requires: criu -%else BuildRequires: gcc BuildRequires: git-core BuildRequires: python3 @@ -54,7 +41,6 @@ BuildRequires: protobuf-c-devel BuildRequires: criu-devel >= 3.17.1-2 %endif Requires: criu >= 3.17.1 -%endif Provides: oci-runtime %description @@ -95,6 +81,4 @@ Requires: libkrun %endif %changelog -%if "%{_vendor}" != "debbuild" %autochangelog -%endif From e31c1d92dc74485db66ae9eb702603b12b1357e8 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Fri, 7 Oct 2022 15:14:05 +0000 Subject: [PATCH 03/35] auto bump to 1.6 (cherry picked from commit aac762a55d4423ef0b3e13a0a90e5718e867a5a3) --- crun.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index 503b1de..ffd5dc2 100644 --- a/crun.spec +++ b/crun.spec @@ -12,7 +12,7 @@ Summary: OCI runtime written in C Name: crun -Version: %{gen_version} +Version: 1.6 URL: https://github.com/containers/%{name} # Fetched from upstream Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz From 9cf267ae7bf4eb0b5bb1c48a6814b7e587af49c7 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 7 Oct 2022 13:28:26 -0400 Subject: [PATCH 04/35] Revert "auto bump to 1.6" This reverts commit aac762a55d4423ef0b3e13a0a90e5718e867a5a3 by autobuilder. (cherry picked from commit 76df75985feee32d052a5975ba8237c81bb86434) Signed-off-by: Lokesh Mandvekar --- crun.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index ffd5dc2..503b1de 100644 --- a/crun.spec +++ b/crun.spec @@ -12,7 +12,7 @@ Summary: OCI runtime written in C Name: crun -Version: 1.6 +Version: %{gen_version} URL: https://github.com/containers/%{name} # Fetched from upstream Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz From ee562b2c5fa604423bd571c73bc62cf4d0ae6751 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Fri, 28 Oct 2022 15:56:02 +0000 Subject: [PATCH 05/35] Add ExclusiveArch If using golang, then you needs to use ExclusiveArch for those arches that do not have golang. (cherry picked from commit db6cce4e02c8d54e79111ed9f719fd0e8345bc3e) Signed-off-by: Lokesh Mandvekar --- crun.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/crun.spec b/crun.spec index 503b1de..2b53582 100644 --- a/crun.spec +++ b/crun.spec @@ -18,6 +18,7 @@ URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz License: GPLv2+ Release: %autorelease +ExclusiveArch: %{golang_arches} BuildRequires: autoconf BuildRequires: automake BuildRequires: go-md2man From 6ba3adc3a39e4dbd703ffb9d8b2fa4d45d1f84e8 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 3 Nov 2022 17:43:59 +0530 Subject: [PATCH 06/35] enable wasm support Currently, wasmedge is the only wasm provider in Fedora. That may change with time. All wasm providers will include a `Provides: wasm-library` which will be a hard dependency for crun along with a weak dependency that the user can change per need. Signed-off-by: Lokesh Mandvekar (cherry picked from commit f0e158812d12f51b877fffde769b6ab893d2054c) Signed-off-by: Lokesh Mandvekar --- crun.spec | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index 2b53582..31abf21 100644 --- a/crun.spec +++ b/crun.spec @@ -7,6 +7,14 @@ %endif %endif +# wasmedge built only for aarch64 and x86_64 +%if 0%{?fedora} >= 36 +%ifarch aarch64 || x86_64 +%global wasm_support enabled +%global wasm_opts --with-wasmedge +%endif +%endif + %global built_tag 1.6 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) @@ -32,6 +40,9 @@ BuildRequires: yajl-devel %if "%{krun_support}" == "enabled" BuildRequires: libkrun-devel %endif +%if "%{wasm_support}" == "enabled" +BuildRequires: wasmedge-devel +%endif BuildRequires: libseccomp-devel BuildRequires: libselinux-devel BuildRequires: python3-libmount @@ -52,7 +63,7 @@ Provides: oci-runtime %build ./autogen.sh -%configure --disable-silent-rules %{krun_opts} +%configure --disable-silent-rules %{krun_opts} %{wasm_opts} %make_build %install @@ -62,6 +73,10 @@ rm -rf %{buildroot}%{_prefix}/lib* ln -s ../bin/%{name} %{buildroot}%{_bindir}/krun %endif +%if "%{wasm_support}" == "enabled" +ln -s ../bin/%{name} %{buildroot}%{_bindir}/%{name}-wasm +%endif + %files %license COPYING %{_bindir}/%{name} @@ -71,6 +86,7 @@ ln -s ../bin/%{name} %{buildroot}%{_bindir}/krun %package krun Summary: OCI Runtime providing Virtualization-based process isolation capabilities. Provides: krun +Requires: %{name} = %{version}-%{release} Requires: libkrun %description krun @@ -78,7 +94,20 @@ Requires: libkrun %files krun %{_bindir}/krun +%endif +%if "%{wasm_support}" == "enabled" +%package wasm +Summary: wasm support for %{name} +Requires: wasm-library +Recommends: wasmedge +Requires: %{name} = %{version}-%{release} + +%description wasm +%{name}-wasm provides %{name} built with wasm support + +%files wasm +%{_bindir}/%{name}-wasm %endif %changelog From 601c0c8103eb79f0fe1e3e53544ad100df43657c Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 7 Nov 2022 07:14:20 -0500 Subject: [PATCH 07/35] local build --- crun.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crun.spec b/crun.spec index 31abf21..a8a285e 100644 --- a/crun.spec +++ b/crun.spec @@ -15,7 +15,7 @@ %endif %endif -%global built_tag 1.6 +%global built_tag 1.7 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C diff --git a/sources b/sources index 223c0de..94f0e6d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.6.tar.xz) = cb0464792df6167719fd21c3e1117dc0d89cf91c60d02b478774d14b73bdf49b0d138578b48803ff5af28f50740f5022b043fdf3198833d4a9b69e40974ced00 +SHA512 (crun-1.7.tar.xz) = acccd5f2c7f058b14147c3260bcc8cbb04eadeef44218086faa331e4335a56a8733c20f105d0c8d1a75878831d74937428fbf3beb3b0c6badc315b61f90224ac From bf0c67aa66e66a012d01c2a50d0be9cd5348b326 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 16 Nov 2022 18:19:48 +0530 Subject: [PATCH 08/35] use correct macro Signed-off-by: Lokesh Mandvekar (cherry picked from commit d68ce50debfbacf9b4a873c188664963a2860318) Signed-off-by: Lokesh Mandvekar --- crun.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index a8a285e..34e454b 100644 --- a/crun.spec +++ b/crun.spec @@ -59,7 +59,7 @@ Provides: oci-runtime %{name} is a runtime for running OCI containers %prep -%autosetup -Sgit %{name}-%{built_tag_strip} +%autosetup -Sgit %{name}-%{built_tag} %build ./autogen.sh From 12baa225fd8440e4f7829ac4e458aeb6710d0365 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 22 Nov 2022 09:34:59 +0530 Subject: [PATCH 09/35] wasmedge present on all active Fedoras Signed-off-by: Lokesh Mandvekar (cherry picked from commit bdd508b2f6ffc64e5e527d105cbd44ec4c60ad74) Signed-off-by: Lokesh Mandvekar --- crun.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/crun.spec b/crun.spec index 34e454b..55ae78c 100644 --- a/crun.spec +++ b/crun.spec @@ -8,12 +8,10 @@ %endif # wasmedge built only for aarch64 and x86_64 -%if 0%{?fedora} >= 36 %ifarch aarch64 || x86_64 %global wasm_support enabled %global wasm_opts --with-wasmedge %endif -%endif %global built_tag 1.7 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) From d464919c004b8d0b6ac98bd9a62149d62d3f9dd2 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 25 Nov 2022 12:57:36 +0100 Subject: [PATCH 10/35] bump to 1.7.1 Signed-off-by: Giuseppe Scrivano (cherry picked from commit 07a7ba9e0170dc0cc5d2889b165f4377193ca3f7) --- .gitignore | 2 ++ crun.spec | 2 +- sources | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c894000..e5ea8fc 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,5 @@ crun-0.1.1.tar.gz /crun-1.4.5.tar.xz /crun-1.5.tar.xz /crun-1.6.tar.xz +/crun-1.7.tar.xz +/crun-1.7.1.tar.xz diff --git a/crun.spec b/crun.spec index 55ae78c..a80f990 100644 --- a/crun.spec +++ b/crun.spec @@ -13,7 +13,7 @@ %global wasm_opts --with-wasmedge %endif -%global built_tag 1.7 +%global built_tag 1.7.1 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C diff --git a/sources b/sources index 94f0e6d..791cd98 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.7.tar.xz) = acccd5f2c7f058b14147c3260bcc8cbb04eadeef44218086faa331e4335a56a8733c20f105d0c8d1a75878831d74937428fbf3beb3b0c6badc315b61f90224ac +SHA512 (crun-1.7.1.tar.xz) = d7a77fc9c2966ae2c3d8a1205e75bdd58e4eb862ab74e4a77b93fbaeb214f4b918f0c7e15f642627d5ab4121318bf7ab2996a21f5036802a964658f3b35d6672 From 6a52cbab9bf9481f2a9d271e863d7802aa70238f Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 29 Nov 2022 20:52:27 +0100 Subject: [PATCH 11/35] bump to 1.7.2 Signed-off-by: Giuseppe Scrivano (cherry picked from commit 8434a3b7bcf8512a4278091697585f8fcc8e960a) --- .gitignore | 1 + crun.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e5ea8fc..33625d5 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ crun-0.1.1.tar.gz /crun-1.6.tar.xz /crun-1.7.tar.xz /crun-1.7.1.tar.xz +/crun-1.7.2.tar.xz diff --git a/crun.spec b/crun.spec index a80f990..573fbf8 100644 --- a/crun.spec +++ b/crun.spec @@ -13,7 +13,7 @@ %global wasm_opts --with-wasmedge %endif -%global built_tag 1.7.1 +%global built_tag 1.7.2 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C diff --git a/sources b/sources index 791cd98..608ef62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.7.1.tar.xz) = d7a77fc9c2966ae2c3d8a1205e75bdd58e4eb862ab74e4a77b93fbaeb214f4b918f0c7e15f642627d5ab4121318bf7ab2996a21f5036802a964658f3b35d6672 +SHA512 (crun-1.7.2.tar.xz) = e85659ef053a20554f4fede68cd913108a3bc946d3c2a1082a748cdad9a1ee17a6a5199dcc69ab7d6056bddad25ca409092a1da2a88d116d56bdd48084a998bd From a820c545c4b10080eae992fdfe2dc99562446c39 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 13 Dec 2022 11:18:29 +0100 Subject: [PATCH 12/35] make criu a weak dependency Signed-off-by: Giuseppe Scrivano (cherry picked from commit c14e1218f5937622122158e11f5e777c1ee7065f) --- crun.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index 573fbf8..bcff79d 100644 --- a/crun.spec +++ b/crun.spec @@ -50,7 +50,8 @@ BuildRequires: protobuf-c-devel %ifnarch %ix86 BuildRequires: criu-devel >= 3.17.1-2 %endif -Requires: criu >= 3.17.1 +Recommends: criu >= 3.17.1 +Recommends: criu-libs Provides: oci-runtime %description From 4cbf490edc1a70e0c611c2f232d118632a35a09e Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 3 Jan 2023 15:03:51 +0100 Subject: [PATCH 13/35] crun: add gcrypt dependency Signed-off-by: Giuseppe Scrivano (cherry picked from commit c81e179cdc77600d73f10508dd27aaaf299d7acc) --- crun.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/crun.spec b/crun.spec index bcff79d..6a6c3ec 100644 --- a/crun.spec +++ b/crun.spec @@ -35,6 +35,7 @@ BuildRequires: python3 BuildRequires: libcap-devel BuildRequires: systemd-devel BuildRequires: yajl-devel +BuildRequires: libgcrypt-devel %if "%{krun_support}" == "enabled" BuildRequires: libkrun-devel %endif From 120f7691e6740b74a536c19def07c26776c17491 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 2 Feb 2023 18:44:12 +0530 Subject: [PATCH 14/35] bump to v1.8 Signed-off-by: Lokesh Mandvekar (cherry picked from commit 885030c8cad06a1736aa0c3cd70edb4e94fefdea) Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + crun.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 33625d5..49683b5 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ crun-0.1.1.tar.gz /crun-1.7.tar.xz /crun-1.7.1.tar.xz /crun-1.7.2.tar.xz +/crun-1.8.tar.xz diff --git a/crun.spec b/crun.spec index 6a6c3ec..163e242 100644 --- a/crun.spec +++ b/crun.spec @@ -13,7 +13,7 @@ %global wasm_opts --with-wasmedge %endif -%global built_tag 1.7.2 +%global built_tag 1.8 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C diff --git a/sources b/sources index 608ef62..4ee56a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.7.2.tar.xz) = e85659ef053a20554f4fede68cd913108a3bc946d3c2a1082a748cdad9a1ee17a6a5199dcc69ab7d6056bddad25ca409092a1da2a88d116d56bdd48084a998bd +SHA512 (crun-1.8.tar.xz) = 373d4fa69085b1ffecff32b4f2da0ab7dd0ec80d68e24ab262127e71cdfcbee50b932aa109980ad683444fdfe288a6495fc40cd81beb8b56af5c244218c7157c From 714740deeb1cde6df92509f4880834a4de125147 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 9 Feb 2023 16:49:50 +0530 Subject: [PATCH 15/35] use arch: golang_arches_future Signed-off-by: Lokesh Mandvekar (cherry picked from commit 68e76ac9922a8d3b6485bfa5461e7a2186ef1816) Signed-off-by: Lokesh Mandvekar --- crun.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index 163e242..23eaa93 100644 --- a/crun.spec +++ b/crun.spec @@ -24,7 +24,7 @@ URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz License: GPLv2+ Release: %autorelease -ExclusiveArch: %{golang_arches} +ExclusiveArch: %{golang_arches_future} BuildRequires: autoconf BuildRequires: automake BuildRequires: go-md2man From b551b31c0b7b818a5f194632ff81bf35cfcaee81 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 27 Feb 2023 11:56:33 +0100 Subject: [PATCH 16/35] bump to 1.8.1 Signed-off-by: Giuseppe Scrivano (cherry picked from commit 42d7001ab491f163bbc054f563211c0efe949a15) --- .gitignore | 1 + crun.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 49683b5..00f243a 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ crun-0.1.1.tar.gz /crun-1.7.1.tar.xz /crun-1.7.2.tar.xz /crun-1.8.tar.xz +/crun-1.8.1.tar.xz diff --git a/crun.spec b/crun.spec index 23eaa93..463652d 100644 --- a/crun.spec +++ b/crun.spec @@ -13,7 +13,7 @@ %global wasm_opts --with-wasmedge %endif -%global built_tag 1.8 +%global built_tag 1.8.1 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C diff --git a/sources b/sources index 4ee56a5..cf842bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.8.tar.xz) = 373d4fa69085b1ffecff32b4f2da0ab7dd0ec80d68e24ab262127e71cdfcbee50b932aa109980ad683444fdfe288a6495fc40cd81beb8b56af5c244218c7157c +SHA512 (crun-1.8.1.tar.xz) = 6230b378f4746aff1d53f3ed797229b2056ece76e8e5b22d6f5f7b42e6042c6aff5294298f3cfd1293b4a87371dfa58cc69e57455e20948abd7269059ad39042 From 43eea8d9c8215424d5b336948ff7fe8d80a4d6ee Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 6 Mar 2023 16:42:00 +0530 Subject: [PATCH 17/35] migrated to SPDX license Signed-off-by: Lokesh Mandvekar (cherry picked from commit 4f9a5d69a2a64e230e3f1f5ea070987156a801e8) Signed-off-by: Lokesh Mandvekar --- crun.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index 463652d..f704275 100644 --- a/crun.spec +++ b/crun.spec @@ -22,7 +22,7 @@ Version: %{gen_version} URL: https://github.com/containers/%{name} # Fetched from upstream Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz -License: GPLv2+ +License: GPL-2.0-only Release: %autorelease ExclusiveArch: %{golang_arches_future} BuildRequires: autoconf From 7090aa6b4490f053f1dd73103fe1a423aa86421c Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 21 Mar 2023 15:27:32 +0100 Subject: [PATCH 18/35] bump to 1.8.2 Signed-off-by: Giuseppe Scrivano (cherry picked from commit 5dc658ac42c2bc6ed3d4450c8fb0a9db7b0ec557) --- crun.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index f704275..3b68d3c 100644 --- a/crun.spec +++ b/crun.spec @@ -13,7 +13,7 @@ %global wasm_opts --with-wasmedge %endif -%global built_tag 1.8.1 +%global built_tag 1.8.2 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C From 3ae8b8538620277cdda26e993655d5f25e5dea61 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 21 Mar 2023 16:03:33 +0100 Subject: [PATCH 19/35] update source for 1.8.2 Signed-off-by: Giuseppe Scrivano (cherry picked from commit 4f279e7a348dc626de83cbf9d3692e90e8e18f38) --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 00f243a..6e8369b 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,4 @@ crun-0.1.1.tar.gz /crun-1.7.2.tar.xz /crun-1.8.tar.xz /crun-1.8.1.tar.xz +/crun-1.8.2.tar.xz diff --git a/sources b/sources index cf842bd..3d92f3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.8.1.tar.xz) = 6230b378f4746aff1d53f3ed797229b2056ece76e8e5b22d6f5f7b42e6042c6aff5294298f3cfd1293b4a87371dfa58cc69e57455e20948abd7269059ad39042 +SHA512 (crun-1.8.2.tar.xz) = d0190cc17dac44a314e1e5ab35aa4d1c6f42c6bfb87ea337a184453fabaa26324507be8b9fc9e34a0c66bc2eb8b8215fb3855ede6533563fc064052928346d89 From 48bc72c3ed907178401130f0c4a4ea7fa0bf1f76 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Sat, 25 Mar 2023 08:41:13 +0100 Subject: [PATCH 20/35] bump to 1.8.3 Signed-off-by: Giuseppe Scrivano (cherry picked from commit bca7bed7668523d916064934236de1db5d6f452b) --- crun.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crun.spec b/crun.spec index 3b68d3c..745ccaf 100644 --- a/crun.spec +++ b/crun.spec @@ -13,7 +13,7 @@ %global wasm_opts --with-wasmedge %endif -%global built_tag 1.8.2 +%global built_tag 1.8.3 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C From b082a941eaa9bbfd1ecd35da4cf70ab52910915c Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Sat, 25 Mar 2023 08:48:07 +0100 Subject: [PATCH 21/35] update sources Signed-off-by: Giuseppe Scrivano (cherry picked from commit 85c3a19695c7dda1cd4f335ca4acb3a23ca2b9db) --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6e8369b..645e8b1 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ crun-0.1.1.tar.gz /crun-1.8.tar.xz /crun-1.8.1.tar.xz /crun-1.8.2.tar.xz +/crun-1.8.3.tar.xz diff --git a/sources b/sources index 3d92f3f..982e22f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.8.2.tar.xz) = d0190cc17dac44a314e1e5ab35aa4d1c6f42c6bfb87ea337a184453fabaa26324507be8b9fc9e34a0c66bc2eb8b8215fb3855ede6533563fc064052928346d89 +SHA512 (crun-1.8.3.tar.xz) = ac3a99c6d17724d356eb22af81c2b94f91d98d69763c34773260e549b159b1da5298a4387efa89615c510a24d65dc002ca3dce6dfb93ca5aa7513f328dbdb6ed From 7df4a584a85e8bfe12c1a01f312628c5e02a32a7 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 13 Apr 2023 21:24:13 +0200 Subject: [PATCH 22/35] bump to 1.8.4 Signed-off-by: Giuseppe Scrivano --- .gitignore | 1 + crun.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 645e8b1..afecd0a 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,4 @@ crun-0.1.1.tar.gz /crun-1.8.1.tar.xz /crun-1.8.2.tar.xz /crun-1.8.3.tar.xz +/crun-1.8.4.tar.xz diff --git a/crun.spec b/crun.spec index 745ccaf..8d4495b 100644 --- a/crun.spec +++ b/crun.spec @@ -13,7 +13,7 @@ %global wasm_opts --with-wasmedge %endif -%global built_tag 1.8.3 +%global built_tag 1.8.4 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C diff --git a/sources b/sources index 982e22f..5cb3680 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.8.3.tar.xz) = ac3a99c6d17724d356eb22af81c2b94f91d98d69763c34773260e549b159b1da5298a4387efa89615c510a24d65dc002ca3dce6dfb93ca5aa7513f328dbdb6ed +SHA512 (crun-1.8.4.tar.xz) = 2ed80db2e7ddd1438bbe33e99ec2cdbcc55c4869504f719ff9302e834929752af09a59cd905accb37ee5f6cae3b9b16fd4f4c3fdab31db5fc38b007c1505bfa0 From aaab0efcb92c4fcf862518558d55970ae80b0775 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Sat, 20 May 2023 21:29:36 +0200 Subject: [PATCH 23/35] bump to 1.8.5 Signed-off-by: Giuseppe Scrivano (cherry picked from commit c636b7586e57e9c04ff1de878ef12fd28d3036ef) --- .gitignore | 1 + crun.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index afecd0a..972a61f 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ crun-0.1.1.tar.gz /crun-1.8.2.tar.xz /crun-1.8.3.tar.xz /crun-1.8.4.tar.xz +/crun-1.8.5.tar.xz diff --git a/crun.spec b/crun.spec index 8d4495b..ce794d5 100644 --- a/crun.spec +++ b/crun.spec @@ -13,7 +13,7 @@ %global wasm_opts --with-wasmedge %endif -%global built_tag 1.8.4 +%global built_tag 1.8.5 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C diff --git a/sources b/sources index 5cb3680..dc99ef8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.8.4.tar.xz) = 2ed80db2e7ddd1438bbe33e99ec2cdbcc55c4869504f719ff9302e834929752af09a59cd905accb37ee5f6cae3b9b16fd4f4c3fdab31db5fc38b007c1505bfa0 +SHA512 (crun-1.8.5.tar.xz) = 50b31435ee2cae9703d12f74e4d9083a2b0a3a7ce63f34ecbdc6b9c0f01f5948f22330b614d40933a9851289d9ed2f457c4599821f743c3569c329dad43678f7 From 35db33347ba61eaaf70523bd8be7dcc362d2cabc Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 27 Jul 2023 09:52:51 +0200 Subject: [PATCH 24/35] bump to 1.8.6 Signed-off-by: Giuseppe Scrivano (cherry picked from commit af069bdab771992d1f3656c2973e40f738ab30fb) --- .gitignore | 1 + crun.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 972a61f..46feeb9 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,4 @@ crun-0.1.1.tar.gz /crun-1.8.3.tar.xz /crun-1.8.4.tar.xz /crun-1.8.5.tar.xz +/crun-1.8.6.tar.xz diff --git a/crun.spec b/crun.spec index ce794d5..12e4646 100644 --- a/crun.spec +++ b/crun.spec @@ -13,7 +13,7 @@ %global wasm_opts --with-wasmedge %endif -%global built_tag 1.8.5 +%global built_tag 1.8.6 %global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) Summary: OCI runtime written in C diff --git a/sources b/sources index dc99ef8..13f3791 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.8.5.tar.xz) = 50b31435ee2cae9703d12f74e4d9083a2b0a3a7ce63f34ecbdc6b9c0f01f5948f22330b614d40933a9851289d9ed2f457c4599821f743c3569c329dad43678f7 +SHA512 (crun-1.8.6.tar.xz) = d527b58ce4d5a7937260cc1336e10997595fed774e0faf4fed90e783de1ff4e3f036d800c7b92173f7fcad8bb1c0d6ee01989534d9b43eb0b937eef46a335f7d From ea5220c5ab282e7e6c4f60e443a5765c84ff0fbb Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 21 Aug 2023 14:00:04 +0000 Subject: [PATCH 25/35] [packit] 1.8.7 upstream release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream tag: 1.8.7 Upstream commit: 53a9996c If you need to do any change in this pull request, you need to locally fetch the source branch of it and push it (with a fix) to your fork (as it is not possible to push to the branch created in the Packit’s fork): ``` git fetch https://src.fedoraproject.org/forks/packit/rpms/crun.git refs/heads/*:refs/remotes/packit/* git checkout packit/1.8.7-f37-update-propose_downstream ``` --- .gitignore | 1 + .packit.yaml | 52 +++++++++++++++++++ README.packit | 3 ++ crun.spec | 140 ++++++++++++++++++++++++++++++-------------------- sources | 2 +- 5 files changed, 142 insertions(+), 56 deletions(-) create mode 100644 .packit.yaml create mode 100644 README.packit diff --git a/.gitignore b/.gitignore index 46feeb9..1949827 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,4 @@ crun-0.1.1.tar.gz /crun-1.8.4.tar.xz /crun-1.8.5.tar.xz /crun-1.8.6.tar.xz +/crun-1.8.7.tar.xz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..fa87387 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,52 @@ +--- +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +specfile_path: rpm/crun.spec + +srpm_build_deps: + - git-archive-all + - make +actions: + create-archive: + - "git-archive-all -v --force-submodules rpm/crun-HEAD.tar.xz" + - bash -c "ls -1 rpm/crun-HEAD.tar.xz" + +jobs: + - job: copr_build + trigger: pull_request + # keep in sync with https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next + targets: + - fedora-all-x86_64 + - fedora-all-aarch64 + - fedora-eln-x86_64 + - fedora-eln-aarch64 + - centos-stream+epel-next-8-x86_64 + - centos-stream+epel-next-8-aarch64 + - centos-stream+epel-next-9-x86_64 + - centos-stream+epel-next-9-aarch64 + additional_repos: + - "copr://rhcontainerbot/podman-next" + + # Run on commit to main branch + - job: copr_build + trigger: commit + branch: main + owner: rhcontainerbot + project: podman-next + + - job: propose_downstream + trigger: release + update_release: false + dist_git_branches: + - fedora-all + + - job: koji_build + trigger: commit + dist_git_branches: + - fedora-all + + - job: bodhi_update + trigger: commit + dist_git_branches: + - fedora-branched # rawhide updates are created automatically diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..797aefb --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.79.0.post2+g93f33d9. diff --git a/crun.spec b/crun.spec index 12e4646..26563aa 100644 --- a/crun.spec +++ b/crun.spec @@ -1,80 +1,126 @@ %global krun_opts %{nil} +%global wasmedge_opts %{nil} +%global wasmtime_opts %{nil} -%if 0%{?fedora} >= 37 +# krun and wasm[edge,time] support only on aarch64 and x86_64 %ifarch aarch64 || x86_64 -%global krun_support enabled +%global wasm_support 1 + +# wasmedge not present on Fedora ELN environments +%if !0%{?eln} +%global wasmedge_support 1 +%global wasmedge_opts --with-wasmedge +%endif + +# krun only exists on fedora +%if %{defined fedora} +%global krun_support 1 %global krun_opts --with-libkrun %endif + +# wasmtime exists only on podman-next copr for now +%if %{defined copr_project} && "%{?copr_project}" == "podman-next" +%global wasmtime_support 1 +%global wasmtime_opts --with-wasmtime %endif -# wasmedge built only for aarch64 and x86_64 -%ifarch aarch64 || x86_64 -%global wasm_support enabled -%global wasm_opts --with-wasmedge %endif -%global built_tag 1.8.6 -%global gen_version %(b=%{built_tag}; echo ${b/-/"~"}) - Summary: OCI runtime written in C Name: crun -Version: %{gen_version} +%if %{defined copr_username} +Epoch: 102 +%endif +# DO NOT TOUCH the Version string! +# The TRUE source of this specfile is: +# https://github.com/containers/crun/blob/main/rpm/crun.spec +# If that's what you're reading, Version must be 0, and will be updated by Packit for +# copr and koji builds. +# If you're reading this on dist-git, the version is automatically filled in by Packit. +Version: 1.8.7 +Release: %autorelease URL: https://github.com/containers/%{name} -# Fetched from upstream Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz License: GPL-2.0-only -Release: %autorelease +%if %{defined golang_arches_future} ExclusiveArch: %{golang_arches_future} +%else +ExclusiveArch: aarch64 ppc64le riscv64 s390x x86_64 +%endif BuildRequires: autoconf BuildRequires: automake -BuildRequires: go-md2man -BuildRequires: libtool BuildRequires: gcc BuildRequires: git-core -BuildRequires: python3 +BuildRequires: gperf BuildRequires: libcap-devel -BuildRequires: systemd-devel -BuildRequires: yajl-devel -BuildRequires: libgcrypt-devel -%if "%{krun_support}" == "enabled" +%if %{defined krun_support} BuildRequires: libkrun-devel %endif -%if "%{wasm_support}" == "enabled" -BuildRequires: wasmedge-devel -%endif +BuildRequires: systemd-devel +BuildRequires: yajl-devel BuildRequires: libseccomp-devel -BuildRequires: libselinux-devel BuildRequires: python3-libmount -BuildRequires: make -BuildRequires: glibc-static +BuildRequires: libtool BuildRequires: protobuf-c-devel -%ifnarch %ix86 BuildRequires: criu-devel >= 3.17.1-2 -%endif Recommends: criu >= 3.17.1 Recommends: criu-libs +%if %{defined wasmedge_support} +BuildRequires: wasmedge-devel +%endif +%if %{defined wasmtime_support} +BuildRequires: wasmtime-c-api-devel +%endif +%if %{defined rhel} && 0%{?rhel} == 8 +BuildRequires: python3 +%else +BuildRequires: python +%endif Provides: oci-runtime %description -%{name} is a runtime for running OCI containers +%{name} is a OCI runtime + +%if %{defined krun_support} +%package krun +Summary: %{name} with libkrun support +Requires: libkrun +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: krun = %{?epoch:%{epoch}:}%{version}-%{release} + +%description krun +krun is a symlink to the %{name} binary, with libkrun as an additional dependency. +%endif + +%if %{defined wasm_support} +%package wasm +Summary: %{name} with wasm support +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: wasm-library +Recommends: wasmedge + +%description wasm +%{name}-wasm is a symlink to the %{name} binary, with wasm as an additional dependency. +%endif %prep -%autosetup -Sgit %{name}-%{built_tag} +%autosetup -Sgit -n %{name}-%{version} %build ./autogen.sh -%configure --disable-silent-rules %{krun_opts} %{wasm_opts} +./configure --disable-silent-rules %{krun_opts} %{wasmedge_opts} %{wasmtime_opts} %make_build %install -%make_install +%make_install prefix=%{_prefix} rm -rf %{buildroot}%{_prefix}/lib* -%if "%{krun_support}" == "enabled" -ln -s ../bin/%{name} %{buildroot}%{_bindir}/krun + +%if %{defined krun_support} +ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/krun %endif -%if "%{wasm_support}" == "enabled" -ln -s ../bin/%{name} %{buildroot}%{_bindir}/%{name}-wasm +%if %{defined wasm_support} +ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-wasm %endif %files @@ -82,31 +128,15 @@ ln -s ../bin/%{name} %{buildroot}%{_bindir}/%{name}-wasm %{_bindir}/%{name} %{_mandir}/man1/* -%if "%{krun_support}" == "enabled" -%package krun -Summary: OCI Runtime providing Virtualization-based process isolation capabilities. -Provides: krun -Requires: %{name} = %{version}-%{release} -Requires: libkrun - -%description krun -%{name}-krun OCI Runtime providing Virtualization-based process isolation capabilities. - +%if %{defined krun_support} %files krun +%license COPYING %{_bindir}/krun %endif -%if "%{wasm_support}" == "enabled" -%package wasm -Summary: wasm support for %{name} -Requires: wasm-library -Recommends: wasmedge -Requires: %{name} = %{version}-%{release} - -%description wasm -%{name}-wasm provides %{name} built with wasm support - +%if %{defined wasm_support} %files wasm +%license COPYING %{_bindir}/%{name}-wasm %endif diff --git a/sources b/sources index 13f3791..45556df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.8.6.tar.xz) = d527b58ce4d5a7937260cc1336e10997595fed774e0faf4fed90e783de1ff4e3f036d800c7b92173f7fcad8bb1c0d6ee01989534d9b43eb0b937eef46a335f7d +SHA512 (crun-1.8.7.tar.xz) = 74d9f406de40512fa1694f9a744563c7a0eb217da700298da4afea065bd2181d818dd1d25098164eb3dacc47c149a45a57fd79445f40865ffcced383297491a4 From 6bbcccecc58c1d7b090785d576bbfbce870c51a5 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 7 Sep 2023 14:03:49 +0000 Subject: [PATCH 26/35] [packit] 1.9 upstream release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream tag: 1.9 Upstream commit: a538ac4e If you need to do any change in this pull request, you need to locally fetch the source branch of it and push it (with a fix) to your fork (as it is not possible to push to the branch created in the Packit’s fork): ``` git fetch https://src.fedoraproject.org/forks/packit/rpms/crun.git refs/heads/*:refs/remotes/packit/* git checkout packit/1.9-f37-update-propose_downstream ``` --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1949827..5f0563d 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ crun-0.1.1.tar.gz /crun-1.8.5.tar.xz /crun-1.8.6.tar.xz /crun-1.8.7.tar.xz +/crun-1.9.tar.xz diff --git a/README.packit b/README.packit index 797aefb..ea0650e 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.79.0.post2+g93f33d9. +The file was generated using packit 0.79.1.post14+g9e876412. diff --git a/crun.spec b/crun.spec index 26563aa..588db31 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.8.7 +Version: 1.9 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index 45556df..438e926 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.8.7.tar.xz) = 74d9f406de40512fa1694f9a744563c7a0eb217da700298da4afea065bd2181d818dd1d25098164eb3dacc47c149a45a57fd79445f40865ffcced383297491a4 +SHA512 (crun-1.9.tar.xz) = 04777626873743d0f5d9d0c0338a37be03c786a4b57b95b83caba0a9ef5b64280194c4e7973fd6bb2a52a7aed458e2e76b4c638d1a9cf3e69ff7176d71037d23 From f3898ba0987d2b445a1773087ccb1595c62a786c Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 26 Sep 2023 15:30:34 +0000 Subject: [PATCH 27/35] [packit] 1.9.1 upstream release Upstream tag: 1.9.1 Upstream commit: 1f2769e1 --- .gitignore | 1 + README.packit | 2 +- crun.spec | 5 +++-- sources | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5f0563d..69b0664 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,4 @@ crun-0.1.1.tar.gz /crun-1.8.6.tar.xz /crun-1.8.7.tar.xz /crun-1.9.tar.xz +/crun-1.9.1.tar.xz diff --git a/README.packit b/README.packit index ea0650e..8b12de4 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.79.1.post14+g9e876412. +The file was generated using packit 0.81.0.post1.dev4+g3347ce2b. diff --git a/crun.spec b/crun.spec index 588db31..9b6e8f8 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.9 +Version: 1.9.1 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz @@ -126,12 +126,13 @@ ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-wasm %files %license COPYING %{_bindir}/%{name} -%{_mandir}/man1/* +%{_mandir}/man1/crun.1 %if %{defined krun_support} %files krun %license COPYING %{_bindir}/krun +%{_mandir}/man1/krun.1 %endif %if %{defined wasm_support} diff --git a/sources b/sources index 438e926..6ea94e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.9.tar.xz) = 04777626873743d0f5d9d0c0338a37be03c786a4b57b95b83caba0a9ef5b64280194c4e7973fd6bb2a52a7aed458e2e76b4c638d1a9cf3e69ff7176d71037d23 +SHA512 (crun-1.9.1.tar.xz) = 5de6d16b2db3aaa5ec6fe9afc0df72eae5936fec2289fd31159ed81f39c73b8c61834ae587348ab76736394094333fdc0d7ecfa2002dd50f7430bf57627998f8 From 68c54ab588514794ce0f1638e3377474f2e51317 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 26 Sep 2023 13:33:15 -0400 Subject: [PATCH 28/35] fix manpage installation (cherry picked from commit 8de06754f3b5c08ead3d5f6f3fc50882614c758e) --- crun.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crun.spec b/crun.spec index 9b6e8f8..2227a5c 100644 --- a/crun.spec +++ b/crun.spec @@ -126,13 +126,13 @@ ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-wasm %files %license COPYING %{_bindir}/%{name} -%{_mandir}/man1/crun.1 +%{_mandir}/man1/crun.1.gz %if %{defined krun_support} %files krun %license COPYING %{_bindir}/krun -%{_mandir}/man1/krun.1 +%{_mandir}/man1/krun.1.gz %endif %if %{defined wasm_support} From 188deaff84de8882a1163f57eb519b9a795a09a5 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 26 Sep 2023 13:55:18 -0400 Subject: [PATCH 29/35] remove krun manpage if krun not supported (cherry picked from commit 612a96918ebaced4b9021a932b6a26e6e21c51d7) --- crun.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crun.spec b/crun.spec index 2227a5c..1b0f737 100644 --- a/crun.spec +++ b/crun.spec @@ -117,6 +117,8 @@ rm -rf %{buildroot}%{_prefix}/lib* %if %{defined krun_support} ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/krun +%else +rm -f %{buildroot}%{_mandir}/man1/krun.1 %endif %if %{defined wasm_support} From 5bd582e6a8b8619d7a427cd50d2360c5e845a0a1 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 27 Sep 2023 21:05:50 +0000 Subject: [PATCH 30/35] [packit] 1.9.2 upstream release Upstream tag: 1.9.2 Upstream commit: 35274d34 --- .gitignore | 1 + .packit.yaml | 7 ++++++- crun.spec | 6 ++---- sources | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 69b0664..2919216 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,4 @@ crun-0.1.1.tar.gz /crun-1.8.7.tar.xz /crun-1.9.tar.xz /crun-1.9.1.tar.xz +/crun-1.9.2.tar.xz diff --git a/.packit.yaml b/.packit.yaml index fa87387..2cb0456 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -15,7 +15,9 @@ actions: jobs: - job: copr_build trigger: pull_request - # keep in sync with https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next + notifications: + failure_comment: + message: "Ephemeral COPR build failed. @containers/packit-build please check." targets: - fedora-all-x86_64 - fedora-all-aarch64 @@ -31,6 +33,9 @@ jobs: # Run on commit to main branch - job: copr_build trigger: commit + notifications: + failure_comment: + message: "podman-next COPR build failed. @containers/packit-build please check." branch: main owner: rhcontainerbot project: podman-next diff --git a/crun.spec b/crun.spec index 1b0f737..9c50b95 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.9.1 +Version: 1.9.2 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz @@ -117,8 +117,6 @@ rm -rf %{buildroot}%{_prefix}/lib* %if %{defined krun_support} ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/krun -%else -rm -f %{buildroot}%{_mandir}/man1/krun.1 %endif %if %{defined wasm_support} @@ -128,7 +126,7 @@ ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-wasm %files %license COPYING %{_bindir}/%{name} -%{_mandir}/man1/crun.1.gz +%{_mandir}/man1/%{name}.1.gz %if %{defined krun_support} %files krun diff --git a/sources b/sources index 6ea94e0..d19d155 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.9.1.tar.xz) = 5de6d16b2db3aaa5ec6fe9afc0df72eae5936fec2289fd31159ed81f39c73b8c61834ae587348ab76736394094333fdc0d7ecfa2002dd50f7430bf57627998f8 +SHA512 (crun-1.9.2.tar.xz) = 277010c1057f5be2d75870685e539868f7289171ee607b15aab928ad9aeb176b17e6ab5a830495990307314b09791b7d2b93c2e731fd33dfd4cd9b5342db29f1 From 9ead93eaec9d1055333e9a8c1edd7a6065e59ea9 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 19 Oct 2023 10:13:34 +0000 Subject: [PATCH 31/35] [packit] 1.10 upstream release Upstream tag: 1.10 Upstream commit: c053c83c --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2919216..9832c0e 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,4 @@ crun-0.1.1.tar.gz /crun-1.9.tar.xz /crun-1.9.1.tar.xz /crun-1.9.2.tar.xz +/crun-1.10.tar.xz diff --git a/README.packit b/README.packit index 8b12de4..2a3acd4 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.81.0.post1.dev4+g3347ce2b. +The file was generated using packit 0.84.0. diff --git a/crun.spec b/crun.spec index 9c50b95..c71dde8 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.9.2 +Version: 1.10 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index d19d155..b10aff9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.9.2.tar.xz) = 277010c1057f5be2d75870685e539868f7289171ee607b15aab928ad9aeb176b17e6ab5a830495990307314b09791b7d2b93c2e731fd33dfd4cd9b5342db29f1 +SHA512 (crun-1.10.tar.xz) = bf1e154869687f59eb3efd9eed6d37712842a8953088a340f3fb7c1d451db0dadb66eae7161c0ad6e2ec29749167cc1ff0815f722882b1fc95f7bee4f154e3f8 From cc5f8605b231fbf7dd132ccadddddee342885627 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 26 Oct 2023 20:21:10 +0000 Subject: [PATCH 32/35] [packit] 1.11 upstream release Upstream tag: 1.11 Upstream commit: 11f8d3dc --- .gitignore | 1 + crun.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9832c0e..536b469 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,4 @@ crun-0.1.1.tar.gz /crun-1.9.1.tar.xz /crun-1.9.2.tar.xz /crun-1.10.tar.xz +/crun-1.11.tar.xz diff --git a/crun.spec b/crun.spec index c71dde8..4fb8604 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.10 +Version: 1.11 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index b10aff9..ab948da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.10.tar.xz) = bf1e154869687f59eb3efd9eed6d37712842a8953088a340f3fb7c1d451db0dadb66eae7161c0ad6e2ec29749167cc1ff0815f722882b1fc95f7bee4f154e3f8 +SHA512 (crun-1.11.tar.xz) = b7a7af9d0cf27d966e37c6a8022f5628e4c90b446f39feab19b01e56c2396be078815716adf38d3ee8930890a24fdd2e501e462ee045e2734c7346e610f8ec7f From f8a4eb9ae0049ccbe39e5dc313e2cabc10e7c249 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 30 Oct 2023 20:26:26 +0000 Subject: [PATCH 33/35] [packit] 1.11.1 upstream release Upstream tag: 1.11.1 Upstream commit: 1084f952 --- .gitignore | 1 + crun.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 536b469..0aafa9d 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,4 @@ crun-0.1.1.tar.gz /crun-1.9.2.tar.xz /crun-1.10.tar.xz /crun-1.11.tar.xz +/crun-1.11.1.tar.xz diff --git a/crun.spec b/crun.spec index 4fb8604..febfc18 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.11 +Version: 1.11.1 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index ab948da..47b0f39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.11.tar.xz) = b7a7af9d0cf27d966e37c6a8022f5628e4c90b446f39feab19b01e56c2396be078815716adf38d3ee8930890a24fdd2e501e462ee045e2734c7346e610f8ec7f +SHA512 (crun-1.11.1.tar.xz) = c539b57f8419724dd6e9d3b7d0a3ed8d2f0d1e9089df66aa0a811fdf73ca72bc160424dea1cc597b0f98576e011b92eac39a62c7fddb67772ac5cf173c96e3fa From c2983488d0950d49f1cdced1957f61b532e949bc Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 7 Nov 2023 12:55:45 +0000 Subject: [PATCH 34/35] [packit] 1.11.2 upstream release Upstream tag: 1.11.2 Upstream commit: ab0edeef --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0aafa9d..82849e2 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,4 @@ crun-0.1.1.tar.gz /crun-1.10.tar.xz /crun-1.11.tar.xz /crun-1.11.1.tar.xz +/crun-1.11.2.tar.xz diff --git a/README.packit b/README.packit index 2a3acd4..5998f60 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.84.0. +The file was generated using packit 0.85.0. diff --git a/crun.spec b/crun.spec index febfc18..e94dce0 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.11.1 +Version: 1.11.2 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index 47b0f39..d382316 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.11.1.tar.xz) = c539b57f8419724dd6e9d3b7d0a3ed8d2f0d1e9089df66aa0a811fdf73ca72bc160424dea1cc597b0f98576e011b92eac39a62c7fddb67772ac5cf173c96e3fa +SHA512 (crun-1.11.2.tar.xz) = ae35ffb9bd1c7acebfd7f6236fa6a7ad524593d8f2cea1203f0e89023e9791d2d5bbc5c5cfc32ee5f18ad80662a1659076ab5f4d5ff74c6026842f2dd12be977 From cd8d0c1f84a141ed6fca08ae2e490e7c6583b93f Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 23 Nov 2023 17:12:41 +0000 Subject: [PATCH 35/35] [packit] 1.12 upstream release Upstream tag: 1.12 Upstream commit: ce429cb2 --- .gitignore | 1 + README.packit | 2 +- crun.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 82849e2..039a846 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,4 @@ crun-0.1.1.tar.gz /crun-1.11.tar.xz /crun-1.11.1.tar.xz /crun-1.11.2.tar.xz +/crun-1.12.tar.xz diff --git a/README.packit b/README.packit index 5998f60..d778d97 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.85.0. +The file was generated using packit 0.86.2.post1.dev2+g209847d1. diff --git a/crun.spec b/crun.spec index e94dce0..11589d5 100644 --- a/crun.spec +++ b/crun.spec @@ -37,7 +37,7 @@ Epoch: 102 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.11.2 +Version: 1.12 Release: %autorelease URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz diff --git a/sources b/sources index d382316..a810830 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (crun-1.11.2.tar.xz) = ae35ffb9bd1c7acebfd7f6236fa6a7ad524593d8f2cea1203f0e89023e9791d2d5bbc5c5cfc32ee5f18ad80662a1659076ab5f4d5ff74c6026842f2dd12be977 +SHA512 (crun-1.12.tar.xz) = 3ed4d2c2b27ea1b9c0c68762e2eff0f18ee9efcd401a9f7fc984459f1b593def2a353484c8c0c5967fb2aae11df446aca4353346f843e3a0298d2400721ee488