In message: [meta-virtualization][PATCH] docker-compose: fix textrel QA issue on 17/09/2023 Chen Qi via lists.yoctoproject.org wrote:
> From: Chen Qi <[email protected]> > > 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. I tend to not use (or like) the defaults in the bbclass, but in this case, it is probably ok. > > Also, make use of GO_EXTRA_LDFLAGS to hold our this recipe's specific ldflags. I much prefer the explicit GO_LDFLAGS on the build line, versus the internally consumed GO_EXTRA_LDFLAGS. So I'd prefer to keep that as-is. Bruce > > Signed-off-by: Chen Qi <[email protected]> > --- > recipes-containers/docker-compose/docker-compose_git.bb | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/recipes-containers/docker-compose/docker-compose_git.bb > b/recipes-containers/docker-compose/docker-compose_git.bb > index 274fb520..8c0ddccf 100644 > --- a/recipes-containers/docker-compose/docker-compose_git.bb > +++ b/recipes-containers/docker-compose/docker-compose_git.bb > @@ -40,6 +40,8 @@ PACKAGECONFIG ?= "" > > include relocation.inc > > +GOBUILDFLAGS:append = " -mod=vendor" > +GO_EXTRA_LDFLAGS = "-s -w -X internal.Version=${PV} -X > ${COMPOSE_PKG}/internal.Version=${PV}" > do_compile() { > cd ${S}/src/import > > @@ -52,17 +54,14 @@ 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 > cp ${WORKDIR}/modules.txt vendor/ > > - 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" -o > ./bin/docker-compose ./cmd > } > > do_install() { > -- > 2.40.0 > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8318): https://lists.yoctoproject.org/g/meta-virtualization/message/8318 Mute This Topic: https://lists.yoctoproject.org/mt/101428849/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/leave/6693005/21656/1014668956/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
