mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-30 13:00:02 +00:00
python3-blivet: upgrade 3.12.1 -> 3.13.2
Changelog: https://github.com/storaged-project/blivet/releases 1. Drop 0008-use-oe-variable-to-replace-hardcoded-dir.patch and add do_install:append to manually install D-Bus and systemd files: Upstream commit 0f0fd84d [1] removed data_files from setup.py and moved their installation to a Makefile target (install-dbus), but OE uses setuptools3_legacy which only runs setup.py install and does not invoke the Makefile. 2. Add missing RDEPENDS: - python3-dasbus: upstream replaced the internal safe_dbus module with the external dasbus library [2]. - python3-pygobject: was always required (gi.repository for libblockdev) but missing from old recipe. - util-linux: blivet directly calls lsblk, mount, umount and blockdev via subprocess. [1] https://github.com/storaged-project/blivet/commit/0f0fd84d [2] https://github.com/storaged-project/blivet/commit/1e7c5409 Signed-off-by: Jiaying Song <jiaying.song.cn@windriver.com> Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
-35
@@ -1,35 +0,0 @@
|
|||||||
From 6a85945c060154581f5a129a6a946258bf9333c4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
|
||||||
Date: Mon, 8 May 2017 03:54:12 -0400
|
|
||||||
Subject: [PATCH 08/11] use oe variable to replace hardcoded dir
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
|
||||||
|
|
||||||
Rebase for python3-blivet 3.4.0.
|
|
||||||
|
|
||||||
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
|
||||||
---
|
|
||||||
setup.py | 8 ++++----
|
|
||||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/setup.py b/setup.py
|
|
||||||
index e6bb3f3..700085b 100644
|
|
||||||
--- a/setup.py
|
|
||||||
+++ b/setup.py
|
|
||||||
@@ -73,10 +73,10 @@ class blivet_sdist(sdist):
|
|
||||||
|
|
||||||
|
|
||||||
data_files = [
|
|
||||||
- ('/etc/dbus-1/system.d', ['dbus/blivet.conf']),
|
|
||||||
- ('/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.Blivet0.service']),
|
|
||||||
+ (os.environ.get('libexecdir'), ['dbus/blivetd']),
|
|
||||||
+ (os.environ.get('systemd_system_unitdir'), ['dbus/blivet.service'])
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
+14
-3
@@ -11,23 +11,34 @@ SRC_URI += "\
|
|||||||
file://0005-fix-incorrect-timeout-while-system-time-changed.patch \
|
file://0005-fix-incorrect-timeout-while-system-time-changed.patch \
|
||||||
file://0006-tweak-btrfs-packages.patch \
|
file://0006-tweak-btrfs-packages.patch \
|
||||||
file://0007-invoking-mount-with-infinite-timeout.patch \
|
file://0007-invoking-mount-with-infinite-timeout.patch \
|
||||||
file://0008-use-oe-variable-to-replace-hardcoded-dir.patch \
|
|
||||||
file://0009-invoking-fsck-with-infinite-timeout.patch \
|
file://0009-invoking-fsck-with-infinite-timeout.patch \
|
||||||
file://0010-invoking-mkfs-with-infinite-timeout.patch \
|
file://0010-invoking-mkfs-with-infinite-timeout.patch \
|
||||||
file://0011-invoking-dd-with-infinite-timeout.patch \
|
file://0011-invoking-dd-with-infinite-timeout.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[sha256sum] = "54775ba212d1574b1b0750ce147f0d3cf3b5d73aaf040d172283edb57db4ba15"
|
SRC_URI[sha256sum] = "6d8374d05eeab513b2a26cf01267e853df7b31e13ad1a1ba7d73a856190d0518"
|
||||||
|
|
||||||
inherit pypi features_check systemd setuptools3_legacy
|
inherit pypi features_check systemd setuptools3_legacy
|
||||||
|
|
||||||
REQUIRED_DISTRO_FEATURES = "systemd"
|
REQUIRED_DISTRO_FEATURES = "systemd"
|
||||||
|
|
||||||
RDEPENDS:${PN} += "python3-pykickstart python3-pyudev \
|
RDEPENDS:${PN} += "python3-dasbus python3-pygobject python3-pykickstart python3-pyudev \
|
||||||
parted python3-pyparted multipath-tools \
|
parted python3-pyparted multipath-tools \
|
||||||
lsof cryptsetup libblockdev libblockdev-bin \
|
lsof cryptsetup libblockdev libblockdev-bin \
|
||||||
libbytesize \
|
libbytesize \
|
||||||
|
util-linux \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
do_install:append() {
|
||||||
|
install -d ${D}${sysconfdir}/dbus-1/system.d
|
||||||
|
install -m 644 ${S}/dbus/blivet.conf ${D}${sysconfdir}/dbus-1/system.d/blivet.conf
|
||||||
|
install -d ${D}${datadir}/dbus-1/system-services
|
||||||
|
install -m 644 ${S}/dbus/com.redhat.Blivet0.service ${D}${datadir}/dbus-1/system-services/com.redhat.Blivet0.service
|
||||||
|
install -d ${D}${libexecdir}
|
||||||
|
install -m 755 ${S}/dbus/blivetd ${D}${libexecdir}/blivetd
|
||||||
|
install -d ${D}${systemd_system_unitdir}
|
||||||
|
install -m 644 ${S}/dbus/blivet.service ${D}${systemd_system_unitdir}/blivet.service
|
||||||
|
}
|
||||||
|
|
||||||
FILES:${PN} += " \
|
FILES:${PN} += " \
|
||||||
${datadir}/dbus-1/system-services \
|
${datadir}/dbus-1/system-services \
|
||||||
"
|
"
|
||||||
Reference in New Issue
Block a user