From 9321975f8364cf146b23a0d3906d6f54e865a2f5 Mon Sep 17 00:00:00 2001 From: Peace Lee Date: Mon, 9 Mar 2020 21:39:11 +0900 Subject: [PATCH] guider: Upgrade to 3.9.7 Signed-off-by: Peace Lee --- .../guider/{guider_3.9.6.bb => guider_3.9.7.bb} | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) rename meta-oe/recipes-devtools/guider/{guider_3.9.6.bb => guider_3.9.7.bb} (76%) diff --git a/meta-oe/recipes-devtools/guider/guider_3.9.6.bb b/meta-oe/recipes-devtools/guider/guider_3.9.7.bb similarity index 76% rename from meta-oe/recipes-devtools/guider/guider_3.9.6.bb rename to meta-oe/recipes-devtools/guider/guider_3.9.7.bb index f0590021612..d701595f3f9 100644 --- a/meta-oe/recipes-devtools/guider/guider_3.9.6.bb +++ b/meta-oe/recipes-devtools/guider/guider_3.9.7.bb @@ -6,21 +6,27 @@ AUTHOR = "Peace Lee " LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2" -PV = "3.9.6+git${SRCPV}" +PV = "3.9.7+git${SRCPV}" PR = "r0" SRC_URI = "git://github.com/iipeace/${BPN}" #SRCREV = "${AUTOREV}" -SRCREV = "fef25c41efb9bde0614ea477d0b90bd9565ae0b4" +SRCREV = "948f9fbccddf0225ae4da32f5828d64c4319c8cf" S = "${WORKDIR}/git" R = "${RECIPE_SYSROOT}" -inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "distutils", "", d)} +#inherit distutils +inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python3", "distutils", "", d)} GUIDER_OBJ = "guider.pyc" GUIDER_SCRIPT = "guider" +python() { + if 'meta-python3' not in d.getVar('BBFILE_COLLECTIONS').split(): + raise bb.parse.SkipRecipe('Requires meta-python3 to be present.') +} + do_install() { python ${S}/setup.py install @@ -33,7 +39,3 @@ do_install() { RDEPENDS_${PN} = "python-ctypes python-shell \ python-json python-subprocess" -python() { - if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): - raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') -}