From 333682132aa00b41f615766e61103007fc2baf96 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 22 Apr 2024 11:52:33 -0400 Subject: [PATCH] [skip-ci] Packit/rpm: remove el8 jobs and spec conditionals EL8 will go EOL soon and nothing on main will be shipped to el8. Signed-off-by: Lokesh Mandvekar --- .packit.yaml | 2 -- rpm/podman.spec | 8 -------- 2 files changed, 10 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index b7dc1a7028..2e178893d0 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -45,8 +45,6 @@ jobs: message: "Ephemeral COPR build failed. @containers/packit-build please check." enable_net: true targets: - - centos-stream+epel-next-8-x86_64 - - centos-stream+epel-next-8-aarch64 - epel-9-x86_64 - epel-9-aarch64 - centos-stream-10-x86_64 diff --git a/rpm/podman.spec b/rpm/podman.spec index 9d2ffaa805..b84ac439ec 100644 --- a/rpm/podman.spec +++ b/rpm/podman.spec @@ -11,13 +11,8 @@ # set it separately here and do not depend on RHEL's go-[s]rpm-macros package # until that's fixed. # c9s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227328 -# c8s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227331 %if %{defined rhel} && 0%{?rhel} < 10 %define gobuild(o:) go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "-linkmode=external -compressdwarf=false ${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**}; -# python3 dep conditional for rhel8 -%if %{?rhel} == 8 -%define rhel8py3 1 -%endif %endif %global gomodulesmode GO111MODULE=on @@ -96,9 +91,6 @@ BuildRequires: man-db BuildRequires: ostree-devel BuildRequires: systemd BuildRequires: systemd-devel -%if %{defined rhel8py3} -BuildRequires: python3 -%endif Requires: catatonit Requires: conmon >= 2:2.1.7-2 %if %{defined fedora} && 0%{?fedora} >= 40