opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-03 01:08:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22457 from lsm5/remove-el8

Browse Source 
[skip-ci] Packit/rpm: remove el8 jobs and spec conditionals
This commit is contained in:
Paul Holzinger
2024-04-23 10:17:27 +02:00
committed by GitHub
parent 7986eeaf6a 333682132a
commit 6bab09c51d
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.packit.yaml
View File

@ -45,8 +45,6 @@ jobs:
message: "Ephemeral COPR build failed. @containers/packit-build please check." message: "Ephemeral COPR build failed. @containers/packit-build please check."
enable_net: true enable_net: true
targets: targets:
- centos-stream+epel-next-8-x86_64
- centos-stream+epel-next-8-aarch64
- epel-9-x86_64 - epel-9-x86_64
- epel-9-aarch64 - epel-9-aarch64
- centos-stream-10-x86_64 - centos-stream-10-x86_64

8
rpm/podman.spec
View File

@ -11,13 +11,8 @@
# set it separately here and do not depend on RHEL's go-[s]rpm-macros package # set it separately here and do not depend on RHEL's go-[s]rpm-macros package
# until that's fixed. # until that's fixed.
# c9s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227328 # 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 %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 %{?**}; %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 %endif
%global gomodulesmode GO111MODULE=on %global gomodulesmode GO111MODULE=on
@ -96,9 +91,6 @@ BuildRequires: man-db
BuildRequires: ostree-devel BuildRequires: ostree-devel
BuildRequires: systemd BuildRequires: systemd
BuildRequires: systemd-devel BuildRequires: systemd-devel
%if %{defined rhel8py3}
BuildRequires: python3
%endif
Requires: catatonit Requires: catatonit
Requires: conmon >= 2:2.1.7-2 Requires: conmon >= 2:2.1.7-2
%if %{defined fedora} && 0%{?fedora} >= 40 %if %{defined fedora} && 0%{?fedora} >= 40