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-dateutil.inc                | 25 -----------------
>   .../python/python3-dateutil_2.8.1.bb          | 27 +++++++++++++++++--
>   2 files changed, 25 insertions(+), 27 deletions(-)
>   delete mode 100644 meta-python/recipes-devtools/python/python-dateutil.inc
>
> diff --git a/meta-python/recipes-devtools/python/python-dateutil.inc b/meta-python/recipes-devtools/python/python-dateutil.inc
> deleted file mode 100644
> index e70e963e9..000000000
> --- a/meta-python/recipes-devtools/python/python-dateutil.inc
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -SUMMARY = "Extensions to the standard Python datetime module"
> -DESCRIPTION = "The dateutil module provides powerful extensions to the datetime module available in the Python standard library."
> -HOMEPAGE = "https://dateutil.readthedocs.org"
> -LICENSE = "BSD-3-Clause & Apache-2.0"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3155c7bdc71f66e02678411d2abf996"
> -
> -SRC_URI[md5sum] = "f2a1d4b680b297b367a974664ca3a4f6"
> -SRC_URI[sha256sum] = "73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c"
> -
> -PYPI_PACKAGE = "python-dateutil"
> -inherit pypi
> -
> -PACKAGES =+ "${PN}-zoneinfo"
> -FILES_${PN}-zoneinfo = "${libdir}/${PYTHON_DIR}/site-packages/dateutil/zoneinfo"
> -
> -DEPENDS += "${PYTHON_PN}-setuptools-scm-native"
> -
> -RDEPENDS_${PN} = "\
> -    ${PYTHON_PN}-datetime \
> -    ${PYTHON_PN}-numbers \
> -    ${PYTHON_PN}-six \
> -    ${PYTHON_PN}-stringold \
> -"
> -
> -BBCLASSEXTEND = "native"
> diff --git a/meta-python/recipes-devtools/python/python3-dateutil_2.8.1.bb b/meta-python/recipes-devtools/python/python3-dateutil_2.8.1.bb
> index 1d2baf55c..fb7db162c 100644
> --- a/meta-python/recipes-devtools/python/python3-dateutil_2.8.1.bb
> +++ b/meta-python/recipes-devtools/python/python3-dateutil_2.8.1.bb
> @@ -1,2 +1,25 @@
> -inherit setuptools3
> -require python-dateutil.inc
> +SUMMARY = "Extensions to the standard Python datetime module"
> +DESCRIPTION = "The dateutil module provides powerful extensions to the datetime module available in the Python standard library."
> +HOMEPAGE = "https://dateutil.readthedocs.org"
> +LICENSE = "BSD-3-Clause & Apache-2.0"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3155c7bdc71f66e02678411d2abf996"
> +
> +SRC_URI[md5sum] = "f2a1d4b680b297b367a974664ca3a4f6"
> +SRC_URI[sha256sum] = "73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c"
> +
> +PYPI_PACKAGE = "python-dateutil"
> +inherit pypi setuptools3
> +
> +PACKAGES =+ "${PN}-zoneinfo"
> +FILES_${PN}-zoneinfo = "${libdir}/${PYTHON_DIR}/site-packages/dateutil/zoneinfo"
> +
> +DEPENDS += "${PYTHON_PN}-setuptools-scm-native"
> +
> +RDEPENDS_${PN} = "\
> +    ${PYTHON_PN}-datetime \
> +    ${PYTHON_PN}-numbers \
> +    ${PYTHON_PN}-six \
> +    ${PYTHON_PN}-stringold \
> +"
> +
> +BBCLASSEXTEND = "native"
>
>