[mickledore][PATCH] cni: fix textrel QA issue

[mickledore][PATCH] cni: fix textrel QA issue

[Martin Jansa]

From: Chen Qi <Qi.Chen@windriver.com>

When building cni, we get textrel QA issue like below:

  cni: ELF binary /usr/libexec/cni/macvlan has relocations in .text

The problem could be solved by adding '-buildmode=pie' to ${GO}.

In go.bbclass, this flag is added to GOBUILDFLAGS conditionally,
that is, if the arch is not mips nor riscv32, this '-buildmode=pie'
is added to GOBUILDFLAGS. So make use of that.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 recipes-networking/cni/cni_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb
index 35aea39..06cef81 100644
--- a/recipes-networking/cni/cni_git.bb
+++ b/recipes-networking/cni/cni_git.bb
@@ -38,10 +38,10 @@ do_compile() {
 	export GO111MODULE=off
 
 	cd ${B}/src/github.com/containernetworking/cni/libcni
-	${GO} build -trimpath
+	${GO} build ${GOBUILDFLAGS}
 
 	cd ${B}/src/github.com/containernetworking/cni/cnitool
-	${GO} build -trimpath
+	${GO} build ${GOBUILDFLAGS}
 
 	cd ${B}/src/github.com/containernetworking/plugins
 	PLUGINS="$(ls -d plugins/meta/*; ls -d plugins/ipam/*; ls -d plugins/main/* | grep -v windows)"
@@ -49,7 +49,7 @@ do_compile() {
 	for p in $PLUGINS; do
 	    plugin="$(basename "$p")"
 	    echo "building: $p"
-	    ${GO} build -trimpath -o ${B}/plugins/bin/$plugin github.com/containernetworking/plugins/$p
+	    ${GO} build ${GOBUILDFLAGS} -o ${B}/plugins/bin/$plugin github.com/containernetworking/plugins/$p
 	done
 }
 
-- 
2.41.0

Re: [mickledore][PATCH] cni: fix textrel QA issue

[Bruce Ashfield]

In message: [mickledore][PATCH] cni: fix textrel QA issue
on 07/07/2023 Martin Jansa wrote:

> From: Chen Qi <Qi.Chen@windriver.com>
> 
> When building cni, we get textrel QA issue like below:
> 
>   cni: ELF binary /usr/libexec/cni/macvlan has relocations in .text
> 
> The problem could be solved by adding '-buildmode=pie' to ${GO}.
> 
> In go.bbclass, this flag is added to GOBUILDFLAGS conditionally,
> that is, if the arch is not mips nor riscv32, this '-buildmode=pie'
> is added to GOBUILDFLAGS. So make use of that.

merged.

Bruce

> 
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> ---
>  recipes-networking/cni/cni_git.bb | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb
> index 35aea39..06cef81 100644
> --- a/recipes-networking/cni/cni_git.bb
> +++ b/recipes-networking/cni/cni_git.bb
> @@ -38,10 +38,10 @@ do_compile() {
>  	export GO111MODULE=off
>  
>  	cd ${B}/src/github.com/containernetworking/cni/libcni
> -	${GO} build -trimpath
> +	${GO} build ${GOBUILDFLAGS}
>  
>  	cd ${B}/src/github.com/containernetworking/cni/cnitool
> -	${GO} build -trimpath
> +	${GO} build ${GOBUILDFLAGS}
>  
>  	cd ${B}/src/github.com/containernetworking/plugins
>  	PLUGINS="$(ls -d plugins/meta/*; ls -d plugins/ipam/*; ls -d plugins/main/* | grep -v windows)"
> @@ -49,7 +49,7 @@ do_compile() {
>  	for p in $PLUGINS; do
>  	    plugin="$(basename "$p")"
>  	    echo "building: $p"
> -	    ${GO} build -trimpath -o ${B}/plugins/bin/$plugin github.com/containernetworking/plugins/$p
> +	    ${GO} build ${GOBUILDFLAGS} -o ${B}/plugins/bin/$plugin github.com/containernetworking/plugins/$p
>  	done
>  }
>  
> -- 
> 2.41.0
>