Patchwork [meta-oe] wvstreams: generate wvstreams-valgrind package

login
register
mail settings
Submitter Mario Domenech Goulart
Date Oct. 7, 2013, 8:07 p.m.
Message ID <1381176437-4382-1-git-send-email-mario@ossystems.com.br>
Download mbox | patch
Permalink /patch/59359/
State Changes Requested, archived
Headers show

Comments

Mario Domenech Goulart - Oct. 7, 2013, 8:07 p.m.
Explicitly set --with-valgrind in EXTRA_OECONF (since it doesn't add
up dependencies) and generate the wvstreams-valgrind package.

Fixes

  wvstreams-4.6.1: wvstreams: Files/directories were installed but not shipped
    /usr/lib/valgrind
    /usr/lib/valgrind/wvstreams.supp

Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
---
 meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
Martin Jansa - Oct. 11, 2013, 10:58 a.m.
On Mon, Oct 07, 2013 at 05:07:17PM -0300, Mario Domenech Goulart wrote:
> Explicitly set --with-valgrind in EXTRA_OECONF (since it doesn't add
> up dependencies) and generate the wvstreams-valgrind package.
> 
> Fixes

Do we really need explicit valgrind dependency for all machines?

ERROR: Nothing RPROVIDES 'valgrind' (but
/home/jenkins/oe/shr-core-branches/shr-core/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
RDEPENDS on or otherwise requires it)
ERROR: valgrind was skipped: incompatible with host arm-oe-linux-gnueabi
(not in COMPATIBLE_HOST)

This is from qemuarm build where host has -gnueabi suffix and isn't
included in valgrind's COMPATIBLE_HOST:
COMPATIBLE_HOST = '(i.86|x86_64|powerpc|powerpc64).*-linux'
COMPATIBLE_HOST_armv7a = 'arm.*-linux'

>   wvstreams-4.6.1: wvstreams: Files/directories were installed but not shipped
>     /usr/lib/valgrind
>     /usr/lib/valgrind/wvstreams.supp
> 
> Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
> ---
>  meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb |    7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
> index ce2b337..a1b38bd 100644
> --- a/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
> +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
> @@ -22,8 +22,9 @@ PARALLEL_MAKE = ""
>  
>  LDFLAGS_append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib"
>  
> -EXTRA_OECONF = " --without-tcl --without-qt --without-pam --without-valgrind"
> +EXTRA_OECONF = " --without-tcl --without-qt --without-pam --with-valgrind"
>  
> +PACKAGES_prepend = "${PN}-valgrind "
>  PACKAGES_prepend = "libuniconf libuniconf-dbg "
>  PACKAGES_prepend = "uniconfd uniconfd-dbg "
>  PACKAGES_prepend = "libwvstreams-base libwvstreams-base-dbg "
> @@ -40,3 +41,7 @@ FILES_libwvstreams-base-dbg = "${libdir}/.debug/libwvutils.so.*"
>  
>  FILES_libwvstreams-extras     = "${libdir}/libwvbase.so.* ${libdir}/libwvstreams.so.*"
>  FILES_libwvstreams-extras-dbg = "${libdir}/.debug/libwvbase.so.* ${libdir}/.debug/libwvstreams.so.*"
> +
> +FILES_${PN}-valgrind = "${libdir}/valgrind"
> +
> +RDEPENDS_${PN}-valgrind += "valgrind"
> -- 
> 1.7.10.4
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
index ce2b337..a1b38bd 100644
--- a/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
+++ b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
@@ -22,8 +22,9 @@  PARALLEL_MAKE = ""
 
 LDFLAGS_append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib"
 
-EXTRA_OECONF = " --without-tcl --without-qt --without-pam --without-valgrind"
+EXTRA_OECONF = " --without-tcl --without-qt --without-pam --with-valgrind"
 
+PACKAGES_prepend = "${PN}-valgrind "
 PACKAGES_prepend = "libuniconf libuniconf-dbg "
 PACKAGES_prepend = "uniconfd uniconfd-dbg "
 PACKAGES_prepend = "libwvstreams-base libwvstreams-base-dbg "
@@ -40,3 +41,7 @@  FILES_libwvstreams-base-dbg = "${libdir}/.debug/libwvutils.so.*"
 
 FILES_libwvstreams-extras     = "${libdir}/libwvbase.so.* ${libdir}/libwvstreams.so.*"
 FILES_libwvstreams-extras-dbg = "${libdir}/.debug/libwvbase.so.* ${libdir}/.debug/libwvstreams.so.*"
+
+FILES_${PN}-valgrind = "${libdir}/valgrind"
+
+RDEPENDS_${PN}-valgrind += "valgrind"