Unify the build with Fedora
It clarifies that %golang_arches_future are meant for RHEL 10, and drops the custom /etc/containers/toolbox.conf from RHEL 10. There's no need to do a build just for this. Resolves: RHEL-19772
This commit is contained in:
parent
d4673ed8f9
commit
e6e959cdec
@ -1,5 +1,8 @@
|
|||||||
# https://one.redhat.com/rhel-developer-guide/#_modifying_a_per_package_rpminspect_yaml_file
|
# https://one.redhat.com/rhel-developer-guide/#_modifying_a_per_package_rpminspect_yaml_file
|
||||||
# https://github.com/rpminspect/rpminspect/blob/master/data/generic.yaml
|
# https://github.com/rpminspect/rpminspect/blob/master/data/generic.yaml
|
||||||
|
# https://github.com/rpminspect/rpminspect-data-fedora/blob/main/fedora.yaml
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
annocheck:
|
annocheck:
|
||||||
- hardened: --ignore-unknown --verbose --skip-run-path
|
- hardened: --ignore-unknown --verbose --skip-run-path
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 865f58881c17c233f288b8978faaeba8b4b2c2f0 Mon Sep 17 00:00:00 2001
|
From 4f8b443ab925c84d059d894ddcfcf4dcf66a747e Mon Sep 17 00:00:00 2001
|
||||||
From: Debarshi Ray <rishi@fedoraproject.org>
|
From: Debarshi Ray <rishi@fedoraproject.org>
|
||||||
Date: Mon, 29 Jun 2020 17:57:47 +0200
|
Date: Mon, 29 Jun 2020 17:57:47 +0200
|
||||||
Subject: [PATCH] build: Make the build flags match Fedora's %{gobuildflags}
|
Subject: [PATCH] build: Make the build flags match Fedora's %{gobuildflags}
|
||||||
@ -50,5 +50,5 @@ index c572d6dfb02b..cae2de426a96 100755
|
|||||||
|
|
||||||
exit "$?"
|
exit "$?"
|
||||||
--
|
--
|
||||||
2.39.2
|
2.43.0
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From f4582e4748a15c462eac229f9bd9214415f166c9 Mon Sep 17 00:00:00 2001
|
From 3175ef2fab1f61f5784361070ac338dabda3c04e Mon Sep 17 00:00:00 2001
|
||||||
From: Debarshi Ray <rishi@fedoraproject.org>
|
From: Debarshi Ray <rishi@fedoraproject.org>
|
||||||
Date: Mon, 29 Jun 2020 17:57:47 +0200
|
Date: Mon, 29 Jun 2020 17:57:47 +0200
|
||||||
Subject: [PATCH] build: Make the build flags match Fedora's %{gobuildflags}
|
Subject: [PATCH] build: Make the build flags match Fedora's %{gobuildflags}
|
||||||
@ -50,5 +50,5 @@ index c572d6dfb02b..0e6a2efa6853 100755
|
|||||||
|
|
||||||
exit "$?"
|
exit "$?"
|
||||||
--
|
--
|
||||||
2.39.2
|
2.43.0
|
||||||
|
|
||||||
|
16
toolbox.spec
16
toolbox.spec
@ -5,11 +5,17 @@ Version: 0.0.99.4
|
|||||||
|
|
||||||
%global goipath github.com/containers/%{name}
|
%global goipath github.com/containers/%{name}
|
||||||
|
|
||||||
%if 0%{?rhel} == 9
|
%if 0%{?fedora}
|
||||||
|
%gometa -f
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?rhel}
|
||||||
|
%if 0%{?rhel} <= 9
|
||||||
%gometa
|
%gometa
|
||||||
%else
|
%else
|
||||||
%gometa -f
|
%gometa -f
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
Release: 7%{?dist}
|
Release: 7%{?dist}
|
||||||
Summary: Tool for containerized command line environments on Linux
|
Summary: Tool for containerized command line environments on Linux
|
||||||
@ -87,6 +93,7 @@ Requires: skopeo
|
|||||||
Requires: bats
|
Requires: bats
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%description tests
|
%description tests
|
||||||
The %{name}-tests package contains system tests for %{name}.
|
The %{name}-tests package contains system tests for %{name}.
|
||||||
|
|
||||||
@ -112,8 +119,10 @@ The %{name}-tests package contains system tests for %{name}.
|
|||||||
%patch201 -p1
|
%patch201 -p1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?rhel} <= 9
|
||||||
%patch202 -p1
|
%patch202 -p1
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
%gomkdir -s %{_builddir}/%{extractdir}/src %{?rhel:-k}
|
%gomkdir -s %{_builddir}/%{extractdir}/src %{?rhel:-k}
|
||||||
|
|
||||||
@ -126,7 +135,9 @@ export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_
|
|||||||
%meson \
|
%meson \
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
-Dfish_completions_dir=%{_datadir}/fish/vendor_completions.d \
|
-Dfish_completions_dir=%{_datadir}/fish/vendor_completions.d \
|
||||||
|
%if 0%{?rhel} <= 9
|
||||||
-Dmigration_path_for_coreos_toolbox=true \
|
-Dmigration_path_for_coreos_toolbox=true \
|
||||||
|
%endif
|
||||||
%endif
|
%endif
|
||||||
-Dprofile_dir=%{_sysconfdir}/profile.d \
|
-Dprofile_dir=%{_sysconfdir}/profile.d \
|
||||||
-Dtmpfiles_dir=%{_tmpfilesdir} \
|
-Dtmpfiles_dir=%{_tmpfilesdir} \
|
||||||
@ -143,8 +154,10 @@ export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_
|
|||||||
%meson_install
|
%meson_install
|
||||||
|
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
|
%if 0%{?rhel} <= 9
|
||||||
install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
|
install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
@ -161,6 +174,7 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf
|
|||||||
%{_sysconfdir}/profile.d/%{name}.sh
|
%{_sysconfdir}/profile.d/%{name}.sh
|
||||||
%{_tmpfilesdir}/%{name}.conf
|
%{_tmpfilesdir}/%{name}.conf
|
||||||
|
|
||||||
|
|
||||||
%files tests
|
%files tests
|
||||||
%{_datadir}/%{name}
|
%{_datadir}/%{name}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user