summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-06-19 15:24:47 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-20 13:14:21 +0100
commit0d8357f9f38f529cc03ce2602d5209c9f8dfe878 (patch)
treea91d0eb0af4696ebc7ad22676384093ae0ef15cd /meta/recipes-extended
parentb82ea144e144671d3f64c0785ba4beafe905cd4f (diff)
downloadpoky-0d8357f9f38f529cc03ce2602d5209c9f8dfe878.tar.gz
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. (From OE-Core rev: 282b744f46c5c058966836130084e300030d419e) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/newt/libnewt-python_0.52.20.bb28
-rw-r--r--meta/recipes-extended/newt/libnewt_0.52.20.bb13
2 files changed, 9 insertions, 32 deletions
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 @@
1require recipes-extended/newt/libnewt_${PV}.bb
2
3SUMMARY .= " - python"
4DEPENDS = "libnewt python3"
5RDEPENDS_${PN} += "python3-core"
6
7inherit python3native python3-dir
8
9EXTRA_OECONF += "--with-python"
10EXTRA_OEMAKE += "PYTHONVERS=${PYTHON_DIR}"
11
12
13do_compile () {
14 VERSION="$(sed -n 's/^VERSION = //p' Makefile)"
15 oe_runmake _snack.so
16}
17
18do_install () {
19 install -d ${D}${PYTHON_SITEPACKAGES_DIR}
20 install -m 0755 ${PYTHON_DIR}/_snack.so ${D}${PYTHON_SITEPACKAGES_DIR}/
21 install -m 0644 snack.py ${D}${PYTHON_SITEPACKAGES_DIR}/
22}
23
24PACKAGES_remove = "whiptail"
25
26FILES_${PN} = "${PYTHON_SITEPACKAGES_DIR}/*"
27
28BBCLASSEXTEND = "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"
15LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" 15LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
16 16
17# slang needs to be >= 2.2 17# slang needs to be >= 2.2
18DEPENDS = "slang popt" 18DEPENDS = "slang popt python3"
19 19
20SRC_URI = "https://releases.pagure.org/newt/newt-${PV}.tar.gz \ 20SRC_URI = "https://releases.pagure.org/newt/newt-${PV}.tar.gz \
21 file://fix_SHAREDDIR.patch \ 21 file://fix_SHAREDDIR.patch \
@@ -30,15 +30,20 @@ SRC_URI[sha256sum] = "8d66ba6beffc3f786d4ccfee9d2b43d93484680ef8db9397a4fb70b5ad
30 30
31S = "${WORKDIR}/newt-${PV}" 31S = "${WORKDIR}/newt-${PV}"
32 32
33EXTRA_OECONF = "--without-tcl --without-python" 33inherit autotools-brokensep python3native python3-dir
34 34
35inherit autotools-brokensep 35EXTRA_OECONF = "--without-tcl --with-python"
36
37EXTRA_OEMAKE += "PYTHONVERS=${PYTHON_DIR}"
36 38
37CLEANBROKEN = "1" 39CLEANBROKEN = "1"
38 40
39export CPPFLAGS 41export CPPFLAGS
40 42
41PACKAGES_prepend = "whiptail " 43PACKAGES_prepend = "whiptail ${PN}-python "
44
45RDEPENDS_${PN}-python += "python3-core"
46FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*"
42 47
43do_configure_prepend() { 48do_configure_prepend() {
44 sh autogen.sh 49 sh autogen.sh