starlingx/integ
Code Issues Proposed changes

debian: fix issue with bond-cni binary install

Browse Source 
This commit fixes an issue with the debian install of the
bond CNI plugin.

It was noticed that the 'bond' source directory was being
installed, rather than the built 'bond' binary.

Since the build output is a single binary, it will be
found in debian/bond-cni/, rather than the standard
debian/tmp/

dh_install is instructed where to find the build output
installed by dh_auto_install.

Testing:

- Debian build and install
- Confirmed the bond binary is at /var/opt/cni/bin/
- Functional testing to ensure a pod using the
  bond plugin could be launched

Depends-On: https://review.opendev.org/c/starlingx/integ/+/844865
Closes-Bug: 1976111

Signed-off-by: Steven Webster <steven.webster@windriver.com>
Change-Id: I2a504b8bfc210dc09487a496959da235dec82525
This commit is contained in:
Steven Webster 2022-06-14 16:07:58 -04:00
parent 5bc6930b0f
commit 0c0aa6ff67
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1 +1 @@
bond /var/opt/cni/bin/
usr/bin/* /var/opt/cni/bin/

4
kubernetes/cni/bond-cni/debian/deb_folder/rules
View File

@ -3,7 +3,11 @@
export PATH := /usr/lib/go-1.17/bin:$(PATH)
export DH_VERBOSE = 1
export DH_GOLANG_GO_GENERATE := 1
export INSTALL_DIR := $(CURDIR)/debian/bond-cni/
%:
dh $@ --buildsystem=golang --with=golang --builddirectory=_build
override_dh_install:
dh_install --sourcedir=$(INSTALL_DIR)