Re: [meta-oe][PATCH] daemontools: Fix a warning

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 3294 bytes --]

On Tue, May 17, 2016 at 11:32:19AM -0700, Lei Maohui wrote:
> To fix the warning as following:
> 
> WARNING: daemontools-native-0.76-r0 do_populate_sysroot: File 'usr/bin/chkshsgr' from daemontools-native was already stripped, this will prevent future debugging!
> 

ERROR: daemontools-0.76-r0 do_patch: Command Error: 'quilt --quiltrc sysroots/x86_64-linux/etc/quiltrc push' exited with 1  Output:
Applying patch cross-compile.patch
patching file src/conf-cc
patching file src/conf-ld
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- rejects in file src/conf-ld
patching file src/Makefile
Patch cross-compile.patch does not apply (enforce with -f)
ERROR: daemontools-0.76-r0 do_patch: Function failed: patch_do_patch

> Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
> ---
>  .../daemontools/0001-conf-ld-warning-fix.patch     | 26 ++++++++++++++++++++++
>  .../daemontools/daemontools_0.76.bb                |  3 ++-
>  2 files changed, 28 insertions(+), 1 deletion(-)
>  create mode 100644 meta-oe/recipes-support/daemontools/daemontools/0001-conf-ld-warning-fix.patch
> 
> diff --git a/meta-oe/recipes-support/daemontools/daemontools/0001-conf-ld-warning-fix.patch b/meta-oe/recipes-support/daemontools/daemontools/0001-conf-ld-warning-fix.patch
> new file mode 100644
> index 0000000..f7bce25
> --- /dev/null
> +++ b/meta-oe/recipes-support/daemontools/daemontools/0001-conf-ld-warning-fix.patch
> @@ -0,0 +1,26 @@
> +From aa246fb9055bdcb293e9daca571066b72adc1cb2 Mon Sep 17 00:00:00 2001
> +From: Li Xin <lixin.fnst@cn.fujitsu.com>
> +Date: Thu, 14 Jan 2016 17:54:27 +0900
> +Subject: [PATCH] conf-ld: warning fix
> +
> +WARNING: File 'usr/bin/chkshsgr' from daemontools-native was already stripped, this will prevent future debugging!
> +
> +Upstream-Status: pending
> +
> +Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
> +---
> + src/conf-ld | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/src/conf-ld b/src/conf-ld
> +index 59a0de7..1d0518a 100644
> +--- a/src/conf-ld
> ++++ b/src/conf-ld
> +@@ -1,3 +1,3 @@
> +-gcc -s
> ++gcc
> + 
> + This will be used to link .o files into an executable.
> +-- 
> +1.8.4.2
> +
> diff --git a/meta-oe/recipes-support/daemontools/daemontools_0.76.bb b/meta-oe/recipes-support/daemontools/daemontools_0.76.bb
> index 161f92f..c3ce5d3 100644
> --- a/meta-oe/recipes-support/daemontools/daemontools_0.76.bb
> +++ b/meta-oe/recipes-support/daemontools/daemontools_0.76.bb
> @@ -16,7 +16,8 @@ LICENSE = "PD"
>  
>  SRC_URI = "http://cr.yp.to/daemontools/${BPN}-${PV}.tar.gz \
>             file://0001-error.h-include-errno.h-instead-of-extern-int.diff \
> -           file://0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff "
> +           file://0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff \
> +           file://0001-conf-ld-warning-fix.patch "
>  
>  SRC_URI_append_class-target = "file://cross-compile.patch"
>  
> -- 
> 1.8.4.2
> 
> 
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]