From 282b744f46c5c058966836130084e300030d419e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 19 Jun 2019 15:24:47 +0200 Subject: libnewt: merge libnewt-python recipe into the main recipe libnewt-python was including libnewt recipe and adding tweaks, which is bad form. It also broke AUH, as it won't update more than one recipe in a single transaction. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../newt/libnewt-python_0.52.20.bb | 28 ---------------------- meta/recipes-extended/newt/libnewt_0.52.20.bb | 13 ++++++---- 2 files changed, 9 insertions(+), 32 deletions(-) delete mode 100644 meta/recipes-extended/newt/libnewt-python_0.52.20.bb diff --git a/meta/recipes-extended/newt/libnewt-python_0.52.20.bb b/meta/recipes-extended/newt/libnewt-python_0.52.20.bb deleted file mode 100644 index 433d184c71..0000000000 --- a/meta/recipes-extended/newt/libnewt-python_0.52.20.bb +++ /dev/null @@ -1,28 +0,0 @@ -require recipes-extended/newt/libnewt_${PV}.bb - -SUMMARY .= " - python" -DEPENDS = "libnewt python3" -RDEPENDS_${PN} += "python3-core" - -inherit python3native python3-dir - -EXTRA_OECONF += "--with-python" -EXTRA_OEMAKE += "PYTHONVERS=${PYTHON_DIR}" - - -do_compile () { - VERSION="$(sed -n 's/^VERSION = //p' Makefile)" - oe_runmake _snack.so -} - -do_install () { - install -d ${D}${PYTHON_SITEPACKAGES_DIR} - install -m 0755 ${PYTHON_DIR}/_snack.so ${D}${PYTHON_SITEPACKAGES_DIR}/ - install -m 0644 snack.py ${D}${PYTHON_SITEPACKAGES_DIR}/ -} - -PACKAGES_remove = "whiptail" - -FILES_${PN} = "${PYTHON_SITEPACKAGES_DIR}/*" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/newt/libnewt_0.52.20.bb b/meta/recipes-extended/newt/libnewt_0.52.20.bb index 264ef3b8ad..dc07a1809e 100644 --- a/meta/recipes-extended/newt/libnewt_0.52.20.bb +++ b/meta/recipes-extended/newt/libnewt_0.52.20.bb @@ -15,7 +15,7 @@ LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" # slang needs to be >= 2.2 -DEPENDS = "slang popt" +DEPENDS = "slang popt python3" SRC_URI = "https://releases.pagure.org/newt/newt-${PV}.tar.gz \ file://fix_SHAREDDIR.patch \ @@ -30,15 +30,20 @@ SRC_URI[sha256sum] = "8d66ba6beffc3f786d4ccfee9d2b43d93484680ef8db9397a4fb70b5ad S = "${WORKDIR}/newt-${PV}" -EXTRA_OECONF = "--without-tcl --without-python" +inherit autotools-brokensep python3native python3-dir -inherit autotools-brokensep +EXTRA_OECONF = "--without-tcl --with-python" + +EXTRA_OEMAKE += "PYTHONVERS=${PYTHON_DIR}" CLEANBROKEN = "1" export CPPFLAGS -PACKAGES_prepend = "whiptail " +PACKAGES_prepend = "whiptail ${PN}-python " + +RDEPENDS_${PN}-python += "python3-core" +FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*" do_configure_prepend() { sh autogen.sh -- cgit 1.2.3-korg