Re: [yocto] [PATCH][meta-virtualization] docker-distribution: fix do package qa warning

[Changqing Li]

On 09/30/2018 01:12 AM, Bruce Ashfield wrote:

These are all to the wrong mailing list, please resend them
to the meta-virtualization list.

OK.

On 2018-09-29 5:26 AM, changqing...@windriver.com wrote:

From: Changqing Li <changqing...@windriver.com>

fix below warning:

1.do_package_qa: QA Issue: No GNU_HASH in the elf binary: xxx/usr/sbin/registry' [ldflags]

2.do_package_qa: QA Issue: ELF binary 'xxx/usr/sbin/registry'
has relocations in .text [textrel]

These need to be 2 separate patches on the resend.

Bruce

Got it.

//Sandy

Add GOBUILDFLAGS which have -buildmode=pie to fix the second problem

Signed-off-by: Changqing Li <changqing...@windriver.com>
---
  .../docker-distribution/docker-distribution_git.bb |  3 +-

  .../files/0001-fix-do_package_qa-error.patch       | 32 ++++++++++++++++++++++

  2 files changed, 34 insertions(+), 1 deletion(-)

  create mode 100644 recipes-containers/docker-distribution/files/0001-fix-do_package_qa-error.patch

diff --git a/recipes-containers/docker-distribution/docker-distribution_git.bb b/recipes-containers/docker-distribution/docker-distribution_git.bb

index add5ce1..23d94c9 100644
--- a/recipes-containers/docker-distribution/docker-distribution_git.bb
+++ b/recipes-containers/docker-distribution/docker-distribution_git.bb

@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314"

  SRCREV_distribution="48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89"

  SRC_URI = "git://github.com/docker/distribution.git;branch=release/2.6;name=distribution;destsuffix=git/src/github.com/docker/distribution \

             file://docker-registry.service \
+           file://0001-fix-do_package_qa-error.patch \
            "
    PACKAGES =+ "docker-registry"
@@ -57,7 +58,7 @@ do_install() {
  }
    INSANE_SKIP_${PN} += "ldflags already-stripped"
-INSANE_SKIP_docker-registry += "ldflags already-stripped"
+INSANE_SKIP_${MLPREFIX}docker-registry += "ldflags already-stripped"
    FILES_docker-registry = "${sbindir}/*"

  FILES_docker-registry += "${systemd_unitdir}/system/docker-registry.service" diff --git a/recipes-containers/docker-distribution/files/0001-fix-do_package_qa-error.patch b/recipes-containers/docker-distribution/files/0001-fix-do_package_qa-error.patch

new file mode 100644
index 0000000..269b0cd
--- /dev/null

+++ b/recipes-containers/docker-distribution/files/0001-fix-do_package_qa-error.patch

@@ -0,0 +1,32 @@
+From 4b9d701fabff8e7969db081406d00fa9fe46b3fd Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing...@windriver.com>
+Date: Thu, 27 Sep 2018 11:05:51 +0800
+Subject: [PATCH] fix do_package_qa error
+
+fix below error:
+do_package_qa: QA Issue: ELF binary 'xxx/usr/sbin/registry'
+has relocations in .text [textrel]
+
+Upstream-Status: Inappropriate [oe-specific]
+
+Signed-off-by: Changqing Li <changqing...@windriver.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 47b8f1d..13b0f92 100644
+--- a/Makefile
++++ b/Makefile
+@@ -39,7 +39,7 @@ GODEP=$(shell which godep || echo '')
+
+ ${PREFIX}/bin/registry: $(GOFILES)
+     @echo "+ $@"

+-    @go build -tags "${DOCKER_BUILDTAGS}" -o $@ ${GO_LDFLAGS} ${GO_GCFLAGS} ./cmd/registry ++    @go build -tags "${DOCKER_BUILDTAGS}" -o $@ ${GO_LDFLAGS} ${GOBUILDFLAGS} ${GO_GCFLAGS} ./cmd/registry

+
+ ${PREFIX}/bin/digest:  $(GOFILES)
+     @echo "+ $@"
+--
+2.7.4
+

--
BRs

Sandy(Li Changqing)
Wind River Linux

--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto