diff options
Diffstat (limited to 'meta-openembedded/meta-python/recipes-extended/python-blivet')
-rw-r--r-- | meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb (renamed from meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.0.bb) | 16 | ||||
-rw-r--r-- | meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Use-setuptools-instead-of-distutils-in-setup.py.patch | 30 | ||||
-rw-r--r-- | meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb (renamed from meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.2.1.bb) | 12 |
3 files changed, 42 insertions, 16 deletions
diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.0.bb b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb index 85f80b8c05..bd57604f26 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.0.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb @@ -1,15 +1,11 @@ DESCRIPTION = "A python module for system storage configuration" HOMEPAGE = "http://fedoraproject.org/wiki/blivet" -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.0-or-later" SECTION = "devel/python" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -S = "${WORKDIR}/git" -B = "${S}" - -SRCREV = "f7d9027e4fdad11187980e73726cd75a2dc962c2" -SRC_URI = "git://github.com/storaged-project/blivet.git;branch=3.4-release;protocol=https \ +SRC_URI += "\ file://0002-run_program-support-timeout.patch \ file://0003-support-infinit-timeout.patch \ file://0004-fix-new.roots-object-is-not-iterable.patch \ @@ -21,14 +17,12 @@ SRC_URI = "git://github.com/storaged-project/blivet.git;branch=3.4-release;proto file://0010-invoking-mkfs-with-infinite-timeout.patch \ file://0011-invoking-dd-with-infinite-timeout.patch \ " +SRC_URI[sha256sum] = "1b05b77f3ee35d82c7a577a168c9ba0204d3e9a87eb1975e5f9af47700eeff48" -UPSTREAM_CHECK_GITTAGREGEX = "blivet-(?P<pver>\d+(\.\d+)+)$" +inherit pypi features_check systemd setuptools3_legacy -inherit features_check REQUIRED_DISTRO_FEATURES = "systemd" -inherit setuptools3 python3native - RDEPENDS:${PN} += "python3-pykickstart python3-pyudev \ parted python3-pyparted multipath-tools \ lsof cryptsetup libblockdev \ @@ -39,7 +33,5 @@ FILES:${PN} += " \ ${datadir}/dbus-1/system-services \ " -inherit systemd - SYSTEMD_AUTO_ENABLE = "disable" SYSTEMD_SERVICE:${PN} = "blivet.service" diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Use-setuptools-instead-of-distutils-in-setup.py.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Use-setuptools-instead-of-distutils-in-setup.py.patch new file mode 100644 index 0000000000..c88912bfa0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Use-setuptools-instead-of-distutils-in-setup.py.patch @@ -0,0 +1,30 @@ +From 54014061be2fed20d6c35aba9719ea70a9fea9ea Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny <vtrefny@redhat.com> +Date: Wed, 1 Sep 2021 08:59:19 +0200 +Subject: [PATCH] Use setuptools instead of distutils in setup.py + +The distutils module is deprecated and will be removed in Python +3.12. + +Upstream-Status: Backport [https://github.com/kraj/blivet-gui/commit/54014061be2fed20d6c35aba9719ea70a9fea9ea] +--- + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index aa8ef57..77849a1 100644 +--- a/setup.py ++++ b/setup.py +@@ -1,7 +1,7 @@ + from __future__ import print_function + +-from distutils.core import setup +-from distutils.command.sdist import sdist ++from setuptools import setup ++from setuptools.command.sdist import sdist + import glob + import sys + +-- +2.35.1 + diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.2.1.bb b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb index 632b313a86..c26ae1fe98 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.2.1.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.3.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "GUI tool for storage configuration using blivet library" HOMEPAGE = "https://github.com/rhinstaller/blivet-gui" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" SECTION = "devel/python" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" @@ -8,13 +8,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" S = "${WORKDIR}/git" B = "${S}" -SRCREV = "adb6bd69fb3cfa709265db66ddcee04c0b5e070f" -SRC_URI = "git://github.com/storaged-project/blivet-gui.git;branch=master;protocol=https" +SRCREV = "42512ee48494cee71febf04078d9774f0146a085" +SRC_URI = "git://github.com/storaged-project/blivet-gui.git;branch=master;protocol=https \ + file://0001-Use-setuptools-instead-of-distutils-in-setup.py.patch \ + " inherit features_check REQUIRED_DISTRO_FEATURES = "x11 systemd" -inherit setuptools3 python3native +inherit setuptools3_legacy python3native + +PIP_INSTALL_PACKAGE = "blivet_gui" RDEPENDS:${PN} = "python3-pygobject python3 \ python3-blivet gtk+3 \ |