starlingx
/
integ
Code Issues Proposed changes

Fix bond CNI install path 

Recent commit 54f2f7d6c6 made
changes to the install path of the containernetworking-plugins
from /usr/libexec/cni/ to /opt/bin/cni/ as part of making
/usr readonly to support OSTree.

Since the bond-cni plugin is not distributed with the other
containernetworking-plugins, the same change needs to be
made in the bond-cni package.

Closes-Bug: 1976111

Testing:

Ensure /opt/cni/bin/bond exists on both Debian and CentOS.

Signed-off-by: Steven Webster <steven.webster@windriver.com>
Change-Id: I48b47100d14c77818daf42cb24b7146ae6672e35
This commit is contained in:
Steven Webster 2022-05-27 13:55:33 -04:00
parent 27e8171ab6
commit 478a4e59ad
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kubernetes/cni/bond-cni/centos/bond-cni.spec
View File

@ -58,8 +58,8 @@ echo "Building bond-cni plugin"
%gobuild -o "${PWD}/bin/bond" "${PWD}/bond/"
%install
install -d -p %{buildroot}%{_libexecdir}/cni/
install -p -m 0755 bin/* %{buildroot}/%{_libexecdir}/cni
install -d -p %{buildroot}/opt/cni/bin
install -p -m 0755 bin/* %{buildroot}/opt/cni/bin
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
@ -67,9 +67,11 @@ install -p -m 0755 bin/* %{buildroot}/%{_libexecdir}/cni
%files
%license LICENSE
%doc *.md
%dir %{_libexecdir}/cni
%{_libexecdir}/cni/*
%dir /opt/cni/bin
/opt/cni/bin/*
%changelog
* Fri May 27 2022 Steven Webster <steven.webster@windriver.com>
- Update install directory to /opt/cni/bin.
* Fri Jan 21 2022 Steven Webster <steven.webster@windriver.com>
- Initial package, based on v1.0 + 14 additional commits.

2
kubernetes/cni/bond-cni/debian/deb_folder/bond-cni.install
View File

@ -1 +1 @@
bond /usr/libexec/cni/
bond /opt/cni/bin/