diff options
-rw-r--r-- | meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 6 | ||||
-rw-r--r-- | meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb | 28 |
2 files changed, 0 insertions, 34 deletions
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index b29b86d45a..e5cf8ef2a9 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | |||
@@ -14,7 +14,6 @@ PACKAGES = "\ | |||
14 | packagegroup-meta-oe-dbs \ | 14 | packagegroup-meta-oe-dbs \ |
15 | packagegroup-meta-oe-devtools \ | 15 | packagegroup-meta-oe-devtools \ |
16 | packagegroup-meta-oe-extended \ | 16 | packagegroup-meta-oe-extended \ |
17 | packagegroup-meta-oe-extended-python2 \ | ||
18 | packagegroup-meta-oe-kernel \ | 17 | packagegroup-meta-oe-kernel \ |
19 | packagegroup-meta-oe-multimedia \ | 18 | packagegroup-meta-oe-multimedia \ |
20 | packagegroup-meta-oe-navigation \ | 19 | packagegroup-meta-oe-navigation \ |
@@ -38,7 +37,6 @@ RDEPENDS:packagegroup-meta-oe = "\ | |||
38 | packagegroup-meta-oe-dbs \ | 37 | packagegroup-meta-oe-dbs \ |
39 | packagegroup-meta-oe-devtools \ | 38 | packagegroup-meta-oe-devtools \ |
40 | packagegroup-meta-oe-extended \ | 39 | packagegroup-meta-oe-extended \ |
41 | ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "packagegroup-meta-oe-extended-python2", "", d)} \ | ||
42 | packagegroup-meta-oe-kernel \ | 40 | packagegroup-meta-oe-kernel \ |
43 | packagegroup-meta-oe-multimedia \ | 41 | packagegroup-meta-oe-multimedia \ |
44 | packagegroup-meta-oe-navigation \ | 42 | packagegroup-meta-oe-navigation \ |
@@ -436,10 +434,6 @@ RDEPENDS:packagegroup-meta-oe-extended:remove:powerpc64le = "upm mraa sysdig" | |||
436 | RDEPENDS:packagegroup-meta-oe-extended:remove:riscv64 = "upm libleak mraa sysdig tiptop" | 434 | RDEPENDS:packagegroup-meta-oe-extended:remove:riscv64 = "upm libleak mraa sysdig tiptop" |
437 | RDEPENDS:packagegroup-meta-oe-extended:remove:riscv32 = "upm libleak mraa sysdig tiptop" | 435 | RDEPENDS:packagegroup-meta-oe-extended:remove:riscv32 = "upm libleak mraa sysdig tiptop" |
438 | 436 | ||
439 | RDEPENDS:packagegroup-meta-oe-extended-python2 ="\ | ||
440 | ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', 'openlmi-tools', '', d), "", d)} \ | ||
441 | " | ||
442 | |||
443 | RDEPENDS:packagegroup-meta-oe-gnome ="\ | 437 | RDEPENDS:packagegroup-meta-oe-gnome ="\ |
444 | atkmm \ | 438 | atkmm \ |
445 | gcab \ | 439 | gcab \ |
diff --git a/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb b/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb deleted file mode 100644 index df43d25ac3..0000000000 --- a/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | SUMMARY = "Set of CLI tools for Openlmi providers" | ||
2 | DESCRIPTION = "openlmi-tools is a set of command line tools for Openlmi providers." | ||
3 | HOMEPAGE = "http://www.openlmi.org/" | ||
4 | LICENSE = "GPL-2.0-or-later" | ||
5 | LIC_FILES_CHKSUM = "file://../COPYING;md5=75859989545e37968a99b631ef42722e" | ||
6 | SECTION = "System/Management" | ||
7 | |||
8 | inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "setuptools", "", d)} | ||
9 | |||
10 | SKIP_RECIPE[openlmi-tools] ?= "${@bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', '', 'python2 is out of support for long time, read https://www.python.org/doc/sunset-python-2/ https://python3statement.org/ and if you really have to temporarily use this, then set I_SWEAR_TO_MIGRATE_TO_PYTHON3 to "yes"', d)}" | ||
11 | |||
12 | DEPENDS = "python-native python-pywbem-native python-m2crypto python-pywbem" | ||
13 | |||
14 | SRC_URI = "http://fedorahosted.org/released/${BPN}/${BP}.tar.gz \ | ||
15 | " | ||
16 | SRC_URI[md5sum] = "e156246cb7b49753db82f4ddf7f03e50" | ||
17 | SRC_URI[sha256sum] = "292b8f5f2250655a4add8183c529b73358bc980bd4f23cfa484a940953fce9e4" | ||
18 | |||
19 | S = "${WORKDIR}/${BP}/cli" | ||
20 | |||
21 | do_configure:prepend() { | ||
22 | sed 's/@@VERSION@@/$(VERSION)/g' ${S}/setup.py.skel > ${S}/setup.py | ||
23 | } | ||
24 | |||
25 | python() { | ||
26 | if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): | ||
27 | raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') | ||
28 | } | ||