diff --git a/meta-python/recipes-devtools/python/python3-ecdsa_0.17.0.bb b/meta-python/recipes-devtools/python/python3-ecdsa_0.17.0.bb index a217ecd2241..177019ccc21 100644 --- a/meta-python/recipes-devtools/python/python3-ecdsa_0.17.0.bb +++ b/meta-python/recipes-devtools/python/python3-ecdsa_0.17.0.bb @@ -8,6 +8,8 @@ DEPENDS += "python3-pip python3-pbr" PYPI_PACKAGE = "ecdsa" SRC_URI[sha256sum] = "b9f500bb439e4153d0330610f5d26baaf18d17b8ced1bc54410d189385ea68aa" -inherit pypi setuptools3 +inherit pypi setuptools3 python3native RDEPENDS:${PN} += "python3-six python3-gmpy2 python3-pbr" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-gmpy2_2.0.8.bb b/meta-python/recipes-devtools/python/python3-gmpy2_2.0.8.bb index c6edcbb3207..976f57ab26a 100644 --- a/meta-python/recipes-devtools/python/python3-gmpy2_2.0.8.bb +++ b/meta-python/recipes-devtools/python/python3-gmpy2_2.0.8.bb @@ -10,4 +10,5 @@ PYPI_PACKAGE = "gmpy2" PYPI_PACKAGE_EXT = "zip" SRC_URI[sha256sum] = "dd233e3288b90f21b0bb384bcc7a7e73557bb112ccf0032ad52aa614eb373d3f" -inherit pypi setuptools3 +inherit pypi setuptools3 python3native +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-progress_1.5.bb b/meta-python/recipes-devtools/python/python3-progress_1.6.bb similarity index 55% rename from meta-python/recipes-devtools/python/python3-progress_1.5.bb rename to meta-python/recipes-devtools/python/python3-progress_1.6.bb index 7fd6fd3ba61..1333da98da0 100644 --- a/meta-python/recipes-devtools/python/python3-progress_1.5.bb +++ b/meta-python/recipes-devtools/python/python3-progress_1.6.bb @@ -1,10 +1,9 @@ SUMMARY = "Easy progress reporting for Python" HOMEPAGE = "http://github.com/verigak/progress/" LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;md5=aef5566ac4fede9815eccf124c281317" +LIC_FILES_CHKSUM = "file://LICENSE;md5=00ab78a4113b09aacf63d762a7bb9644" -SRC_URI[md5sum] = "408df0e3db0ad4b74f19f6beec814ae4" -SRC_URI[sha256sum] = "69ecedd1d1bbe71bf6313d88d1e6c4d2957b7f1d4f71312c211257f7dae64372" +SRC_URI[sha256sum] = "c9c86e98b5c03fa1fe11e3b67c1feda4788b8d0fe7336c2ff7d5644ccfba34cd" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-robotframework_4.0.3.bb b/meta-python/recipes-devtools/python/python3-robotframework_4.1.bb similarity index 86% rename from meta-python/recipes-devtools/python/python3-robotframework_4.0.3.bb rename to meta-python/recipes-devtools/python/python3-robotframework_4.1.bb index cc6c9758b30..7c6c41af7ca 100644 --- a/meta-python/recipes-devtools/python/python3-robotframework_4.0.3.bb +++ b/meta-python/recipes-devtools/python/python3-robotframework_4.1.bb @@ -13,7 +13,7 @@ inherit pypi setuptools3 PYPI_PACKAGE_EXT = "zip" -SRC_URI[sha256sum] = "93c2107f789fd897f234f4b8f1ba8e7b9f4ef326d9bcbfceb71dda8cc197388c" +SRC_URI[sha256sum] = "567f2a21f0906635e21d45fe3cb84a4809a12980c9f2706a8a5f65f40f6b4ccd" RDEPENDS:${PN} += " \ ${PYTHON_PN}-shell \ @@ -24,4 +24,6 @@ RDEPENDS:${PN} += " \ ${PYTHON_PN}-html \ ${PYTHON_PN}-docutils \ ${PYTHON_PN}-ctypes \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-numbers \ " diff --git a/meta-python/recipes-devtools/python/python3-sentry-sdk_1.3.0.bb b/meta-python/recipes-devtools/python/python3-sentry-sdk_1.3.1.bb similarity index 82% rename from meta-python/recipes-devtools/python/python3-sentry-sdk_1.3.0.bb rename to meta-python/recipes-devtools/python/python3-sentry-sdk_1.3.1.bb index f3f2e1d1be3..a7810ff0c90 100644 --- a/meta-python/recipes-devtools/python/python3-sentry-sdk_1.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-sentry-sdk_1.3.1.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0c79f8d3c91fc847350efd28bfe0a341" RDEPENDS:${PN} += "python3-urllib3" -SRC_URI[sha256sum] = "5210a712dd57d88d225c1fc3fe3a3626fee493637bcd54e204826cf04b8d769c" +SRC_URI[sha256sum] = "ebe99144fa9618d4b0e7617e7929b75acd905d258c3c779edcd34c0adfffe26c" PYPI_PACKAGE = "sentry-sdk" diff --git a/meta-python/recipes-devtools/python/python3-socketio_5.3.0.bb b/meta-python/recipes-devtools/python/python3-socketio_5.4.0.bb similarity index 89% rename from meta-python/recipes-devtools/python/python3-socketio_5.3.0.bb rename to meta-python/recipes-devtools/python/python3-socketio_5.4.0.bb index 18a1753bb75..cd2c436a5c4 100644 --- a/meta-python/recipes-devtools/python/python3-socketio_5.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-socketio_5.4.0.bb @@ -9,7 +9,7 @@ inherit pypi setuptools3 PYPI_PACKAGE = "python-socketio" -SRC_URI[sha256sum] = "3dcc9785aaeef3a9eeb36c3818095662342744bdcdabd050fe697cdb826a1c2b" +SRC_URI[sha256sum] = "ca807c9e1f168e96dea412d64dd834fb47c470d27fd83da0504aa4b248ba2544" PACKAGECONFIG ?= "asyncio_client client" PACKAGECONFIG[asyncio_client] = ",,,${PYTHON_PN}-aiohttp ${PYTHON_PN}-websockets" diff --git a/meta-python/recipes-devtools/python/python3-tqdm_4.61.2.bb b/meta-python/recipes-devtools/python/python3-tqdm_4.62.0.bb similarity index 81% rename from meta-python/recipes-devtools/python/python3-tqdm_4.61.2.bb rename to meta-python/recipes-devtools/python/python3-tqdm_4.62.0.bb index ef0e5f40a4c..f9b530d652b 100644 --- a/meta-python/recipes-devtools/python/python3-tqdm_4.61.2.bb +++ b/meta-python/recipes-devtools/python/python3-tqdm_4.62.0.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" LICENSE = "MIT & MPL-2.0" LIC_FILES_CHKSUM = "file://LICENCE;md5=59e4271a933d33edfe60237db377a14b" -SRC_URI[sha256sum] = "8bb94db0d4468fea27d004a0f1d1c02da3cdedc00fe491c0de986b76a04d6b0a" +SRC_URI[sha256sum] = "3642d483b558eec80d3c831e23953582c34d7e4540db86d9e5ed9dad238dabc6" inherit pypi setuptools3 diff --git a/meta-python/recipes-devtools/python/python3-twisted_21.2.0.bb b/meta-python/recipes-devtools/python/python3-twisted_21.7.0.bb similarity index 99% rename from meta-python/recipes-devtools/python/python3-twisted_21.2.0.bb rename to meta-python/recipes-devtools/python/python3-twisted_21.7.0.bb index 67c6c976f07..4e9472793ba 100644 --- a/meta-python/recipes-devtools/python/python3-twisted_21.2.0.bb +++ b/meta-python/recipes-devtools/python/python3-twisted_21.7.0.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://www.twistedmatrix.com" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=e33c411c0b86b1f3ca299091ed51ca31" -SRC_URI[sha256sum] = "77544a8945cf69b98d2946689bbe0c75de7d145cdf11f391dd487eae8fc95a12" +SRC_URI[sha256sum] = "2cd652542463277378b0d349f47c62f20d9306e57d1247baabd6d1d38a109006" PYPI_PACKAGE = "Twisted" diff --git a/meta-python/recipes-devtools/python/python3-xlsxwriter_1.4.4.bb b/meta-python/recipes-devtools/python/python3-xlsxwriter_1.4.5.bb similarity index 82% rename from meta-python/recipes-devtools/python/python3-xlsxwriter_1.4.4.bb rename to meta-python/recipes-devtools/python/python3-xlsxwriter_1.4.5.bb index ef4a6baa434..ffd3072a99e 100644 --- a/meta-python/recipes-devtools/python/python3-xlsxwriter_1.4.4.bb +++ b/meta-python/recipes-devtools/python/python3-xlsxwriter_1.4.5.bb @@ -16,6 +16,6 @@ RDEPENDS:${PN} += " \ python3-io \ " -SRC_URI[sha256sum] = "791567acccc485ba76e0b84bccced2651981171de5b47d541520416f2f9f93e3" +SRC_URI[sha256sum] = "0956747859567ec01907e561a7d8413de18a7aae36860f979f9da52b9d58bc19" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch deleted file mode 100644 index 90fa387b01b..00000000000 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch +++ /dev/null @@ -1,70 +0,0 @@ -From fc8e93530ba017ecfe111e53d3cbdc3a5b3ac286 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Fri, 23 Nov 2018 16:58:38 +0800 -Subject: [PATCH 01/11] comment out selinux - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia ---- - blivet/flags.py | 5 +++-- - blivet/util.py | 6 +++++- - 2 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/blivet/flags.py b/blivet/flags.py -index 4e26d82..94324ff 100644 ---- a/blivet/flags.py -+++ b/blivet/flags.py -@@ -20,7 +20,7 @@ - # - - import shlex --import selinux -+#import selinux - - - class Flags(object): -@@ -47,7 +47,8 @@ class Flags(object): - # - # enable/disable functionality - # -- self.selinux = selinux.is_selinux_enabled() -+ #self.selinux = selinux.is_selinux_enabled() -+ self.selinux = False - self.multipath = True - self.dmraid = True - self.ibft = True -diff --git a/blivet/util.py b/blivet/util.py -index 9daf151..4eac8b9 100644 ---- a/blivet/util.py -+++ b/blivet/util.py -@@ -3,7 +3,7 @@ import functools - import glob - import itertools - import os --import selinux -+#import selinux - import subprocess - import re - import sys -@@ -444,6 +444,8 @@ def get_cow_sysfs_path(dev_path, dev_sysfsPath): - def match_path_context(path): - """ Return the default SELinux context for the given path. """ - context = None -+ return context -+ - try: - context = selinux.matchpathcon(os.path.normpath(path), 0)[1] - except OSError as e: -@@ -468,6 +470,8 @@ def set_file_context(path, context, root=None): - - True if successful, False if not. - """ -+ return False -+ - if root is None: - root = '/' - --- -2.7.4 - diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0008-use-oe-variable-to-replace-hardcoded-dir.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0008-use-oe-variable-to-replace-hardcoded-dir.patch index ade1862d785..1e8bcac47e5 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0008-use-oe-variable-to-replace-hardcoded-dir.patch +++ b/meta-python/recipes-extended/python-blivet/python3-blivet/0008-use-oe-variable-to-replace-hardcoded-dir.patch @@ -6,6 +6,10 @@ Subject: [PATCH 08/11] use oe variable to replace hardcoded dir Upstream-Status: Pending Signed-off-by: Hongxu Jia + +Rebase for python3-blivet 3.4.0. + +Signed-off-by: Kai Kang --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) @@ -19,11 +23,11 @@ index b745a79..b5b4258 100644 data_files = [ - ('/etc/dbus-1/system.d', ['dbus/blivet.conf']), -- ('/usr/share/dbus-1/system-services', ['dbus/com.redhat.Blivet1.service']), +- ('/usr/share/dbus-1/system-services', ['dbus/com.redhat.Blivet0.service']), - ('/usr/libexec', ['dbus/blivetd']), - ('/usr/lib/systemd/system', ['dbus/blivet.service']) + (os.environ.get('sysconfdir')+'/dbus-1/system.d', ['dbus/blivet.conf']), -+ (os.environ.get('datadir')+'/dbus-1/system-services', ['dbus/com.redhat.Blivet1.service']), ++ (os.environ.get('datadir')+'/dbus-1/system-services', ['dbus/com.redhat.Blivet0.service']), + (os.environ.get('libexecdir'), ['dbus/blivetd']), + (os.environ.get('systemd_system_unitdir'), ['dbus/blivet.service']) ] diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0010-invoking-mkfs-with-infinite-timeout.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0010-invoking-mkfs-with-infinite-timeout.patch index f1284904580..c441acd1737 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0010-invoking-mkfs-with-infinite-timeout.patch +++ b/meta-python/recipes-extended/python-blivet/python3-blivet/0010-invoking-mkfs-with-infinite-timeout.patch @@ -9,17 +9,21 @@ lots of disks, or with slow disks. Upstream-Status: Pending Signed-off-by: Hongxu Jia + +Rebase for python3-blivet 3.4.0. + +Signed-off-by: Kai Kang --- blivet/tasks/fsmkfs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blivet/tasks/fsmkfs.py b/blivet/tasks/fsmkfs.py -index ad166aa..7bf5075 100644 +index e4a6aaa8..9730f7e5 100644 --- a/blivet/tasks/fsmkfs.py +++ b/blivet/tasks/fsmkfs.py -@@ -170,7 +170,7 @@ class FSMkfs(task.BasicApplication, FSMkfsTask): +@@ -203,7 +203,7 @@ class FSMkfs(task.BasicApplication, FSMkfsTask): options = options or [] - cmd = self._mkfs_command(options, label, set_uuid) + cmd = self._mkfs_command(options, label, set_uuid, nodiscard) try: - ret = util.run_program(cmd) + ret = util.run_program(cmd, timeout=-1) diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet_3.1.4.bb b/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.0.bb similarity index 89% rename from meta-python/recipes-extended/python-blivet/python3-blivet_3.1.4.bb rename to meta-python/recipes-extended/python-blivet/python3-blivet_3.4.0.bb index 204793759dc..d3373f4ae26 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivet_3.1.4.bb +++ b/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.0.bb @@ -8,9 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" S = "${WORKDIR}/git" B = "${S}" -SRCREV = "9b5ad2d5b5df159963e1c6c24523e1dfe1f71435" -SRC_URI = "git://github.com/rhinstaller/blivet;branch=3.1-release \ - file://0001-comment-out-selinux.patch \ +SRCREV = "f7d9027e4fdad11187980e73726cd75a2dc962c2" +SRC_URI = "git://github.com/storaged-project/blivet.git;branch=3.4-release \ file://0002-run_program-support-timeout.patch \ file://0003-support-infinit-timeout.patch \ file://0004-fix-new.roots-object-is-not-iterable.patch \ diff --git a/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Fix-return-type-of-BlivetUtils.get_disks-1658893.patch b/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Fix-return-type-of-BlivetUtils.get_disks-1658893.patch deleted file mode 100644 index cf80566854b..00000000000 --- a/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Fix-return-type-of-BlivetUtils.get_disks-1658893.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4d0f9f961704bc1dd83fdf6808fb6ab91dc6a768 Mon Sep 17 00:00:00 2001 -From: Vojtech Trefny -Date: Thu, 13 Dec 2018 13:39:03 +0100 -Subject: [PATCH] Fix return type of BlivetUtils.get_disks (#1658893) - -This must be a list, not a generator, because we are iterating -over it multiple times in some cases. - -Upstream-Status: Backport[git://github.com/rhinstaller/blivet-gui] - -Signed-off-by: Hongxu Jia - ---- - blivetgui/blivet_utils.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/blivetgui/blivet_utils.py b/blivetgui/blivet_utils.py -index e2bd802..ddb04fc 100644 ---- a/blivetgui/blivet_utils.py -+++ b/blivetgui/blivet_utils.py -@@ -204,7 +204,7 @@ class BlivetUtils(object): - - """ - -- return (device for device in self.storage.disks if device.type != "mdarray") -+ return [device for device in self.storage.disks if device.type != "mdarray"] - - def get_group_devices(self): - """ Return list of LVM2 Volume Group devices --- -2.7.4 - diff --git a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.10.bb b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.2.1.bb similarity index 73% rename from meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.10.bb rename to meta-python/recipes-extended/python-blivet/python3-blivetgui_2.2.1.bb index 4f5856d1b2b..ad3c0730f79 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.10.bb +++ b/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.2.1.bb @@ -8,10 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" S = "${WORKDIR}/git" B = "${S}" -SRCREV = "67ec0b7a0e065ba24ab87963409bfb21b2aac6dd" -SRC_URI = "git://github.com/rhinstaller/blivet-gui;branch=master \ - file://0001-Fix-return-type-of-BlivetUtils.get_disks-1658893.patch \ -" +SRCREV = "adb6bd69fb3cfa709265db66ddcee04c0b5e070f" +SRC_URI = "git://github.com/storaged-project/blivet-gui.git" inherit features_check REQUIRED_DISTRO_FEATURES = "x11 systemd"