[OE-core] [PATCH 36/36] package_deb.bbclass: Ignore file paths in RPROVIDES

André Draszik git at andred.net
Wed Feb 15 10:36:26 UTC 2017


On Mon, 2017-02-13 at 17:06 +0200, Alexander Kanavin wrote:
> From: Amarnath Valluri <amarnath.valluri at intel.com>
> 
> Unlike rpm, debian packaging does not allow file paths in 'Provides:'
> field.
> When 'usrmerge' distro feature enabled bash/busybox packages adds
> '/bin/sh' to
> it's RPROVIDES to satisfy build dependencies, this entry should be
> filtered out.

What about opkg - is it OK with PATHs (my blind guess would be no)? Has it
been tested?

Cheers,
Andre'

> 
> Signed-off-by: Amarnath Valluri <amarnath.valluri at intel.com>
> Signed-off-by: Alexander Kanavin <alexander.kanavin at linux.intel.com>
> ---
>  meta/classes/package_deb.bbclass | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/meta/classes/package_deb.bbclass
> b/meta/classes/package_deb.bbclass
> index eb549ca971a..e1bc078d6b6 100644
> --- a/meta/classes/package_deb.bbclass
> +++ b/meta/classes/package_deb.bbclass
> @@ -237,6 +237,10 @@ python do_package_deb () {
>          debian_cmp_remap(rsuggests)
>          # Deliberately drop version information here, not
> wanted/supported by deb
>          rprovides =
> dict.fromkeys(bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES")
> or ""), [])
> +        # Remove file paths if any from rprovides, debian does not
> support custom providers
> +        for key in list(rprovides.keys()):
> +            if key.startswith('/'):
> +                del rprovides[key]
>          rprovides = collections.OrderedDict(sorted(rprovides.items(),
> key=lambda x: x[0]))
>          debian_cmp_remap(rprovides)
>          rreplaces =
> bb.utils.explode_dep_versions2(localdata.getVar("RREPLACES") or "")
> -- 
> 2.11.0
> 



More information about the Openembedded-core mailing list