!12 修改因架构构建失败问题

From: @lizhuang1314 
Reviewed-by: @yangzhao_kl 
Signed-off-by: @yangzhao_kl
This commit is contained in:
openeuler-ci-bot 2022-04-21 13:11:02 +00:00 committed by Gitee
commit ea5d8aaed8
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -2,24 +2,19 @@
Name: prometheus2 Name: prometheus2
Version: 2.20.0 Version: 2.20.0
Release: 2 Release: 3
Summary: The Prometheus 2.x monitoring system and time series database. Summary: The Prometheus 2.x monitoring system and time series database.
License: ASL 2.0 License: ASL 2.0
URL: https://prometheus.io URL: https://prometheus.io
Conflicts: prometheus Conflicts: prometheus
%ifarch aarch64
%global hostarch arm64
%endif
%ifarch x86_64
%global hostarch amd64
%endif
BuildRequires: systemd BuildRequires: systemd
Source0: prometheus-%{version}.linux-%{hostarch}.tar.gz Source0: prometheus-%{version}.linux-arm64.tar.gz
Source1: prometheus.service Source1: prometheus-%{version}.linux-amd64.tar.gz
Source2: prometheus.default Source2: prometheus.service
Source3: prometheus.default
%{?systemd_requires} %{?systemd_requires}
Requires(pre): shadow-utils Requires(pre): shadow-utils
@ -31,7 +26,13 @@ configured targets at given intervals, evaluates rule expressions, displays the
results, and can trigger alerts if some condition is observed to be true. results, and can trigger alerts if some condition is observed to be true.
%prep %prep
%setup -q -n prometheus-%{version}.linux-%{hostarch} %ifarch aarch64
%setup -q -b 0 -n prometheus-%{version}.linux-arm64
%endif
%ifarch x86_64
%setup -q -b 1 -n prometheus-%{version}.linux-amd64
%endif
%build %build
/bin/true /bin/true
@ -45,10 +46,11 @@ for dir in console_libraries consoles; do
for file in ${dir}/*; do for file in ${dir}/*; do
install -D -m 644 ${file} %{buildroot}%{_datarootdir}/prometheus/${file} install -D -m 644 ${file} %{buildroot}%{_datarootdir}/prometheus/${file}
done done
done done
install -D -m 644 prometheus.yml %{buildroot}%{_sysconfdir}/prometheus/prometheus.yml install -D -m 644 prometheus.yml %{buildroot}%{_sysconfdir}/prometheus/prometheus.yml
install -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/prometheus.service install -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/prometheus.service
install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/default/prometheus install -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/default/prometheus
%pre %pre
getent group prometheus >/dev/null || groupadd -r prometheus getent group prometheus >/dev/null || groupadd -r prometheus
@ -78,6 +80,9 @@ exit 0
%dir %attr(755, prometheus, prometheus)%{_sharedstatedir}/prometheus %dir %attr(755, prometheus, prometheus)%{_sharedstatedir}/prometheus
%changelog %changelog
* Wed Apr 20 2022 zhuang.li <zhuang.li@turbolinux.com.cn>
- Modify the schema judgment, resulting in compilation failure
* Tue Dec 14 2021 konglidong <konglidong@uniontech.com> - 2.20.0-2 * Tue Dec 14 2021 konglidong <konglidong@uniontech.com> - 2.20.0-2
- modify format and delete %dist - modify format and delete %dist