!5 [sync] PR-4: Add strip and pie
From: @openeuler-sync-bot Reviewed-by: @jxy_git Signed-off-by: @jxy_git
This commit is contained in:
commit
17a37c4a03
35
add-parameters-to-solve-the-strip.patch
Normal file
35
add-parameters-to-solve-the-strip.patch
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
From 0bd8cba374f1c735f48945fb14f165f087d49bd1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: jxy_git <jiangxinyu@kylinos.cn>
|
||||||
|
Date: Tue, 7 Mar 2023 16:54:00 +0800
|
||||||
|
Subject: [PATCH] add parameters to solve the strip
|
||||||
|
|
||||||
|
---
|
||||||
|
build/build.sh | 12 ++++++------
|
||||||
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/build/build.sh b/build/build.sh
|
||||||
|
index b8cae39..79cec50 100755
|
||||||
|
--- a/build/build.sh
|
||||||
|
+++ b/build/build.sh
|
||||||
|
@@ -37,12 +37,12 @@ if [ "${go_version:0:3}" = "1.4" ]; then
|
||||||
|
fi
|
||||||
|
|
||||||
|
ldflags="
|
||||||
|
- -X ${repo_path}/version.Version${ldseparator}${version}
|
||||||
|
- -X ${repo_path}/version.Revision${ldseparator}${revision}
|
||||||
|
- -X ${repo_path}/version.Branch${ldseparator}${branch}
|
||||||
|
- -X ${repo_path}/version.BuildUser${ldseparator}${BUILD_USER}
|
||||||
|
- -X ${repo_path}/version.BuildDate${ldseparator}${BUILD_DATE}
|
||||||
|
- -X ${repo_path}/version.GoVersion${ldseparator}${go_version}"
|
||||||
|
+ -w -s -linkmode=external -extldflags '-Wl,-z,relro -Wl,-z,now -pie' -X ${repo_path}/version.Version${ldseparator}${version}
|
||||||
|
+ -w -s -linkmode=external -extldflags '-Wl,-z,relro -Wl,-z,now -pie' -X ${repo_path}/version.Revision${ldseparator}${revision}
|
||||||
|
+ -w -s -linkmode=external -extldflags '-Wl,-z,relro -Wl,-z,now -pie' -X ${repo_path}/version.Branch${ldseparator}${branch}
|
||||||
|
+ -w -s -linkmode=external -extldflags '-Wl,-z,relro -Wl,-z,now -pie' -X ${repo_path}/version.BuildUser${ldseparator}${BUILD_USER}
|
||||||
|
+ -w -s -linkmode=external -extldflags '-Wl,-z,relro -Wl,-z,now -pie' -X ${repo_path}/version.BuildDate${ldseparator}${BUILD_DATE}
|
||||||
|
+ -w -s -linkmode=external -extldflags '-Wl,-z,relro -Wl,-z,now -pie' -X ${repo_path}/version.GoVersion${ldseparator}${go_version}"
|
||||||
|
|
||||||
|
echo ">> building cadvisor"
|
||||||
|
|
||||||
|
--
|
||||||
|
2.39.1
|
||||||
|
|
||||||
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Name: cadvisor
|
Name: cadvisor
|
||||||
Version: 0.37.0
|
Version: 0.37.0
|
||||||
Release: 2
|
Release: 3
|
||||||
Summary: Analyzes resource usage and performance characteristics of running containers.
|
Summary: Analyzes resource usage and performance characteristics of running containers.
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: https://github.com/google/cadvisor
|
URL: https://github.com/google/cadvisor
|
||||||
@ -10,6 +10,7 @@ URL: https://github.com/google/cadvisor
|
|||||||
Source0: https://github.com/google/cadvisor/archive/v%{version}.tar.gz
|
Source0: https://github.com/google/cadvisor/archive/v%{version}.tar.gz
|
||||||
Source1: vendor.tar.gz
|
Source1: vendor.tar.gz
|
||||||
Patch0: use_preinstalled_go-bindata.patch
|
Patch0: use_preinstalled_go-bindata.patch
|
||||||
|
Patch1: add-parameters-to-solve-the-strip.patch
|
||||||
|
|
||||||
BuildRequires: golang >= 1.13
|
BuildRequires: golang >= 1.13
|
||||||
|
|
||||||
@ -29,9 +30,11 @@ and network statistics. This data is exported by container and machine-wide.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -T -n %{name}-%{version} -b 0 -b 1
|
%setup -q -T -n %{name}-%{version} -b 0 -b 1
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
GOFLAGS=-mod=vendor make build
|
export GOFLAGS="-mod=vendor -buildmode=pie"
|
||||||
|
make build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
install -D -m 755 cadvisor %{buildroot}%{_bindir}/cadvisor
|
install -D -m 755 cadvisor %{buildroot}%{_bindir}/cadvisor
|
||||||
@ -43,6 +46,9 @@ install -D -m 755 cadvisor %{buildroot}%{_bindir}/cadvisor
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Mar 07 2023 jiangxinyu <jiangxinyu@kylinos.cn> - 0.37.0-3
|
||||||
|
- Add strip and pie
|
||||||
|
|
||||||
* Fri Jul 22 2022 wo_cow <niuqianqian@huawei.com> - 0.37.0-2
|
* Fri Jul 22 2022 wo_cow <niuqianqian@huawei.com> - 0.37.0-2
|
||||||
- Fix build err: nothing provides go-bindata
|
- Fix build err: nothing provides go-bindata
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user