Compare commits
No commits in common. "a79ef2263193228b8b5c94d59a367428d552c51d" and "b0fb3ca4fa7508e8813eb4fb0870de57e420d67a" have entirely different histories.
a79ef22631
...
b0fb3ca4fa
@ -1,25 +0,0 @@
|
|||||||
From aff2dabb339e1b7a249ac60dd0b341a35210acc3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: yangzhao_kl <yangzhao1@kylinos.cn>
|
|
||||||
Date: Tue, 5 Sep 2023 15:52:42 +0800
|
|
||||||
Subject: [PATCH] use local promu
|
|
||||||
|
|
||||||
---
|
|
||||||
Makefile.common | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/Makefile.common b/Makefile.common
|
|
||||||
index e372d34..52658d5 100644
|
|
||||||
--- a/Makefile.common
|
|
||||||
+++ b/Makefile.common
|
|
||||||
@@ -195,7 +195,7 @@ common-unused:
|
|
||||||
@git diff --exit-code -- go.sum go.mod
|
|
||||||
|
|
||||||
.PHONY: common-build
|
|
||||||
-common-build: promu
|
|
||||||
+common-build:
|
|
||||||
@echo ">> building binaries"
|
|
||||||
$(PROMU) build --prefix $(PREFIX) $(PROMU_BINARIES)
|
|
||||||
|
|
||||||
--
|
|
||||||
2.33.0
|
|
||||||
|
|
||||||
@ -1,23 +1,19 @@
|
|||||||
%define debug_package %{nil}
|
%define debug_package %{nil}
|
||||||
|
|
||||||
Name: alertmanager
|
Name: alertmanager
|
||||||
Version: 0.26.0
|
Version: 0.21.0
|
||||||
Release: 2
|
Release: 4
|
||||||
Summary: Prometheus Alertmanager.
|
Summary: Prometheus Alertmanager.
|
||||||
License: Apache-2.0
|
License: ASL 2.0
|
||||||
URL: https://github.com/prometheus/%{name}
|
URL: https://github.com/prometheus/%{name}
|
||||||
|
|
||||||
|
|
||||||
Source0: https://github.com/prometheus/%{name}/archive/refs/tags/v%{version}.tar.gz
|
Source0: https://github.com/prometheus/%{name}/archive/refs/tags/v%{version}.tar.gz
|
||||||
Source1: %{name}.service
|
Source1: %{name}.service
|
||||||
Source2: %{name}.default
|
Source2: %{name}.default
|
||||||
Source3: %{name}.yml
|
Source3: %{name}.yml
|
||||||
Source4: vendor.tar.gz
|
|
||||||
Patch0: 0001-use-local-promu.patch
|
|
||||||
|
|
||||||
BuildRequires: make
|
BuildRequires: golang
|
||||||
BuildRequires: golang >= 1.18.0
|
|
||||||
BuildRequires: promu
|
|
||||||
BuildRequires: systemd
|
|
||||||
|
|
||||||
%{?systemd_requires}
|
%{?systemd_requires}
|
||||||
Requires(pre): shadow-utils
|
Requires(pre): shadow-utils
|
||||||
@ -30,25 +26,15 @@ takes care of silencing and inhibition of alerts.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version}
|
%setup -q -n %{name}-%{version}
|
||||||
%patch0 -p1
|
|
||||||
tar -xzvf %{SOURCE4}
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mkdir -p $(go env GOPATH)/bin/
|
go build -mod=vendor -o %{_builddir}/%{name}-%{version}/bin/alertmanager ./cmd/alertmanager
|
||||||
cp -n $(which promu) $(go env GOPATH)/bin/
|
go build -mod=vendor -o %{_builddir}/%{name}-%{version}/bin/amtool ./cmd/amtool
|
||||||
|
|
||||||
export GOFLAGS="-mod=vendor -buildmode=pie
|
|
||||||
%ifarch riscv64
|
|
||||||
-gcflags=all=-d=wrapglobalmapctl=1
|
|
||||||
%endif
|
|
||||||
"
|
|
||||||
make build
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
mkdir -vp %{buildroot}%{_sharedstatedir}/prometheus
|
mkdir -vp %{buildroot}%{_sharedstatedir}/prometheus
|
||||||
install -D -m 755 -vd %{buildroot}%{_bindir}
|
install -D -m 755 -vd %{buildroot}%{_bindir}
|
||||||
install -D -m 755 -vp alertmanager %{buildroot}%{_bindir}
|
install -D -m 755 -vp %{_builddir}/%{name}-%{version}/bin/* %{buildroot}%{_bindir}
|
||||||
install -D -m 755 -vp amtool %{buildroot}%{_bindir}
|
|
||||||
install -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
|
install -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
|
||||||
install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/default/%{name}
|
install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/default/%{name}
|
||||||
install -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/prometheus/%{name}.yml
|
install -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/prometheus/%{name}.yml
|
||||||
@ -79,23 +65,6 @@ exit 0
|
|||||||
%dir %attr(755, prometheus, prometheus)%{_sharedstatedir}/prometheus
|
%dir %attr(755, prometheus, prometheus)%{_sharedstatedir}/prometheus
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Sat Mar 23 2024 Wenhui Tang <wenhui.oerv@isrc.iscas.ac.cn> - 0.26.0-2
|
|
||||||
- Append flags to GOFLAGS to fix go linker bugs for riscv
|
|
||||||
- Related issue: https://github.com/golang/go/issues/62465
|
|
||||||
- This is a temporary solution that requires fixing the upstream riscv support for golang.
|
|
||||||
|
|
||||||
* Tue Sep 5 2023 Zhengxin Guo <guozhengxin@kylinos.cn> - 0.26.0-1
|
|
||||||
- update to 0.26.0 to fix CVE-2023-40577
|
|
||||||
|
|
||||||
* Wed May 31 2023 Wenlong Zhang<zhangwenlong@loongson.cn> - 0.21.0-7
|
|
||||||
- update sys and net to support loong64
|
|
||||||
|
|
||||||
* Tue Mar 07 2023 jiangxinyu <jiangxinyu@kylinos.cn> - 0.21.0-6
|
|
||||||
- Add strip and pie
|
|
||||||
|
|
||||||
* Fri Feb 03 2023 jiangxinyu <jiangxinyu@kylinos.cn> - 0.21.0-5
|
|
||||||
- Add buildRequires systemd
|
|
||||||
|
|
||||||
* Sat Jan 29 2022 yangzhao <yangzhao1@kylinos.cn> - 0.21.0-4
|
* Sat Jan 29 2022 yangzhao <yangzhao1@kylinos.cn> - 0.21.0-4
|
||||||
- Build from source code
|
- Build from source code
|
||||||
|
|
||||||
@ -105,4 +74,4 @@ exit 0
|
|||||||
- DESC: solve empty postun transaction issue.
|
- DESC: solve empty postun transaction issue.
|
||||||
|
|
||||||
* Tue Aug 11 2020 houjian <houjian@kylinos.cn> - 0.21.0-2
|
* Tue Aug 11 2020 houjian <houjian@kylinos.cn> - 0.21.0-2
|
||||||
- Package init
|
- Package init
|
||||||
BIN
v0.21.0.tar.gz
Normal file
BIN
v0.21.0.tar.gz
Normal file
Binary file not shown.
BIN
v0.26.0.tar.gz
BIN
v0.26.0.tar.gz
Binary file not shown.
BIN
vendor.tar.gz
BIN
vendor.tar.gz
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user