diff options
Diffstat (limited to 'meta-python/recipes-extended')
| -rw-r--r-- | meta-python/recipes-extended/python-blivet/python3-blivet/0008-use-oe-variable-to-replace-hardcoded-dir.patch | 35 | ||||
| -rw-r--r-- | meta-python/recipes-extended/python-blivet/python3-blivet_3.13.2.bb (renamed from meta-python/recipes-extended/python-blivet/python3-blivet_3.12.1.bb) | 17 | ||||
| -rw-r--r-- | meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.69.bb (renamed from meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.63.bb) | 2 | ||||
| -rw-r--r-- | meta-python/recipes-extended/python-pyparted/python3-pyparted_3.13.0.bb | 2 | ||||
| -rw-r--r-- | meta-python/recipes-extended/python-pytesseract/pytesseract_0.3.13.bb | 2 | ||||
| -rw-r--r-- | meta-python/recipes-extended/python-rich/python3-rich_15.0.0.bb (renamed from meta-python/recipes-extended/python-rich/python3-rich_14.3.3.bb) | 2 | ||||
| -rw-r--r-- | meta-python/recipes-extended/pywbemtools/python3-pywbemtools_1.3.1.bb | 2 |
7 files changed, 19 insertions, 43 deletions
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 deleted file mode 100644 index d3ab8f8526..0000000000 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0008-use-oe-variable-to-replace-hardcoded-dir.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From 6a85945c060154581f5a129a6a946258bf9333c4 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 3 | Date: Mon, 8 May 2017 03:54:12 -0400 | ||
| 4 | Subject: [PATCH 08/11] use oe variable to replace hardcoded dir | ||
| 5 | |||
| 6 | Upstream-Status: Pending | ||
| 7 | |||
| 8 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 9 | |||
| 10 | Rebase for python3-blivet 3.4.0. | ||
| 11 | |||
| 12 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
| 13 | --- | ||
| 14 | setup.py | 8 ++++---- | ||
| 15 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/setup.py b/setup.py | ||
| 18 | index e6bb3f3..700085b 100644 | ||
| 19 | --- a/setup.py | ||
| 20 | +++ b/setup.py | ||
| 21 | @@ -73,10 +73,10 @@ class blivet_sdist(sdist): | ||
| 22 | |||
| 23 | |||
| 24 | data_files = [ | ||
| 25 | - ('/etc/dbus-1/system.d', ['dbus/blivet.conf']), | ||
| 26 | - ('/usr/share/dbus-1/system-services', ['dbus/com.redhat.Blivet0.service']), | ||
| 27 | - ('/usr/libexec', ['dbus/blivetd']), | ||
| 28 | - ('/usr/lib/systemd/system', ['dbus/blivet.service']) | ||
| 29 | + (os.environ.get('sysconfdir')+'/dbus-1/system.d', ['dbus/blivet.conf']), | ||
| 30 | + (os.environ.get('datadir')+'/dbus-1/system-services', ['dbus/com.redhat.Blivet0.service']), | ||
| 31 | + (os.environ.get('libexecdir'), ['dbus/blivetd']), | ||
| 32 | + (os.environ.get('systemd_system_unitdir'), ['dbus/blivet.service']) | ||
| 33 | ] | ||
| 34 | |||
| 35 | |||
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet_3.12.1.bb b/meta-python/recipes-extended/python-blivet/python3-blivet_3.13.2.bb index bf492b3d57..a159979b73 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivet_3.12.1.bb +++ b/meta-python/recipes-extended/python-blivet/python3-blivet_3.13.2.bb | |||
| @@ -11,23 +11,34 @@ SRC_URI += "\ | |||
| 11 | file://0005-fix-incorrect-timeout-while-system-time-changed.patch \ | 11 | file://0005-fix-incorrect-timeout-while-system-time-changed.patch \ |
| 12 | file://0006-tweak-btrfs-packages.patch \ | 12 | file://0006-tweak-btrfs-packages.patch \ |
| 13 | file://0007-invoking-mount-with-infinite-timeout.patch \ | 13 | file://0007-invoking-mount-with-infinite-timeout.patch \ |
| 14 | file://0008-use-oe-variable-to-replace-hardcoded-dir.patch \ | ||
| 15 | file://0009-invoking-fsck-with-infinite-timeout.patch \ | 14 | file://0009-invoking-fsck-with-infinite-timeout.patch \ |
| 16 | file://0010-invoking-mkfs-with-infinite-timeout.patch \ | 15 | file://0010-invoking-mkfs-with-infinite-timeout.patch \ |
| 17 | file://0011-invoking-dd-with-infinite-timeout.patch \ | 16 | file://0011-invoking-dd-with-infinite-timeout.patch \ |
| 18 | " | 17 | " |
| 19 | SRC_URI[sha256sum] = "54775ba212d1574b1b0750ce147f0d3cf3b5d73aaf040d172283edb57db4ba15" | 18 | SRC_URI[sha256sum] = "6d8374d05eeab513b2a26cf01267e853df7b31e13ad1a1ba7d73a856190d0518" |
| 20 | 19 | ||
| 21 | inherit pypi features_check systemd setuptools3_legacy | 20 | inherit pypi features_check systemd setuptools3_legacy |
| 22 | 21 | ||
| 23 | REQUIRED_DISTRO_FEATURES = "systemd" | 22 | REQUIRED_DISTRO_FEATURES = "systemd" |
| 24 | 23 | ||
| 25 | RDEPENDS:${PN} += "python3-pykickstart python3-pyudev \ | 24 | RDEPENDS:${PN} += "python3-dasbus python3-pygobject python3-pykickstart python3-pyudev \ |
| 26 | parted python3-pyparted multipath-tools \ | 25 | parted python3-pyparted multipath-tools \ |
| 27 | lsof cryptsetup libblockdev libblockdev-bin \ | 26 | lsof cryptsetup libblockdev libblockdev-bin \ |
| 28 | libbytesize \ | 27 | libbytesize \ |
| 28 | util-linux \ | ||
| 29 | " | 29 | " |
| 30 | 30 | ||
| 31 | do_install:append() { | ||
| 32 | install -d ${D}${sysconfdir}/dbus-1/system.d | ||
| 33 | install -m 644 ${S}/dbus/blivet.conf ${D}${sysconfdir}/dbus-1/system.d/blivet.conf | ||
| 34 | install -d ${D}${datadir}/dbus-1/system-services | ||
| 35 | install -m 644 ${S}/dbus/com.redhat.Blivet0.service ${D}${datadir}/dbus-1/system-services/com.redhat.Blivet0.service | ||
| 36 | install -d ${D}${libexecdir} | ||
| 37 | install -m 755 ${S}/dbus/blivetd ${D}${libexecdir}/blivetd | ||
| 38 | install -d ${D}${systemd_system_unitdir} | ||
| 39 | install -m 644 ${S}/dbus/blivet.service ${D}${systemd_system_unitdir}/blivet.service | ||
| 40 | } | ||
| 41 | |||
| 31 | FILES:${PN} += " \ | 42 | FILES:${PN} += " \ |
| 32 | ${datadir}/dbus-1/system-services \ | 43 | ${datadir}/dbus-1/system-services \ |
| 33 | " | 44 | " |
diff --git a/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.63.bb b/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.69.bb index 830e46a63c..c566f5a0e6 100644 --- a/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.63.bb +++ b/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.69.bb | |||
| @@ -33,7 +33,7 @@ SRC_URI = "git://github.com/rhinstaller/pykickstart.git;protocol=https;branch=ma | |||
| 33 | file://0004-load.py-retry-to-invoke-request-with-timeout.patch \ | 33 | file://0004-load.py-retry-to-invoke-request-with-timeout.patch \ |
| 34 | file://run-ptest \ | 34 | file://run-ptest \ |
| 35 | " | 35 | " |
| 36 | SRCREV = "6e0d1238cb4696a9040072a5a28a706e5775c552" | 36 | SRCREV = "601ec2d2f254909f56e2ee961d2056e0d5bc4a97" |
| 37 | 37 | ||
| 38 | UPSTREAM_CHECK_GITTAGREGEX = "r(?P<pver>\d+(\.\d+)+(-\d+)*)" | 38 | UPSTREAM_CHECK_GITTAGREGEX = "r(?P<pver>\d+(\.\d+)+(-\d+)*)" |
| 39 | 39 | ||
diff --git a/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.13.0.bb b/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.13.0.bb index 0f7065f5ae..ab0fe8c602 100644 --- a/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.13.0.bb +++ b/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.13.0.bb | |||
| @@ -15,7 +15,7 @@ inherit pkgconfig pypi setuptools3 | |||
| 15 | 15 | ||
| 16 | DEPENDS += "parted" | 16 | DEPENDS += "parted" |
| 17 | 17 | ||
| 18 | RDEPENDS:${PN}:class-target += " \ | 18 | RDEPENDS:${PN}:append:class-target = " \ |
| 19 | parted (>= 2.3) \ | 19 | parted (>= 2.3) \ |
| 20 | python3-codecs \ | 20 | python3-codecs \ |
| 21 | python3-math \ | 21 | python3-math \ |
diff --git a/meta-python/recipes-extended/python-pytesseract/pytesseract_0.3.13.bb b/meta-python/recipes-extended/python-pytesseract/pytesseract_0.3.13.bb index 0d8cfcb408..034568251b 100644 --- a/meta-python/recipes-extended/python-pytesseract/pytesseract_0.3.13.bb +++ b/meta-python/recipes-extended/python-pytesseract/pytesseract_0.3.13.bb | |||
| @@ -5,7 +5,7 @@ HOMEPAGE = "https://github.com/madmaze/pytesseract" | |||
| 5 | LICENSE = "Apache-2.0" | 5 | LICENSE = "Apache-2.0" |
| 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" |
| 7 | 7 | ||
| 8 | SRC_URI[md5sum] = "73f9645e59b437f064d05882b95832ce" | 8 | SRC_URI[sha256sum] = "4bf5f880c99406f52a3cfc2633e42d9dc67615e69d8a509d74867d3baddb5db9" |
| 9 | 9 | ||
| 10 | RDEPENDS:${PN}:append = " python3-packaging tesseract" | 10 | RDEPENDS:${PN}:append = " python3-packaging tesseract" |
| 11 | 11 | ||
diff --git a/meta-python/recipes-extended/python-rich/python3-rich_14.3.3.bb b/meta-python/recipes-extended/python-rich/python3-rich_15.0.0.bb index a2af61840f..2ab3b2fdbc 100644 --- a/meta-python/recipes-extended/python-rich/python3-rich_14.3.3.bb +++ b/meta-python/recipes-extended/python-rich/python3-rich_15.0.0.bb | |||
| @@ -8,7 +8,7 @@ LICENSE = "MIT" | |||
| 8 | 8 | ||
| 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b5f0b94fbc94f5ad9ae4efcf8a778303" | 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b5f0b94fbc94f5ad9ae4efcf8a778303" |
| 10 | 10 | ||
| 11 | SRC_URI[sha256sum] = "b8daa0b9e4eef54dd8cf7c86c03713f53241884e814f4e2f5fb342fe520f639b" | 11 | SRC_URI[sha256sum] = "edd07a4824c6b40189fb7ac9bc4c52536e9780fbbfbddf6f1e2502c31b068c36" |
| 12 | 12 | ||
| 13 | inherit pypi python_poetry_core | 13 | inherit pypi python_poetry_core |
| 14 | 14 | ||
diff --git a/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_1.3.1.bb b/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_1.3.1.bb index f02c96e405..83156cfddf 100644 --- a/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_1.3.1.bb +++ b/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_1.3.1.bb | |||
| @@ -8,7 +8,7 @@ SRC_URI[sha256sum] = "7fb1c32e358d55c2c6966a071c8ecc0ca81de3d32944a67cc646c57b1a | |||
| 8 | 8 | ||
| 9 | inherit pypi setuptools3 | 9 | inherit pypi setuptools3 |
| 10 | 10 | ||
| 11 | RDEPENDS:${PN}:class-target += "\ | 11 | RDEPENDS:${PN}:append:class-target = " \ |
| 12 | python3-ply \ | 12 | python3-ply \ |
| 13 | python3-pyyaml \ | 13 | python3-pyyaml \ |
| 14 | python3-six \ | 14 | python3-six \ |
