[meta-oe,4/4] mysql-python, lio-utils, openlmi-tools: add conditional PNBLACKLIST like meta-python2 does

Submitted by Martin Jansa on March 24, 2021, 4:46 p.m. | Patch ID: 179432

Details

Message ID 20210324164659.390543-4-Martin.Jansa@gmail.com
State Master Next
Commit 6fa7f34e1378a2d7a6d219f6405c5c4f38f6a8d4
Headers show

Commit Message

Martin Jansa March 24, 2021, 4:46 p.m.
* it depends on target python(2) recipes from meta-python2 which are restricted with this
  conditional since:
  https://git.openembedded.org/meta-python2/commit/?h=hardknott&id=10c65fc18998d302f34634ffceaf31ab335056dd

* telepathy-idle and cherokee from:
  meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb
  meta-webserver/recipes-httpd/cherokee/cherokee_git.bb
  also depend on meta-python2, but use only pythonnative from there, so they aren't blacklisted.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 6 +++---
 meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb            | 2 ++
 meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb   | 2 ++
 meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb         | 2 ++
 4 files changed, 9 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index e9fcf71a76..0328478ae7 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -220,7 +220,7 @@  RDEPENDS_packagegroup-meta-oe-dbs ="\
 "
 
 RDEPENDS_packagegroup-meta-oe-dbs-python2 ="\
-    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "mysql-python", "", d)} \
+    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "${@bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', 'mysql-python', '', d}", "", d)} \
 "
 
 RDEPENDS_packagegroup-meta-oe-devtools ="\
@@ -439,7 +439,7 @@  RDEPENDS_packagegroup-meta-oe-extended_remove_riscv64 = "upm libleak mraa sysdig
 RDEPENDS_packagegroup-meta-oe-extended_remove_riscv32 = "upm libleak mraa sysdig tiptop"
 
 RDEPENDS_packagegroup-meta-oe-extended-python2 ="\
-    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "openlmi-tools", "", d)} \
+    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "${@bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', 'openlmi-tools', '', d}", "", d)} \
 "
 
 RDEPENDS_packagegroup-meta-oe-gnome ="\
@@ -916,7 +916,7 @@  RDEPENDS_packagegroup-meta-oe-support_append_x86 = " mcelog mce-inject mce-test
 RDEPENDS_packagegroup-meta-oe-support_append_x86-64 = " mcelog mce-inject mce-test open-vm-tools vboxguestdrivers"
 
 RDEPENDS_packagegroup-meta-oe-support-python2 ="\
-    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "lio-utils", "", d)} \
+    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "${@bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', 'lio-utils', '', d}", "", d)} \
 "
 
 RDEPENDS_packagegroup-meta-oe-support_remove_arm ="numactl"
diff --git a/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb b/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb
index 4617da8e1b..43fc69073f 100644
--- a/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb
+++ b/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb
@@ -16,6 +16,8 @@  SRC_URI[sha256sum] = "811040b647e5d5686f84db415efd697e6250008b112b6909ba77ac059e
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
+PNBLACKLIST[mysql-python] ?= "${@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)}"
+
 inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "setuptools", "", d)}
 
 python() {
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
index 04f82d2bcd..6009cd0304 100644
--- a/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb
+++ b/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb
@@ -7,6 +7,8 @@  SECTION = "System/Management"
 
 inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "setuptools", "", d)}
 
+PNBLACKLIST[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)}"
+
 DEPENDS = "python-native python-pywbem-native python-m2crypto python-pywbem"
 
 SRC_URI = "http://fedorahosted.org/released/${BPN}/${BP}.tar.gz \
diff --git a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb b/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb
index 0fb4a6e516..4891fd187d 100644
--- a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb
+++ b/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb
@@ -55,6 +55,8 @@  do_install() {
     install -m 755 ${S}/conf/lio_start.default ${D}/etc/target/lio_start.sh
 }
 
+PNBLACKLIST[lio-utils] ?= "${@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)}"
+
 RDEPENDS_${PN} += "python-stringold python-subprocess python-shell \
     python-datetime python-textutils python-crypt python-netclient python-email \
     bash"

Comments

Martin Jansa March 25, 2021, 5:32 p.m.
The packagegroup-meta-oe.bb part of this is wrong, will fix and send v2
shortly.

On Wed, Mar 24, 2021 at 5:47 PM Martin Jansa <martin.jansa@gmail.com> wrote:

> * it depends on target python(2) recipes from meta-python2 which are
> restricted with this
>   conditional since:
>
> https://git.openembedded.org/meta-python2/commit/?h=hardknott&id=10c65fc18998d302f34634ffceaf31ab335056dd
>
> * telepathy-idle and cherokee from:
>   meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb
>   meta-webserver/recipes-httpd/cherokee/cherokee_git.bb
>   also depend on meta-python2, but use only pythonnative from there, so
> they aren't blacklisted.
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 6 +++---
>  meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb            | 2 ++
>  meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb   | 2 ++
>  meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb         | 2 ++
>  4 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
> b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
> index e9fcf71a76..0328478ae7 100644
> --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
> +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
> @@ -220,7 +220,7 @@ RDEPENDS_packagegroup-meta-oe-dbs ="\
>  "
>
>  RDEPENDS_packagegroup-meta-oe-dbs-python2 ="\
> -    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2",
> "mysql-python", "", d)} \
> +    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2",
> "${@bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes',
> 'mysql-python', '', d}", "", d)} \
>  "
>
>  RDEPENDS_packagegroup-meta-oe-devtools ="\
> @@ -439,7 +439,7 @@ RDEPENDS_packagegroup-meta-oe-extended_remove_riscv64
> = "upm libleak mraa sysdig
>  RDEPENDS_packagegroup-meta-oe-extended_remove_riscv32 = "upm libleak mraa
> sysdig tiptop"
>
>  RDEPENDS_packagegroup-meta-oe-extended-python2 ="\
> -    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2",
> "openlmi-tools", "", d)} \
> +    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2",
> "${@bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes',
> 'openlmi-tools', '', d}", "", d)} \
>  "
>
>  RDEPENDS_packagegroup-meta-oe-gnome ="\
> @@ -916,7 +916,7 @@ RDEPENDS_packagegroup-meta-oe-support_append_x86 = "
> mcelog mce-inject mce-test
>  RDEPENDS_packagegroup-meta-oe-support_append_x86-64 = " mcelog mce-inject
> mce-test open-vm-tools vboxguestdrivers"
>
>  RDEPENDS_packagegroup-meta-oe-support-python2 ="\
> -    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2",
> "lio-utils", "", d)} \
> +    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2",
> "${@bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', 'lio-utils',
> '', d}", "", d)} \
>  "
>
>  RDEPENDS_packagegroup-meta-oe-support_remove_arm ="numactl"
> diff --git a/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb
> b/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb
> index 4617da8e1b..43fc69073f 100644
> --- a/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb
> +++ b/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb
> @@ -16,6 +16,8 @@ SRC_URI[sha256sum] =
> "811040b647e5d5686f84db415efd697e6250008b112b6909ba77ac059e
>
>  S = "${WORKDIR}/${SRCNAME}-${PV}"
>
> +PNBLACKLIST[mysql-python] ?=
> "${@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)}"
> +
>  inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2",
> "setuptools", "", d)}
>
>  python() {
> 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
> index 04f82d2bcd..6009cd0304 100644
> --- a/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb
> +++ b/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb
> @@ -7,6 +7,8 @@ SECTION = "System/Management"
>
>  inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2",
> "setuptools", "", d)}
>
> +PNBLACKLIST[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)}"
> +
>  DEPENDS = "python-native python-pywbem-native python-m2crypto
> python-pywbem"
>
>  SRC_URI = "http://fedorahosted.org/released/${BPN}/${BP}.tar.gz \
> diff --git a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb
> b/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb
> index 0fb4a6e516..4891fd187d 100644
> --- a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb
> +++ b/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb
> @@ -55,6 +55,8 @@ do_install() {
>      install -m 755 ${S}/conf/lio_start.default
> ${D}/etc/target/lio_start.sh
>  }
>
> +PNBLACKLIST[lio-utils] ?=
> "${@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)}"
> +
>  RDEPENDS_${PN} += "python-stringold python-subprocess python-shell \
>      python-datetime python-textutils python-crypt python-netclient
> python-email \
>      bash"
> --
> 2.30.2
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#90358): https://lists.openembedded.org/g/openembedded-devel/message/90358
Mute This Topic: https://lists.openembedded.org/mt/81581594/3617530
Group Owner: openembedded-devel+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-