!47 sync from 20.03-LTS-SP4: strip binary files, change systemd unit file permission to 644
From: @fuowang Reviewed-by: @yangzhao_kl Signed-off-by: @yangzhao_kl
This commit is contained in:
commit
712efc2a23
@ -16,7 +16,7 @@
|
||||
|
||||
Name: %{project}-%{repo}
|
||||
Version: 1.1.1
|
||||
Release: 4
|
||||
Release: 6
|
||||
Summary: Libraries for use by writing CNI plugin
|
||||
License: ASL 2.0
|
||||
URL: https://github.com/containernetworking/plugins
|
||||
@ -213,13 +213,14 @@ GO111MODULE=off CGO_ENABLED=0 GOPATH=$TMPDIR go build -tags "$TAGS" \
|
||||
|
||||
%install
|
||||
install -d -p %{buildroot}%{_libexecdir}/cni/
|
||||
strip bin/*
|
||||
install -p -m 0755 bin/* %{buildroot}/%{_libexecdir}/cni
|
||||
cp %{_builddir}/cni %{buildroot}%{_libexecdir}/cni/
|
||||
install -d -p %{buildroot}/%{gopath}/src/github.com/containernetworking/plugins/
|
||||
|
||||
install -dp %{buildroot}%{_unitdir}
|
||||
install -p plugins/ipam/dhcp/systemd/cni-dhcp.service %{buildroot}%{_unitdir}
|
||||
install -p plugins/ipam/dhcp/systemd/cni-dhcp.socket %{buildroot}%{_unitdir}
|
||||
install -p -m 0644 plugins/ipam/dhcp/systemd/cni-dhcp.service %{buildroot}%{_unitdir}
|
||||
install -p -m 0644 plugins/ipam/dhcp/systemd/cni-dhcp.socket %{buildroot}%{_unitdir}
|
||||
|
||||
# source codes for building projects
|
||||
%if 0%{?with_devel}
|
||||
@ -330,6 +331,12 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jun 24 2024 wangshuo <wangshuo@kylinos.cn> - 1.1.1-6
|
||||
- change systemd unit file permission to 644
|
||||
|
||||
* Fri Jun 21 2024 zmr_2020 <zhang_jian7@hopeddrun.com> - 1.1.1-5
|
||||
- strip binary files
|
||||
|
||||
* Thu Dec 28 2023 yaoxin <yao_xin001@hoperun.com> - 1.1.1-4
|
||||
- Rebuild for golang cves: CVE-2023-24534,CVE-2023-24536,CVE-2023-24537 and CVE-2023-24538
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user