- Remove fp
- Add _target_platform var
This commit is contained in:
parent
e4cae60bb5
commit
fb9988e7e5
@ -3,17 +3,6 @@
|
||||
# and mirrorlist should be set as default
|
||||
%bcond_without beta
|
||||
|
||||
# Needs only for first build, because we should have right arch names
|
||||
%if 0%{?x86_64_v2} == 1
|
||||
%global _build_name_fmt %{ARCH}/%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}_v2.rpm
|
||||
%global _rpmfilename %{ARCH}/%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}_v2.rpm
|
||||
%endif
|
||||
%if 0%{?x86_64_fp} == 1
|
||||
%global _build_name_fmt %{ARCH}/%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}_fp.rpm
|
||||
%global _rpmfilename %{ARCH}/%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}_fp.rpm
|
||||
%endif
|
||||
|
||||
|
||||
%global distro AlmaLinux
|
||||
%global release_name Seafoam Ocelot
|
||||
%global major 10
|
||||
@ -317,17 +306,9 @@ install -p -m 0644 %{SOURCE600} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/
|
||||
# These variables should be set in the build environment to change rpm names
|
||||
%if 0%{?x86_64_v2} == 1
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/rpm
|
||||
echo '%%_build_name_fmt %%{ARCH}_v2/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}_v2.rpm' > %{buildroot}%{_sysconfdir}/rpm/macros.arch_v2
|
||||
echo '%%_rpmfilename %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}_v2.rpm' >> %{buildroot}%{_sysconfdir}/rpm/macros.arch_v2
|
||||
echo '%%x86_64_v2 1' >> %{buildroot}%{_sysconfdir}/rpm/macros.arch_v2
|
||||
echo '%%__cflags_arch_x86_64_level -v2' >> %{buildroot}%{_sysconfdir}/rpm/macros.arch_v2
|
||||
%endif
|
||||
%if 0%{?x86_64_fp} == 1
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/rpm
|
||||
echo '%%_build_name_fmt %%{ARCH}_fp/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}_fp.rpm' > %{buildroot}%{_sysconfdir}/rpm/macros.arch_fp
|
||||
echo '%%_rpmfilename %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}_fp.rpm' >> %{buildroot}%{_sysconfdir}/rpm/macros.arch_fp
|
||||
echo '%%x86_64_fp 1' >> %{buildroot}%{_sysconfdir}/rpm/macros.arch_fp
|
||||
echo '%%_include_frame_pointers 1' >> %{buildroot}%{_sysconfdir}/rpm/macros.arch_fp
|
||||
echo '%%x86_64_v2 1' > %{buildroot}%{_sysconfdir}/rpm/macros.arch_v2
|
||||
echo '%%_include_frame_pointers 1' >> %{buildroot}%{_sysconfdir}/rpm/macros.arch_v2
|
||||
echo '%%_target_platform x86_64-%%{_vendor}-%%{_target_os}%%{?_gnu}' >> %{buildroot}%{_sysconfdir}/rpm/macros.arch_v2
|
||||
%endif
|
||||
|
||||
|
||||
@ -350,9 +331,6 @@ echo '%%_include_frame_pointers 1' >> %{buildroot}%{_sysconfdir}/rpm/macros.arc
|
||||
%{_prefix}/lib/systemd/system-preset/*
|
||||
%{_prefix}/lib/systemd/user-preset/*
|
||||
%{_prefix}/lib/sysctl.d/50-redhat.conf
|
||||
%if 0%{?x86_64_fp} == 1
|
||||
%config(noreplace) %{_sysconfdir}/rpm/macros.arch_fp
|
||||
%endif
|
||||
%if 0%{?x86_64_v2} == 1
|
||||
%config(noreplace) %{_sysconfdir}/rpm/macros.arch_v2
|
||||
%endif
|
||||
|
Loading…
Reference in New Issue
Block a user