On 6/5/20 1:31 PM, Leon Anavi wrote:
> Consolidate inc and bb files into a single bb file.
>
> Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Acked-by: Trevor Gamblin <trevor.gamblin@windriver.com>
> ---
>   .../recipes-devtools/python/python-jsonpatch.inc    | 12 ------------
>   .../python/python3-jsonpatch_1.25.bb                | 13 +++++++++++--
>   2 files changed, 11 insertions(+), 14 deletions(-)
>   delete mode 100644 meta-python/recipes-devtools/python/python-jsonpatch.inc
>
> diff --git a/meta-python/recipes-devtools/python/python-jsonpatch.inc b/meta-python/recipes-devtools/python/python-jsonpatch.inc
> deleted file mode 100644
> index e23f96b61..000000000
> --- a/meta-python/recipes-devtools/python/python-jsonpatch.inc
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -SUMMARY  = "Appling JSON patches in Python 2.6+ and 3.x"
> -HOMEPAGE = "https://github.com/stefankoegl/python-json-patch"
> -LICENSE = "BSD-3-Clause"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=32b15c843b7a329130f4e266a281ebb3"
> -
> -inherit pypi
> -
> -SRC_URI[md5sum] = "fcc546892414bef2f7f89f0e2a618a9e"
> -SRC_URI[sha256sum] = "ddc0f7628b8bfdd62e3cbfbc24ca6671b0b6265b50d186c2cf3659dc0f78fd6a"
> -
> -RDEPENDS_${PN} += "${PYTHON_PN}-json ${PYTHON_PN}-jsonpointer ${PYTHON_PN}-netclient ${PYTHON_PN}-stringold"
> -
> diff --git a/meta-python/recipes-devtools/python/python3-jsonpatch_1.25.bb b/meta-python/recipes-devtools/python/python3-jsonpatch_1.25.bb
> index 73efceeed..8ec21ff11 100644
> --- a/meta-python/recipes-devtools/python/python3-jsonpatch_1.25.bb
> +++ b/meta-python/recipes-devtools/python/python3-jsonpatch_1.25.bb
> @@ -1,2 +1,11 @@
> -inherit setuptools3
> -require python-jsonpatch.inc
> +SUMMARY  = "Appling JSON patches in Python 2.6+ and 3.x"
> +HOMEPAGE = "https://github.com/stefankoegl/python-json-patch"
> +LICENSE = "BSD-3-Clause"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=32b15c843b7a329130f4e266a281ebb3"
> +
> +inherit pypi setuptools3
> +
> +SRC_URI[md5sum] = "fcc546892414bef2f7f89f0e2a618a9e"
> +SRC_URI[sha256sum] = "ddc0f7628b8bfdd62e3cbfbc24ca6671b0b6265b50d186c2cf3659dc0f78fd6a"
> +
> +RDEPENDS_${PN} += "${PYTHON_PN}-json ${PYTHON_PN}-jsonpointer ${PYTHON_PN}-netclient ${PYTHON_PN}-stringold"
>
>