On 6/4/20 8:12 AM, 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-future.inc     | 13 -------------
>   .../python/python3-future_0.18.2.bb               | 15 +++++++++++++--
>   2 files changed, 13 insertions(+), 15 deletions(-)
>   delete mode 100644 meta-python/recipes-devtools/python/python-future.inc
>
> diff --git a/meta-python/recipes-devtools/python/python-future.inc b/meta-python/recipes-devtools/python/python-future.inc
> deleted file mode 100644
> index c0a2b39ba..000000000
> --- a/meta-python/recipes-devtools/python/python-future.inc
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -DESCRIPTION = "Clean single-source support for Python 3 and 2"
> -HOMEPAGE = "https://python-future.org"
> -LICENSE = "MIT"
> -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a253924061f8ecc41ad7a2ba1560e8e7"
> -
> -SRC_URI[md5sum] = "e4579c836b9c025872efe230f6270349"
> -SRC_URI[sha256sum] = "b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d"
> -
> -PYPI_PACKAGE_HASH = "99abde815842bc6e97d5a7806ad51236630da14ca2f3b1fce94c0bb94d3d"
> -
> -inherit pypi
> -
> -BBCLASSEXTEND = "native"
> diff --git a/meta-python/recipes-devtools/python/python3-future_0.18.2.bb b/meta-python/recipes-devtools/python/python3-future_0.18.2.bb
> index f059186bf..90d1661d4 100644
> --- a/meta-python/recipes-devtools/python/python3-future_0.18.2.bb
> +++ b/meta-python/recipes-devtools/python/python3-future_0.18.2.bb
> @@ -1,2 +1,13 @@
> -inherit setuptools3
> -require python-future.inc
> +DESCRIPTION = "Clean single-source support for Python 3 and 2"
> +HOMEPAGE = "https://python-future.org"
> +LICENSE = "MIT"
> +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a253924061f8ecc41ad7a2ba1560e8e7"
> +
> +SRC_URI[md5sum] = "e4579c836b9c025872efe230f6270349"
> +SRC_URI[sha256sum] = "b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d"
> +
> +PYPI_PACKAGE_HASH = "99abde815842bc6e97d5a7806ad51236630da14ca2f3b1fce94c0bb94d3d"
> +
> +inherit pypi setuptools3
> +
> +BBCLASSEXTEND = "native"
>
>