[PATCH][meta-cloud-services] consul: add INSANE_SKIP for textrel

[PATCH][meta-cloud-services] consul: add INSANE_SKIP for textrel

[changqing.li]

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

1. for i586, bitbake consul will have QA error of textrel.
   consul-git-r0 do_package_qa: QA Issue: ELF binary i
   'work/i586-wrs-linux/consul/git-r0/packages-split/consul/usr/bin/consul'
   has relocations in .text [textrel]

   according to go doc:
   -buildmode=pie
   Build the listed main packages and everything they import into
   position independent executables (PIE). Packages not named
   main are ignored.

   checked use command "eu-findtextrel ./consul", functions not
   compiled with -fpic/-fPIC are from packages not named main, and
   also not imported into package main.

   so -buildmode=pie cannot reslove this problem. so refer commit
   b689c72a of oe-core, just skip it.

2. This problem is caused since security_flags.inc is used by default.
   so alternative work around is:
      SECURITY_CFLAGS_pn-consul = "${SECURITY_NOPIE_CFLAGS}"
      SECURITY_LDFLAGS_pn-consul = ""

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 recipes-connectivity/consul/consul_git.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/recipes-connectivity/consul/consul_git.bb b/recipes-connectivity/consul/consul_git.bb
index a44e0b2..ee49c5e 100644
--- a/recipes-connectivity/consul/consul_git.bb
+++ b/recipes-connectivity/consul/consul_git.bb
@@ -23,3 +23,6 @@ do_install_append() {
 }
 
 FILES_${PN} += "${systemd_unitdir}/system"
+
+#for i586, executable consul contains textrel
+INSANE_SKIP_${PN} += "textrel"
-- 
2.7.4

[PATCH] docker-distribution: fix do package qa warning[ldflags]

[changqing.li]

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

when bitbake lib32-docker-distribution, we might met below
warning:

lib32-docker-distribution-v2.6.2-r0 do_package_qa: QA Issue: No GNU_HASH
in the elf binary: 'work/core2-32-wrsmllib32-linux/lib32-docker-distribution
/v2.6.2-r0/packages-split/lib32-docker-registry/usr/sbin/registry' [ldflags]

which caused by "INSANE_SKIP_docker-registry += "ldflags already-stripped"
don't cover case for multilib, so add multilib prefix MLPREFIX
to fix it.

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 recipes-containers/docker-distribution/docker-distribution_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-containers/docker-distribution/docker-distribution_git.bb b/recipes-containers/docker-distribution/docker-distribution_git.bb
index add5ce1..d4f8098 100644
--- a/recipes-containers/docker-distribution/docker-distribution_git.bb
+++ b/recipes-containers/docker-distribution/docker-distribution_git.bb
@@ -57,7 +57,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"
-- 
2.7.4

Re: [PATCH] docker-distribution: fix do package qa warning[ldflags]

[Bruce Ashfield]

merged

Bruce
On Wed, Oct 10, 2018 at 2:59 AM <changqing.li@windriver.com> wrote:
>
> From: Changqing Li <changqing.li@windriver.com>
>
> when bitbake lib32-docker-distribution, we might met below
> warning:
>
> lib32-docker-distribution-v2.6.2-r0 do_package_qa: QA Issue: No GNU_HASH
> in the elf binary: 'work/core2-32-wrsmllib32-linux/lib32-docker-distribution
> /v2.6.2-r0/packages-split/lib32-docker-registry/usr/sbin/registry' [ldflags]
>
> which caused by "INSANE_SKIP_docker-registry += "ldflags already-stripped"
> don't cover case for multilib, so add multilib prefix MLPREFIX
> to fix it.
>
> Signed-off-by: Changqing Li <changqing.li@windriver.com>
> ---
>  recipes-containers/docker-distribution/docker-distribution_git.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/recipes-containers/docker-distribution/docker-distribution_git.bb b/recipes-containers/docker-distribution/docker-distribution_git.bb
> index add5ce1..d4f8098 100644
> --- a/recipes-containers/docker-distribution/docker-distribution_git.bb
> +++ b/recipes-containers/docker-distribution/docker-distribution_git.bb
> @@ -57,7 +57,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"
> --
> 2.7.4
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"

[PATCH] docker-distribution: fix do package qa warning [textrel]

[changqing.li]

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

1. After security flag PIE is enabled by default, we might met
below QA warning on some arch, like aarch64, fix it by skip
textrel QA check refer commit b689c72a of oe-core

docker-distribution-v2.6.2-r0 do_package_qa: QA Issue: ELF binary 
'work/aarch64-poky-linux/docker-distribution/v2.6.2-r0/packages-split/
docker-registry/usr/sbin/registry' has relocations in .text [textrel]

2. This problem is caused since security_flags.inc is used by default.
   so alternative work around is:
      SECURITY_CFLAGS_pn-docker-distribution = "${SECURITY_NOPIE_CFLAGS}"
      SECURITY_LDFLAGS_pn-docker-distribution = ""

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 recipes-containers/docker-distribution/docker-distribution_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-containers/docker-distribution/docker-distribution_git.bb b/recipes-containers/docker-distribution/docker-distribution_git.bb
index d4f8098..2892556 100644
--- a/recipes-containers/docker-distribution/docker-distribution_git.bb
+++ b/recipes-containers/docker-distribution/docker-distribution_git.bb
@@ -57,7 +57,7 @@ do_install() {
 }
 
 INSANE_SKIP_${PN} += "ldflags already-stripped"
-INSANE_SKIP_${MLPREFIX}docker-registry += "ldflags already-stripped"
+INSANE_SKIP_${MLPREFIX}docker-registry += "ldflags already-stripped textrel"
 
 FILES_docker-registry = "${sbindir}/*"
 FILES_docker-registry += "${systemd_unitdir}/system/docker-registry.service"
-- 
2.7.4

Re: [PATCH] docker-distribution: fix do package qa warning [textrel]

[Bruce Ashfield]

merged

Bruce
On Wed, Oct 10, 2018 at 3:00 AM <changqing.li@windriver.com> wrote:
>
> From: Changqing Li <changqing.li@windriver.com>
>
> 1. After security flag PIE is enabled by default, we might met
> below QA warning on some arch, like aarch64, fix it by skip
> textrel QA check refer commit b689c72a of oe-core
>
> docker-distribution-v2.6.2-r0 do_package_qa: QA Issue: ELF binary
> 'work/aarch64-poky-linux/docker-distribution/v2.6.2-r0/packages-split/
> docker-registry/usr/sbin/registry' has relocations in .text [textrel]
>
> 2. This problem is caused since security_flags.inc is used by default.
>    so alternative work around is:
>       SECURITY_CFLAGS_pn-docker-distribution = "${SECURITY_NOPIE_CFLAGS}"
>       SECURITY_LDFLAGS_pn-docker-distribution = ""
>
> Signed-off-by: Changqing Li <changqing.li@windriver.com>
> ---
>  recipes-containers/docker-distribution/docker-distribution_git.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/recipes-containers/docker-distribution/docker-distribution_git.bb b/recipes-containers/docker-distribution/docker-distribution_git.bb
> index d4f8098..2892556 100644
> --- a/recipes-containers/docker-distribution/docker-distribution_git.bb
> +++ b/recipes-containers/docker-distribution/docker-distribution_git.bb
> @@ -57,7 +57,7 @@ do_install() {
>  }
>
>  INSANE_SKIP_${PN} += "ldflags already-stripped"
> -INSANE_SKIP_${MLPREFIX}docker-registry += "ldflags already-stripped"
> +INSANE_SKIP_${MLPREFIX}docker-registry += "ldflags already-stripped textrel"
>
>  FILES_docker-registry = "${sbindir}/*"
>  FILES_docker-registry += "${systemd_unitdir}/system/docker-registry.service"
> --
> 2.7.4
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"

[PATCH] docker: fix do package qa warning

[changqing.li]

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

1. After security flag PIE is enabled by default, we might met
below QA warning on some arch, like aarch64, fix it by skip
textrel QA check refer commit b689c72a of oe-core

WARNING: docker-18.03.0+git708b068d3095c6a6be939eb2da78c921d2e945e2-r0 
do_package_qa: QA Issue: ELF binary 'work/aarch64-poky-linux/docker/
18.03.0+git708b068d3095c6a6be939eb2da78c921d2e945e2-r0/packages-split/
docker/usr/bin/docker' has relocations in .text [textrel]

2. This problem is caused since security_flags.inc is used by default.
   so alternative work around is:
      SECURITY_CFLAGS_pn-docker = "${SECURITY_NOPIE_CFLAGS}"
      SECURITY_LDFLAGS_pn-docker = ""

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 recipes-containers/docker/docker_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb
index 73e0120..b3673d4 100644
--- a/recipes-containers/docker/docker_git.bb
+++ b/recipes-containers/docker/docker_git.bb
@@ -172,4 +172,4 @@ RDEPENDS_${PN}-contrib += "bash"
 
 # DO NOT STRIP docker
 INHIBIT_PACKAGE_STRIP = "1"
-INSANE_SKIP_${PN} += "ldflags"
+INSANE_SKIP_${PN} += "ldflags textrel"
-- 
2.7.4

Re: [PATCH] docker: fix do package qa warning

[Bruce Ashfield]

merged

Bruce
On Wed, Oct 10, 2018 at 3:00 AM <changqing.li@windriver.com> wrote:
>
> From: Changqing Li <changqing.li@windriver.com>
>
> 1. After security flag PIE is enabled by default, we might met
> below QA warning on some arch, like aarch64, fix it by skip
> textrel QA check refer commit b689c72a of oe-core
>
> WARNING: docker-18.03.0+git708b068d3095c6a6be939eb2da78c921d2e945e2-r0
> do_package_qa: QA Issue: ELF binary 'work/aarch64-poky-linux/docker/
> 18.03.0+git708b068d3095c6a6be939eb2da78c921d2e945e2-r0/packages-split/
> docker/usr/bin/docker' has relocations in .text [textrel]
>
> 2. This problem is caused since security_flags.inc is used by default.
>    so alternative work around is:
>       SECURITY_CFLAGS_pn-docker = "${SECURITY_NOPIE_CFLAGS}"
>       SECURITY_LDFLAGS_pn-docker = ""
>
> Signed-off-by: Changqing Li <changqing.li@windriver.com>
> ---
>  recipes-containers/docker/docker_git.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb
> index 73e0120..b3673d4 100644
> --- a/recipes-containers/docker/docker_git.bb
> +++ b/recipes-containers/docker/docker_git.bb
> @@ -172,4 +172,4 @@ RDEPENDS_${PN}-contrib += "bash"
>
>  # DO NOT STRIP docker
>  INHIBIT_PACKAGE_STRIP = "1"
> -INSANE_SKIP_${PN} += "ldflags"
> +INSANE_SKIP_${PN} += "ldflags textrel"
> --
> 2.7.4
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"

[PATCH] oci-image-tools: fix do package qa warning

[changqing.li]

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

1. After security flag PIE is enabled by default, we might met
below QA warning on some arch, like aarch64, fix it by skip
textrel QA check refer commit b689c72a of oe-core

oci-image-tools-0.2.0-dev+gitAUTOINC+4abe1a166f-r0 do_package_qa: 
QA Issue: ELF binary 'work/aarch64-poky-linux/oci-image-tools/
0.2.0-dev+gitAUTOINC+4abe1a166f-r0/packages-split/oci-image-tools/
usr/sbin/oci-image-tool' has relocations in .text [textrel]

2. This problem is caused since security_flags.inc is used by default.
   so alternative work around is:
      SECURITY_CFLAGS_pn-oci-image-tools = "${SECURITY_NOPIE_CFLAGS}"
      SECURITY_LDFLAGS_pn-oci-image-tools = ""

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 recipes-containers/oci-image-tools/oci-image-tools_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-containers/oci-image-tools/oci-image-tools_git.bb b/recipes-containers/oci-image-tools/oci-image-tools_git.bb
index 807ee26..8c41b6e 100644
--- a/recipes-containers/oci-image-tools/oci-image-tools_git.bb
+++ b/recipes-containers/oci-image-tools/oci-image-tools_git.bb
@@ -61,4 +61,4 @@ do_install() {
 	install ${S}/src/import/oci-image-tool ${D}/${sbindir}/
 }
 
-INSANE_SKIP_${PN} += "ldflags"
+INSANE_SKIP_${PN} += "ldflags textrel"
-- 
2.7.4

Re: [PATCH] oci-image-tools: fix do package qa warning

[Bruce Ashfield]

merged

Bruce
On Wed, Oct 10, 2018 at 2:59 AM <changqing.li@windriver.com> wrote:
>
> From: Changqing Li <changqing.li@windriver.com>
>
> 1. After security flag PIE is enabled by default, we might met
> below QA warning on some arch, like aarch64, fix it by skip
> textrel QA check refer commit b689c72a of oe-core
>
> oci-image-tools-0.2.0-dev+gitAUTOINC+4abe1a166f-r0 do_package_qa:
> QA Issue: ELF binary 'work/aarch64-poky-linux/oci-image-tools/
> 0.2.0-dev+gitAUTOINC+4abe1a166f-r0/packages-split/oci-image-tools/
> usr/sbin/oci-image-tool' has relocations in .text [textrel]
>
> 2. This problem is caused since security_flags.inc is used by default.
>    so alternative work around is:
>       SECURITY_CFLAGS_pn-oci-image-tools = "${SECURITY_NOPIE_CFLAGS}"
>       SECURITY_LDFLAGS_pn-oci-image-tools = ""
>
> Signed-off-by: Changqing Li <changqing.li@windriver.com>
> ---
>  recipes-containers/oci-image-tools/oci-image-tools_git.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/recipes-containers/oci-image-tools/oci-image-tools_git.bb b/recipes-containers/oci-image-tools/oci-image-tools_git.bb
> index 807ee26..8c41b6e 100644
> --- a/recipes-containers/oci-image-tools/oci-image-tools_git.bb
> +++ b/recipes-containers/oci-image-tools/oci-image-tools_git.bb
> @@ -61,4 +61,4 @@ do_install() {
>         install ${S}/src/import/oci-image-tool ${D}/${sbindir}/
>  }
>
> -INSANE_SKIP_${PN} += "ldflags"
> +INSANE_SKIP_${PN} += "ldflags textrel"
> --
> 2.7.4
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"

[PATCH] oci-runtime-tools: fix do package qa warning

[changqing.li]

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

1. After security flag PIE is enabled by default, we might met
below QA warning on some arch, like aarch64, fix it by skip
textrel QA check refer commit b689c72a of oe-core

oci-runtime-tools-0.1.0+gitAUTOINC+6e7da8148f-r0 do_package_qa: QA Issue:
ELF binary 'work/aarch64-poky-linux/oci-runtime-tools/0.1.0+gitAUTOINC+6e7
da8148f-r0/packages-split/oci-runtime-tools/usr/sbin/oci-runtime-tool'
has relocations in .text [textrel]

2. This problem is caused since security_flags.inc is used by default.
   so alternative work around is:
      SECURITY_CFLAGS_pn-oci-runtime-tools = "${SECURITY_NOPIE_CFLAGS}"
      SECURITY_LDFLAGS_pn-oci-runtime-tools = ""

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb b/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb
index 61b68b5..adbfc1e 100644
--- a/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb
+++ b/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb
@@ -11,7 +11,7 @@ SRCREV = "6e7da8148f4de2c9e9c9d3b345576898d4f412cb"
 PV = "0.1.0+git${SRCPV}"
 GO_IMPORT = "import"
 
-INSANE_SKIP_${PN} += "ldflags"
+INSANE_SKIP_${PN} += "ldflags textrel"
 
 inherit goarch
 inherit go
-- 
2.7.4

Re: [PATCH] oci-runtime-tools: fix do package qa warning

[Bruce Ashfield]

merged.

Bruce
On Wed, Oct 10, 2018 at 3:00 AM <changqing.li@windriver.com> wrote:
>
> From: Changqing Li <changqing.li@windriver.com>
>
> 1. After security flag PIE is enabled by default, we might met
> below QA warning on some arch, like aarch64, fix it by skip
> textrel QA check refer commit b689c72a of oe-core
>
> oci-runtime-tools-0.1.0+gitAUTOINC+6e7da8148f-r0 do_package_qa: QA Issue:
> ELF binary 'work/aarch64-poky-linux/oci-runtime-tools/0.1.0+gitAUTOINC+6e7
> da8148f-r0/packages-split/oci-runtime-tools/usr/sbin/oci-runtime-tool'
> has relocations in .text [textrel]
>
> 2. This problem is caused since security_flags.inc is used by default.
>    so alternative work around is:
>       SECURITY_CFLAGS_pn-oci-runtime-tools = "${SECURITY_NOPIE_CFLAGS}"
>       SECURITY_LDFLAGS_pn-oci-runtime-tools = ""
>
> Signed-off-by: Changqing Li <changqing.li@windriver.com>
> ---
>  recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb b/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb
> index 61b68b5..adbfc1e 100644
> --- a/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb
> +++ b/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb
> @@ -11,7 +11,7 @@ SRCREV = "6e7da8148f4de2c9e9c9d3b345576898d4f412cb"
>  PV = "0.1.0+git${SRCPV}"
>  GO_IMPORT = "import"
>
> -INSANE_SKIP_${PN} += "ldflags"
> +INSANE_SKIP_${PN} += "ldflags textrel"
>
>  inherit goarch
>  inherit go
> --
> 2.7.4
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"

Re: [PATCH][meta-cloud-services] consul: add INSANE_SKIP for textrel

[Bruce Ashfield]

merged

Bruce
On Wed, Oct 10, 2018 at 2:59 AM <changqing.li@windriver.com> wrote:
>
> From: Changqing Li <changqing.li@windriver.com>
>
> 1. for i586, bitbake consul will have QA error of textrel.
>    consul-git-r0 do_package_qa: QA Issue: ELF binary i
>    'work/i586-wrs-linux/consul/git-r0/packages-split/consul/usr/bin/consul'
>    has relocations in .text [textrel]
>
>    according to go doc:
>    -buildmode=pie
>    Build the listed main packages and everything they import into
>    position independent executables (PIE). Packages not named
>    main are ignored.
>
>    checked use command "eu-findtextrel ./consul", functions not
>    compiled with -fpic/-fPIC are from packages not named main, and
>    also not imported into package main.
>
>    so -buildmode=pie cannot reslove this problem. so refer commit
>    b689c72a of oe-core, just skip it.
>
> 2. This problem is caused since security_flags.inc is used by default.
>    so alternative work around is:
>       SECURITY_CFLAGS_pn-consul = "${SECURITY_NOPIE_CFLAGS}"
>       SECURITY_LDFLAGS_pn-consul = ""
>
> Signed-off-by: Changqing Li <changqing.li@windriver.com>
> ---
>  recipes-connectivity/consul/consul_git.bb | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/recipes-connectivity/consul/consul_git.bb b/recipes-connectivity/consul/consul_git.bb
> index a44e0b2..ee49c5e 100644
> --- a/recipes-connectivity/consul/consul_git.bb
> +++ b/recipes-connectivity/consul/consul_git.bb
> @@ -23,3 +23,6 @@ do_install_append() {
>  }
>
>  FILES_${PN} += "${systemd_unitdir}/system"
> +
> +#for i586, executable consul contains textrel
> +INSANE_SKIP_${PN} += "textrel"
> --
> 2.7.4
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"

[PATCH] docker-distribution: fix do package qa warning[ldflags]

[changqing.li]

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

fix below warning:
do_package_qa: QA Issue: No GNU_HASH in the elf binary:
xxx/usr/sbin/registry' [ldflags]

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 recipes-containers/docker-distribution/docker-distribution_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-containers/docker-distribution/docker-distribution_git.bb b/recipes-containers/docker-distribution/docker-distribution_git.bb
index 7c7bce2..23d94c9 100644
--- a/recipes-containers/docker-distribution/docker-distribution_git.bb
+++ b/recipes-containers/docker-distribution/docker-distribution_git.bb
@@ -58,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"
-- 
2.7.4

[PATCH] oci-runtime-tools: fix do package qa warning

[changqing.li]

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

fix below warning:
do_package_qa: QA Issue: ELF binary 'xxx/usr/sbin/oci-runtime-tool'
has relocations in .text [textrel]

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

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 .../files/0001-fix-do_package_qa-error.patch       | 32 ++++++++++++++++++++++
 .../oci-runtime-tools/oci-runtime-tools_git.bb     |  1 +
 2 files changed, 33 insertions(+)
 create mode 100644 recipes-containers/oci-runtime-tools/files/0001-fix-do_package_qa-error.patch

diff --git a/recipes-containers/oci-runtime-tools/files/0001-fix-do_package_qa-error.patch b/recipes-containers/oci-runtime-tools/files/0001-fix-do_package_qa-error.patch
new file mode 100644
index 0000000..3c5d820
--- /dev/null
+++ b/recipes-containers/oci-runtime-tools/files/0001-fix-do_package_qa-error.patch
@@ -0,0 +1,32 @@
+From 7de9fd7db7a001b66d92d5e80806e50bb5252392 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Thu, 27 Sep 2018 12:50:32 +0800
+Subject: [PATCH] fix do_package_qa error
+
+fix below error:
+do_package_qa: QA Issue: ELF binary 'xxx/usr/sbin/oci-runtime-tool'
+has relocations in .text [textrel]
+
+Upstream-Status: Inappropriate [oe-specific]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ src/import/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/import/Makefile b/src/import/Makefile
+index 77626d2..b97f6ec 100644
+--- a/src/import/Makefile
++++ b/src/import/Makefile
+@@ -8,7 +8,7 @@ COMMIT=$(shell git rev-parse HEAD 2> /dev/null || true)
+ all: tool runtimetest
+ 
+ tool:
+-	go build -tags "$(BUILDTAGS)" -ldflags "-X main.gitCommit=${COMMIT}" -o oci-runtime-tool ./cmd/oci-runtime-tool
++	go build -tags "$(BUILDTAGS)" -ldflags "-X main.gitCommit=${COMMIT}" ${GOBUILDFLAGS} -o oci-runtime-tool ./cmd/oci-runtime-tool
+ 
+ .PHONY: runtimetest
+ runtimetest:
+-- 
+2.7.4
+
diff --git a/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb b/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb
index 61b68b5..218f68c 100644
--- a/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb
+++ b/recipes-containers/oci-runtime-tools/oci-runtime-tools_git.bb
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=b355a61a394a504dacde901c958f66
 
 SRC_URI = "git://github.com/opencontainers/runtime-tools.git \
            file://0001-Revert-implement-add-set-function-for-hooks-items.patch \
+           file://0001-fix-do_package_qa-error.patch \
            "
 
 SRCREV = "6e7da8148f4de2c9e9c9d3b345576898d4f412cb"
-- 
2.7.4