diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-03-13 11:00:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-13 11:00:15 -0400 |
| commit | ece2fd29cd5299a5a68873a397800d58e75d2e8e (patch) | |
| tree | 61e921ea66ae4cc104b99005f24732b11113ff38 | |
| parent | 8934c5cfc362c9ac8cd87dff8e3619d474d75e13 (diff) | |
| parent | 6e41d1f441f3b1d69fa6395267477b33be27316f (diff) | |
| download | podman-ece2fd29cd5299a5a68873a397800d58e75d2e8e.tar.gz podman-ece2fd29cd5299a5a68873a397800d58e75d2e8e.tar.bz2 podman-ece2fd29cd5299a5a68873a397800d58e75d2e8e.zip | |
Merge pull request #13486 from lsm5/copr-auto-build-rhel-8
podman.spec.rpkg: enable rhel8 builds on copr
| -rw-r--r-- | podman.spec.rpkg | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/podman.spec.rpkg b/podman.spec.rpkg index 0a1bc87cc..41385dba6 100644 --- a/podman.spec.rpkg +++ b/podman.spec.rpkg @@ -62,15 +62,18 @@ BuildRequires: glibc-devel BuildRequires: glibc-static BuildRequires: git-core BuildRequires: go-md2man +%if 0%{?fedora} || 0%{?rhel} >= 9 BuildRequires: go-rpm-macros +%endif +%if 0%{?rhel} <= 8 +BuildRequires: pkgconfig(devmapper) +%endif BuildRequires: gpgme-devel BuildRequires: libassuan-devel BuildRequires: libgpg-error-devel BuildRequires: libseccomp-devel BuildRequires: libselinux-devel -%if 0%{?fedora} >= 35 BuildRequires: shadow-utils-subid-devel -%endif BuildRequires: pkgconfig BuildRequires: make BuildRequires: ostree-devel @@ -175,22 +178,25 @@ ln -s ../../../../ src/%{import_path} popd ln -s vendor src +%if 0%{?rhel} +rm -rf vendor/github.com/containers/storage/drivers/register/register_btrfs.go +%endif + # build date. FIXME: Makefile uses '/v2/libpod', that doesn't work here? LDFLAGS="-X %{import_path}/libpod/define.buildInfo=$(date +%s)" # build rootlessport first -%gobuild -o bin/rootlessport %%{import_path}/cmd/rootlessport +%gobuild -o bin/rootlessport %{import_path}/cmd/rootlessport -# build %%{name} -export BUILDTAGS="seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/selinux_tag.sh) $(hack/systemd_tag.sh)" -%if 0%{?fedora} >= 35 -export BUILDTAGS+=" $(hack/libsubid_tag.sh)" -%endif +# set base buildtags common to both %%{name} and %%{name}-remote +export BASEBUILDTAGS="seccomp exclude_graphdriver_devicemapper $(hack/selinux_tag.sh) $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)" +# build %%{name} +export BUILDTAGS="$BASEBUILDTAGS $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh)" %gobuild -o bin/%{name} %{import_path}/cmd/%{name} # build %%{name}-remote -export BUILDTAGS+=" exclude_graphdriver_btrfs btrfs_noversion remote" +export BUILDTAGS="$BASEBUILDTAGS exclude_graphdriver_btrfs btrfs_noversion remote" %gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name} make docs docker-docs |