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>
> ---
>   .../python/python-dnspython.inc               | 20 -----------------
>   .../python/python3-dnspython_1.16.0.bb        | 22 +++++++++++++++++--
>   2 files changed, 20 insertions(+), 22 deletions(-)
>   delete mode 100644 meta-python/recipes-devtools/python/python-dnspython.inc
>
> diff --git a/meta-python/recipes-devtools/python/python-dnspython.inc b/meta-python/recipes-devtools/python/python-dnspython.inc
> deleted file mode 100644
> index 84502affe..000000000
> --- a/meta-python/recipes-devtools/python/python-dnspython.inc
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -DESCRIPTION = "DNS toolkit for Python"
> -HOMEPAGE = "http://www.dnspython.org/"
> -LICENSE = "ISC"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=5af50906b5929837f667dfe31052bd34"
> -
> -SRC_URI[md5sum] = "bc9ca3b3a82164667d5730ec6d5248a2"
> -SRC_URI[sha256sum] = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01"
> -
> -PYPI_PACKAGE_EXT = "zip"
> -
> -inherit pypi
> -
> -RDEPENDS_${PN} += " \
> -    ${PYTHON_PN}-crypt \
> -    ${PYTHON_PN}-io \
> -    ${PYTHON_PN}-math \
> -    ${PYTHON_PN}-netclient \
> -    ${PYTHON_PN}-numbers \
> -    ${PYTHON_PN}-threading \
> -"
> diff --git a/meta-python/recipes-devtools/python/python3-dnspython_1.16.0.bb b/meta-python/recipes-devtools/python/python3-dnspython_1.16.0.bb
> index ce4dfdc74..cb255442f 100644
> --- a/meta-python/recipes-devtools/python/python3-dnspython_1.16.0.bb
> +++ b/meta-python/recipes-devtools/python/python3-dnspython_1.16.0.bb
> @@ -1,2 +1,20 @@
> -inherit setuptools3
> -require python-dnspython.inc
> +DESCRIPTION = "DNS toolkit for Python"
> +HOMEPAGE = "http://www.dnspython.org/"
> +LICENSE = "ISC"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=5af50906b5929837f667dfe31052bd34"
> +
> +SRC_URI[md5sum] = "bc9ca3b3a82164667d5730ec6d5248a2"
> +SRC_URI[sha256sum] = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01"
> +
> +PYPI_PACKAGE_EXT = "zip"
> +
> +inherit pypi setuptools3
> +
> +RDEPENDS_${PN} += " \
> +    ${PYTHON_PN}-crypt \
> +    ${PYTHON_PN}-io \
> +    ${PYTHON_PN}-math \
> +    ${PYTHON_PN}-netclient \
> +    ${PYTHON_PN}-numbers \
> +    ${PYTHON_PN}-threading \
> +"
>
>