From: Qi.Chen@windriver.com
To: meta-virtualization@lists.yoctoproject.org
Subject: [meta-virtualization][PATCH V2] docker-compose: fix textrel QA issue
Date: Tue, 26 Sep 2023 22:54:10 -0700 [thread overview]
Message-ID: <20230927055410.1833651-1-Qi.Chen@windriver.com> (raw)
From: Chen Qi <Qi.Chen@windriver.com>
Fix textrel QA issue like below:
ERROR: QA Issue: docker-compose: ELF binary /usr/lib/docker/cli-plugins/
docker-compose has relocations in .text [textrel]
The problem could be fixed by adding -buildmode=pie, as this option has
already been in GOBUILDFLAGS except for mips and riscv32, let's make
use of GOBUILDFLAGS.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
recipes-containers/docker-compose/docker-compose_git.bb | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/recipes-containers/docker-compose/docker-compose_git.bb b/recipes-containers/docker-compose/docker-compose_git.bb
index d528535c..f6a2502a 100644
--- a/recipes-containers/docker-compose/docker-compose_git.bb
+++ b/recipes-containers/docker-compose/docker-compose_git.bb
@@ -38,6 +38,7 @@ PACKAGECONFIG ?= ""
include relocation.inc
+GOBUILDFLAGS:append = " -mod=vendor"
do_compile() {
cd ${S}/src/import
@@ -50,8 +51,6 @@ do_compile() {
export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}"
export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}"
- export GOFLAGS="-mod=vendor -trimpath"
-
# our copied .go files are to be used for the build
ln -sf vendor.copy vendor
# inform go that we know what we are doing
@@ -60,7 +59,7 @@ do_compile() {
GO_LDFLAGS="-s -w -X internal.Version=${PV} -X ${COMPOSE_PKG}/internal.Version=${PV}"
GO_BUILDTAGS=""
mkdir -p ./bin
- ${GO} build $GOFLAGS -tags "$GO_BUILDTAGS" -ldflags "$GO_LDFLAGS" -o ./bin/docker-compose ./cmd
+ ${GO} build ${GOBUILDFLAGS} -tags "$GO_BUILDTAGS" -ldflags "$GO_LDFLAGS" -o ./bin/docker-compose ./cmd
}
do_install() {
--
2.40.0
next reply other threads:[~2023-09-27 5:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-27 5:54 Qi.Chen [this message]
2023-10-02 16:16 ` [meta-virtualization][PATCH V2] docker-compose: fix textrel QA issue Bruce Ashfield
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230927055410.1833651-1-Qi.Chen@windriver.com \
--to=qi.chen@windriver.com \
--cc=meta-virtualization@lists.yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).