merged. Bruce
In message: [meta-virtualization][PATCH] nerdctl: fix textrel QA issue on 19/09/2023 Chen Qi via lists.yoctoproject.org wrote: > From: Chen Qi <[email protected]> > > Fix the following QA issue: > > ERROR: QA Issue: nerdctl: ELF binary /usr/bin/nerdctl has relocations in > .text [textrel] > > We want to use -buildmode=pie, in order to avoid duplicating codes with > go.bbclass, make use of GOBUILDFLAGS. > > Signed-off-by: Chen Qi <[email protected]> > --- > recipes-containers/nerdctl/nerdctl_git.bb | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/recipes-containers/nerdctl/nerdctl_git.bb > b/recipes-containers/nerdctl/nerdctl_git.bb > index 62460a52..f68223df 100644 > --- a/recipes-containers/nerdctl/nerdctl_git.bb > +++ b/recipes-containers/nerdctl/nerdctl_git.bb > @@ -51,6 +51,8 @@ PACKAGECONFIG ?= "" > # sets the "sites" variable. > include relocation.inc > > +PIEFLAG = "${@bb.utils.contains('GOBUILDFLAGS', '-buildmode=pie', > '-buildmode=pie', '', d)}" > + > do_compile() { > > cd ${S}/src/import > @@ -64,7 +66,7 @@ do_compile() { > export CGO_CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_TARGET}" > export CGO_LDFLAGS="${LDFLAGS} --sysroot=${STAGING_DIR_TARGET}" > > - export GOFLAGS="-mod=vendor -trimpath" > + export GOFLAGS="-mod=vendor -trimpath ${PIEFLAG}" > > # our copied .go files are to be used for the build > ln -sf vendor.copy vendor > -- > 2.40.0 > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8319): https://lists.yoctoproject.org/g/meta-virtualization/message/8319 Mute This Topic: https://lists.yoctoproject.org/mt/101473054/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/leave/6693005/21656/1014668956/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
