Re: [OE-core] [PATCH 3/4] recipes-support: Add diffoscope recipe

2020-02-14 Thread Khem Raj
On Fri, Feb 14, 2020 at 6:18 AM Richard Purdie
 wrote:
>
> On Fri, 2020-02-14 at 07:15 -0600, Joshua Watt wrote:
> >
> >
> > On Fri, Feb 14, 2020, 12:34 AM Khem Raj  wrote:
> > > Hi Joshua
> > >
> > > I think it needs to be ignored on musl
> > >
> > > 15:37:23 ERROR: Nothing RPROVIDES 'squashfs-tools' (but
> > > /mnt/jenkins/workspace/Yocto-world-musl/sources/openembedded-
> > > core/meta/recipes-support/diffoscope/diffoscope_136.bb
> > > RDEPENDS on or otherwise requires it)
> > > 15:37:23 squashfs-tools was skipped: incompatible with host
> > > aarch64-yoe-linux-musl (not in COMPATIBLE_HOST
> >
> > Would an RRECOMMENDS fix it?
>
> I merged your patch and one of mine to follow it adding a
> COMPATIBLE_HOST entry.
>
> I see Khem is fixing some other software so we may end up not needing
> it but we can remove later.
>

right, we were unnecessarily masking squashfs-tools for musl

> Cheers,
>
> Richard
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH 3/4] recipes-support: Add diffoscope recipe

2020-02-14 Thread Richard Purdie
On Fri, 2020-02-14 at 07:15 -0600, Joshua Watt wrote:
> 
> 
> On Fri, Feb 14, 2020, 12:34 AM Khem Raj  wrote:
> > Hi Joshua
> > 
> > I think it needs to be ignored on musl
> > 
> > 15:37:23 ERROR: Nothing RPROVIDES 'squashfs-tools' (but
> > /mnt/jenkins/workspace/Yocto-world-musl/sources/openembedded-
> > core/meta/recipes-support/diffoscope/diffoscope_136.bb
> > RDEPENDS on or otherwise requires it)
> > 15:37:23 squashfs-tools was skipped: incompatible with host
> > aarch64-yoe-linux-musl (not in COMPATIBLE_HOST
> 
> Would an RRECOMMENDS fix it?

I merged your patch and one of mine to follow it adding a
COMPATIBLE_HOST entry.

I see Khem is fixing some other software so we may end up not needing
it but we can remove later.

Cheers,

Richard

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH 3/4] recipes-support: Add diffoscope recipe

2020-02-14 Thread Joshua Watt
On Fri, Feb 14, 2020, 12:34 AM Khem Raj  wrote:

> Hi Joshua
>
> I think it needs to be ignored on musl
>
> 15:37:23 ERROR: Nothing RPROVIDES 'squashfs-tools' (but
>
> /mnt/jenkins/workspace/Yocto-world-musl/sources/openembedded-core/meta/recipes-support/diffoscope/
> diffoscope_136.bb
> RDEPENDS on or otherwise requires it)
> 15:37:23 squashfs-tools was skipped: incompatible with host
> aarch64-yoe-linux-musl (not in COMPATIBLE_HOST
>

Would an RRECOMMENDS fix it?


> On Tue, Feb 11, 2020 at 7:15 PM Joshua Watt  wrote:
> >
> > Diffoscope is the universal diff tool, capable of comparing many
> > different formats.
> >
> > Signed-off-by: Joshua Watt 
> > ---
> >  meta/conf/distro/include/maintainers.inc  |  1 +
> >  meta/recipes-support/diffoscope/diffoscope_136.bb | 15 +++
> >  2 files changed, 16 insertions(+)
> >  create mode 100644 meta/recipes-support/diffoscope/diffoscope_136.bb
> >
> > diff --git a/meta/conf/distro/include/maintainers.inc
> b/meta/conf/distro/include/maintainers.inc
> > index 171a43615e3..4a267faabce 100644
> > --- a/meta/conf/distro/include/maintainers.inc
> > +++ b/meta/conf/distro/include/maintainers.inc
> > @@ -146,6 +146,7 @@ RECIPE_MAINTAINER_pn-dejagnu = "Nathan Rossi <
> nat...@nathanrossi.com>"
> >  RECIPE_MAINTAINER_pn-depmodwrapper-cross = "Mark Hatle <
> mark.ha...@windriver.com>"
> >  RECIPE_MAINTAINER_pn-desktop-file-utils = "Alexander Kanavin <
> alex.kana...@gmail.com>"
> >  RECIPE_MAINTAINER_pn-dhcp = "Hongxu Jia "
> > +RECIPE_MAINTAINER_pn-diffoscope = "Joshua Watt "
> >  RECIPE_MAINTAINER_pn-diffstat = "Chen Qi "
> >  RECIPE_MAINTAINER_pn-diffutils = "Chen Qi "
> >  RECIPE_MAINTAINER_pn-distcc = "Hongxu Jia "
> > diff --git a/meta/recipes-support/diffoscope/diffoscope_136.bb
> b/meta/recipes-support/diffoscope/diffoscope_136.bb
> > new file mode 100644
> > index 000..a00f281deb0
> > --- /dev/null
> > +++ b/meta/recipes-support/diffoscope/diffoscope_136.bb
> > @@ -0,0 +1,15 @@
> > +SUMMARY = "in-depth comparison of files, archives, and directories"
> > +HOMEPAGE = "https://diffoscope.org/;
> > +LICENSE = "GPL-3.0+"
> > +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
> > +
> > +PYPI_PACKAGE = "diffoscope"
> > +
> > +inherit pypi setuptools3
> > +
> > +SRC_URI[md5sum] = "c84d8d308a40176ba2f5dc4abdbf6f73"
> > +SRC_URI[sha256sum] =
> "0d6486d6eb6e0445ba21fee2e8bdd3a366ce786bfac98e00e5a95038b7815f15"
> > +
> > +RDEPENDS_${PN} += "binutils vim squashfs-tools python3-libarchive-c
> python3-magic"
> > +
> > +BBCLASSEXTEND = "native"
> > --
> > 2.23.0
> >
> > --
> > ___
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH 3/4] recipes-support: Add diffoscope recipe

2020-02-13 Thread Khem Raj
Hi Joshua

I think it needs to be ignored on musl

15:37:23 ERROR: Nothing RPROVIDES 'squashfs-tools' (but
/mnt/jenkins/workspace/Yocto-world-musl/sources/openembedded-core/meta/recipes-support/diffoscope/diffoscope_136.bb
RDEPENDS on or otherwise requires it)
15:37:23 squashfs-tools was skipped: incompatible with host
aarch64-yoe-linux-musl (not in COMPATIBLE_HOST)

On Tue, Feb 11, 2020 at 7:15 PM Joshua Watt  wrote:
>
> Diffoscope is the universal diff tool, capable of comparing many
> different formats.
>
> Signed-off-by: Joshua Watt 
> ---
>  meta/conf/distro/include/maintainers.inc  |  1 +
>  meta/recipes-support/diffoscope/diffoscope_136.bb | 15 +++
>  2 files changed, 16 insertions(+)
>  create mode 100644 meta/recipes-support/diffoscope/diffoscope_136.bb
>
> diff --git a/meta/conf/distro/include/maintainers.inc 
> b/meta/conf/distro/include/maintainers.inc
> index 171a43615e3..4a267faabce 100644
> --- a/meta/conf/distro/include/maintainers.inc
> +++ b/meta/conf/distro/include/maintainers.inc
> @@ -146,6 +146,7 @@ RECIPE_MAINTAINER_pn-dejagnu = "Nathan Rossi 
> "
>  RECIPE_MAINTAINER_pn-depmodwrapper-cross = "Mark Hatle 
> "
>  RECIPE_MAINTAINER_pn-desktop-file-utils = "Alexander Kanavin 
> "
>  RECIPE_MAINTAINER_pn-dhcp = "Hongxu Jia "
> +RECIPE_MAINTAINER_pn-diffoscope = "Joshua Watt "
>  RECIPE_MAINTAINER_pn-diffstat = "Chen Qi "
>  RECIPE_MAINTAINER_pn-diffutils = "Chen Qi "
>  RECIPE_MAINTAINER_pn-distcc = "Hongxu Jia "
> diff --git a/meta/recipes-support/diffoscope/diffoscope_136.bb 
> b/meta/recipes-support/diffoscope/diffoscope_136.bb
> new file mode 100644
> index 000..a00f281deb0
> --- /dev/null
> +++ b/meta/recipes-support/diffoscope/diffoscope_136.bb
> @@ -0,0 +1,15 @@
> +SUMMARY = "in-depth comparison of files, archives, and directories"
> +HOMEPAGE = "https://diffoscope.org/;
> +LICENSE = "GPL-3.0+"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
> +
> +PYPI_PACKAGE = "diffoscope"
> +
> +inherit pypi setuptools3
> +
> +SRC_URI[md5sum] = "c84d8d308a40176ba2f5dc4abdbf6f73"
> +SRC_URI[sha256sum] = 
> "0d6486d6eb6e0445ba21fee2e8bdd3a366ce786bfac98e00e5a95038b7815f15"
> +
> +RDEPENDS_${PN} += "binutils vim squashfs-tools python3-libarchive-c 
> python3-magic"
> +
> +BBCLASSEXTEND = "native"
> --
> 2.23.0
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core