From 0cc4d01dcbcaf1aa880b4ccc55c46b9ed343bef4 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 29 Jun 2023 10:17:09 +0800 Subject: cni: fix textrel QA issue 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 Signed-off-by: Bruce Ashfield --- recipes-networking/cni/cni_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes-networking/cni/cni_git.bb') diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb index 35aea39a..06cef81f 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 } -- cgit v1.2.3-54-g00ecf