From 9864f099e6c0e51f86f54f65ddbbcde4dce2c348 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 10 Aug 2023 09:13:02 -0400 Subject: [PATCH] Packit: enable eln builds, enable wasmedge on all non-eln builds The pre-merge copr build tasks for centos stream now use `epel-next` environments, where wasmedge is available by default. So, wasmedge support can be enabled for all non-ELN builds, including copr and koji. This commit also enables Fedora eln builds in .packit.yaml. Signed-off-by: Lokesh Mandvekar --- .packit.yaml | 2 ++ rpm/crun.spec | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 190803e40..fa8738791 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -19,6 +19,8 @@ jobs: 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 diff --git a/rpm/crun.spec b/rpm/crun.spec index b46c51503..5044987c0 100644 --- a/rpm/crun.spec +++ b/rpm/crun.spec @@ -6,8 +6,8 @@ %ifarch aarch64 || x86_64 %global wasm_support 1 -# wasmedge only found on Fedora and environments with epel enabled -%if %{defined fedora} || (%{defined copr_project} && "%{copr_project}" == "podman-next") +# wasmedge not present on Fedora ELN environments +%if !0%{?eln} %global wasmedge_support 1 %global wasmedge_opts --with-wasmedge %endif @@ -39,9 +39,9 @@ Epoch: 102 # If you're reading this on dist-git, the version is automatically filled in by Packit. Version: 0 Release: %autorelease +URL: https://github.com/containers/%{name} Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz License: GPL-2.0-only -URL: https://github.com/containers/%{name} %if %{defined golang_arches_future} ExclusiveArch: %{golang_arches_future} %else @@ -65,7 +65,6 @@ BuildRequires: protobuf-c-devel BuildRequires: criu-devel >= 3.17.1-2 Recommends: criu >= 3.17.1 Recommends: criu-libs -BuildRequires: %{_bindir}/go-md2man %if %{defined wasmedge_support} BuildRequires: wasmedge-devel %endif