From: Chen Qi <[email protected]>

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 <[email protected]>
Signed-off-by: Bruce Ashfield <[email protected]>
---
 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 fd9115ab..854c7a04 100644
--- a/recipes-networking/cni/cni_git.bb
+++ b/recipes-networking/cni/cni_git.bb
@@ -39,10 +39,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)"
@@ -50,7 +50,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.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#8493): 
https://lists.yoctoproject.org/g/meta-virtualization/message/8493
Mute This Topic: https://lists.yoctoproject.org/mt/103105936/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to