[mickledore][master][PATCH] cni: clean dir ${B}/plugins before do_compile

[mickledore][master][PATCH] cni: clean dir ${B}/plugins before do_compile

[changqing.li]

From: Changqing Li <changqing.li@windriver.com>

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>
---
 recipes-networking/cni/cni_git.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb
index 71880cd1..a1a31f2d 100644
--- a/recipes-networking/cni/cni_git.bb
+++ b/recipes-networking/cni/cni_git.bb
@@ -53,6 +53,8 @@ do_compile() {
 	done
 }
 
+do_compile[cleandirs] = "${B}/plugins"
+
 do_install() {
     localbindir="${libexecdir}/cni/"
 
-- 
2.25.1

Re: [meta-virtualization] [mickledore][master][PATCH] cni: clean dir ${B}/plugins before do_compile

[Bruce Ashfield]

merged to mickledore and staged for master.

Bruce

In message: [meta-virtualization] [mickledore][master][PATCH] cni: clean dir ${B}/plugins before do_compile
on 26/10/2023 Changqing Li wrote:

> From: Changqing Li <changqing.li@windriver.com>
> 
> 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>
> ---
>  recipes-networking/cni/cni_git.bb | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb
> index 71880cd1..a1a31f2d 100644
> --- a/recipes-networking/cni/cni_git.bb
> +++ b/recipes-networking/cni/cni_git.bb
> @@ -53,6 +53,8 @@ do_compile() {
>  	done
>  }
>  
> +do_compile[cleandirs] = "${B}/plugins"
> +
>  do_install() {
>      localbindir="${libexecdir}/cni/"
>  
> -- 
> 2.25.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#8399): https://lists.yoctoproject.org/g/meta-virtualization/message/8399
> Mute This Topic: https://lists.yoctoproject.org/mt/102197983/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>