summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2023-12-11 10:53:20 +0100
committerBruce Ashfield <bruce.ashfield@gmail.com>2023-12-14 19:59:10 +0000
commit88327090d26955a678c6f8bd2585aad4d802f6c4 (patch)
tree8554063b8810a1129ba4f37042e34e6bfbb77db9
parent33f31493ed2b233c75e2a2316b7f3323d23aa9d3 (diff)
downloadmeta-virtualization-88327090d26955a678c6f8bd2585aad4d802f6c4.tar.gz
cni: clean dir ${B}/plugins before do_compile
Clean dir ${B}/plugins before do_compile to avoid cni generated binaries like /usr/libexec/cni/bridge has wrong dynamic linker path and reports error like: /usr/libexec/cni/bridge: no such file or directory". Reproduce steps: 1. bitbake cni 2. enable usrmerge feature in local.conf 3. bitbake cni After step 2, GOBUILDFLAGS changed, "-I /lib64/ld-linux-aarch64.so.1" -> "/usr/lib/ld-linux-aarch64.so.1" But "go build" seems only check if the cached packagefile changed, since all not changed, the dynamic linker still use the old one, maybe go build should improve this. Clean dir ${B}/plugins to trigger rebuild of the binaries here. Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--recipes-networking/cni/cni_git.bb2
1 files changed, 2 insertions, 0 deletions
diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb
index 854c7a04..f84e8a43 100644
--- a/recipes-networking/cni/cni_git.bb
+++ b/recipes-networking/cni/cni_git.bb
@@ -54,6 +54,8 @@ do_compile() {
54 done 54 done
55} 55}
56 56
57do_compile[cleandirs] = "${B}/plugins"
58
57do_install() { 59do_install() {
58 localbindir="${libexecdir}/cni/" 60 localbindir="${libexecdir}/cni/"
59 61