Compare commits

...
Sign in to create a new pull request.

35 commits

Author SHA1 Message Date
Packit
cd8d0c1f84 [packit] 1.12 upstream release
Upstream tag: 1.12
Upstream commit: ce429cb2
2023-11-23 17:12:41 +00:00
Packit
c2983488d0 [packit] 1.11.2 upstream release
Upstream tag: 1.11.2
Upstream commit: ab0edeef
2023-11-07 12:55:45 +00:00
Packit
f8a4eb9ae0 [packit] 1.11.1 upstream release
Upstream tag: 1.11.1
Upstream commit: 1084f952
2023-10-30 20:26:26 +00:00
Packit
cc5f8605b2 [packit] 1.11 upstream release
Upstream tag: 1.11
Upstream commit: 11f8d3dc
2023-10-26 20:21:10 +00:00
Packit
9ead93eaec [packit] 1.10 upstream release
Upstream tag: 1.10
Upstream commit: c053c83c
2023-10-19 10:13:34 +00:00
Packit
5bd582e6a8 [packit] 1.9.2 upstream release
Upstream tag: 1.9.2
Upstream commit: 35274d34
2023-09-27 21:05:50 +00:00
Lokesh Mandvekar
188deaff84
remove krun manpage if krun not supported
(cherry picked from commit 612a96918e)
2023-09-26 13:55:34 -04:00
Lokesh Mandvekar
68c54ab588
fix manpage installation
(cherry picked from commit 8de06754f3)
2023-09-26 13:34:00 -04:00
Packit
f3898ba098 [packit] 1.9.1 upstream release
Upstream tag: 1.9.1
Upstream commit: 1f2769e1
2023-09-26 15:30:34 +00:00
Packit
6bbcccecc5 [packit] 1.9 upstream release
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
```
2023-09-07 14:03:49 +00:00
Packit
ea5220c5ab [packit] 1.8.7 upstream release
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
```
2023-08-21 14:00:04 +00:00
Giuseppe Scrivano
35db33347b
bump to 1.8.6
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
(cherry picked from commit af069bdab7)
2023-07-27 09:53:32 +02:00
Giuseppe Scrivano
aaab0efcb9
bump to 1.8.5
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
(cherry picked from commit c636b7586e)
2023-05-20 21:30:03 +02:00
Giuseppe Scrivano
7df4a584a8
bump to 1.8.4
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2023-04-13 21:24:40 +02:00
Giuseppe Scrivano
b082a941ea
update sources
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
(cherry picked from commit 85c3a19695)
2023-03-25 08:48:33 +01:00
Giuseppe Scrivano
48bc72c3ed
bump to 1.8.3
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
(cherry picked from commit bca7bed766)
2023-03-25 08:41:33 +01:00
Giuseppe Scrivano
3ae8b85386
update source for 1.8.2
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
(cherry picked from commit 4f279e7a34)
2023-03-21 16:04:14 +01:00
Giuseppe Scrivano
7090aa6b44
bump to 1.8.2
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
(cherry picked from commit 5dc658ac42)
2023-03-21 15:28:36 +01:00
Lokesh Mandvekar
43eea8d9c8 migrated to SPDX license
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
(cherry picked from commit 4f9a5d69a2)
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2023-03-06 16:42:55 +05:30
Giuseppe Scrivano
b551b31c0b
bump to 1.8.1
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
(cherry picked from commit 42d7001ab4)
2023-02-27 11:59:20 +01:00
Lokesh Mandvekar
714740deeb use arch: golang_arches_future
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
(cherry picked from commit 68e76ac992)
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2023-02-09 17:29:40 +05:30
Lokesh Mandvekar
120f7691e6 bump to v1.8
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
(cherry picked from commit 885030c8ca)
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2023-02-02 18:55:06 +05:30
Giuseppe Scrivano
4cbf490edc
crun: add gcrypt dependency
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
(cherry picked from commit c81e179cdc)
2023-01-03 15:04:09 +01:00
Giuseppe Scrivano
a820c545c4
make criu a weak dependency
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
(cherry picked from commit c14e1218f5)
2022-12-13 11:18:48 +01:00
Giuseppe Scrivano
6a52cbab9b
bump to 1.7.2
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
(cherry picked from commit 8434a3b7bc)
2022-11-29 20:52:44 +01:00
Giuseppe Scrivano
d464919c00
bump to 1.7.1
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
(cherry picked from commit 07a7ba9e01)
2022-11-25 12:59:19 +01:00
Lokesh Mandvekar
12baa225fd wasmedge present on all active Fedoras
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
(cherry picked from commit bdd508b2f6)
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-11-22 09:35:39 +05:30
Lokesh Mandvekar
bf0c67aa66 use correct macro
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
(cherry picked from commit d68ce50deb)
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-11-17 19:27:42 +05:30
Daniel J Walsh
601c0c8103
local build 2022-11-07 07:14:20 -05:00
Lokesh Mandvekar
6ba3adc3a3 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 <lsm5@fedoraproject.org>
(cherry picked from commit f0e158812d)
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-11-04 15:57:54 +05:30
Troy Dawson
ee562b2c5f Add ExclusiveArch
If using golang, then you needs to use ExclusiveArch for those arches that do not have golang.

(cherry picked from commit db6cce4e02)
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-11-04 15:57:50 +05:30
Lokesh Mandvekar
9cf267ae7b Revert "auto bump to 1.6"
This reverts commit aac762a55d by
autobuilder.

(cherry picked from commit 76df75985f)
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-10-07 13:29:10 -04:00
RH Container Bot
e31c1d92dc auto bump to 1.6
(cherry picked from commit aac762a55d)
2022-10-07 15:23:27 +00:00
Lokesh Mandvekar
13af637c99 remove debbuild macros to comply with fedora guidelines
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
(cherry picked from commit 263de70111)
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-10-04 15:02:52 -04:00
Daniel J Walsh
06669ea343
local build 2022-09-28 14:41:13 -04:00
5 changed files with 174 additions and 41 deletions

19
.gitignore vendored
View file

@ -61,3 +61,22 @@ 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
/crun-1.7.2.tar.xz
/crun-1.8.tar.xz
/crun-1.8.1.tar.xz
/crun-1.8.2.tar.xz
/crun-1.8.3.tar.xz
/crun-1.8.4.tar.xz
/crun-1.8.5.tar.xz
/crun-1.8.6.tar.xz
/crun-1.8.7.tar.xz
/crun-1.9.tar.xz
/crun-1.9.1.tar.xz
/crun-1.9.2.tar.xz
/crun-1.10.tar.xz
/crun-1.11.tar.xz
/crun-1.11.1.tar.xz
/crun-1.11.2.tar.xz
/crun-1.12.tar.xz

57
.packit.yaml Normal file
View file

@ -0,0 +1,57 @@
---
# 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
notifications:
failure_comment:
message: "Ephemeral COPR build failed. @containers/packit-build please check."
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
notifications:
failure_comment:
message: "podman-next COPR build failed. @containers/packit-build please check."
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

3
README.packit Normal file
View file

@ -0,0 +1,3 @@
This repository is maintained by packit.
https://packit.dev/
The file was generated using packit 0.86.2.post1.dev2+g209847d1.

134
crun.spec
View file

@ -1,91 +1,145 @@
%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
%global built_tag_strip 1.6
%endif
Summary: OCI runtime written in C
Name: crun
Version: 1.6
%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.12
Release: %autorelease
URL: https://github.com/containers/%{name}
Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz
%if "%{_vendor}" == "debbuild"
Packager: Podman Debbuild Maintainers <https://github.com/orgs/containers/teams/podman-debbuild-maintainers>
License: GPL-2.0+
Release: 0%{?dist}
License: GPL-2.0-only
%if %{defined golang_arches_future}
ExclusiveArch: %{golang_arches_future}
%else
License: GPLv2+
Release: %autorelease
ExclusiveArch: aarch64 ppc64le riscv64 s390x x86_64
%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
BuildRequires: gperf
BuildRequires: libcap-devel
%if %{defined krun_support}
BuildRequires: libkrun-devel
%endif
BuildRequires: systemd-devel
BuildRequires: yajl-devel
%if "%{krun_support}" == "enabled"
BuildRequires: libkrun-devel
Provides: krun
%endif
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
Recommends: criu >= 3.17.1
Recommends: criu-libs
%if %{defined wasmedge_support}
BuildRequires: wasmedge-devel
%endif
Requires: criu >= 3.17.1
%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_strip}
%autosetup -Sgit -n %{name}-%{version}
%build
./autogen.sh
%configure --disable-silent-rules %{krun_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"
%if %{defined krun_support}
ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/krun
%endif
%if %{defined wasm_support}
ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-wasm
%endif
%files
%license COPYING
%{_bindir}/%{name}
%if "%{krun_support}" == "enabled"
%{_mandir}/man1/%{name}.1.gz
%if %{defined krun_support}
%files krun
%license COPYING
%{_bindir}/krun
%{_mandir}/man1/krun.1.gz
%endif
%if %{defined wasm_support}
%files wasm
%license COPYING
%{_bindir}/%{name}-wasm
%endif
%{_mandir}/man1/*
%changelog
%if "%{_vendor}" != "debbuild"
%autochangelog
%endif

View file

@ -1 +1 @@
SHA512 (crun-1.6.tar.xz) = cb0464792df6167719fd21c3e1117dc0d89cf91c60d02b478774d14b73bdf49b0d138578b48803ff5af28f50740f5022b043fdf3198833d4a9b69e40974ced00
SHA512 (crun-1.12.tar.xz) = 3ed4d2c2b27ea1b9c0c68762e2eff0f18ee9efcd401a9f7fc984459f1b593def2a353484c8c0c5967fb2aae11df446aca4353346f843e3a0298d2400721ee488