MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

docker-compose: fix textrel QA issue

Browse Source 
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>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Chen Qi 2023-09-26 22:54:10 -07:00 committed by Bruce Ashfield
parent 7e9472c72b
commit 827092c2ec
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
recipes-containers/docker-compose/docker-compose_git.bb
View File

@ -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() {