From 88efe3c0ea78196b53d0c6606887b9cf72ca632c Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Tue, 3 Aug 2021 14:13:38 +0800 Subject: python3-blivet: 3.1.4 -> 3.4.0 Upgrade python3-blivet from 3.1.4 to 3.4.0. * it imports selinux conditionally, so remove 0001-comment-out-selinux.patch * rebase 0008-use-oe-variable-to-replace-hardcoded-dir.patch and 0010-invoking-mkfs-with-infinite-timeout.patch Signed-off-by: Kai Kang Signed-off-by: Khem Raj Signed-off-by: Trevor Gamblin --- .../0008-use-oe-variable-to-replace-hardcoded-dir.patch | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'meta-python/recipes-extended/python-blivet/python3-blivet/0008-use-oe-variable-to-replace-hardcoded-dir.patch') 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 ade1862d78..1e8bcac47e 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']) ] -- cgit v1.2.3-54-g00ecf