diff options
Diffstat (limited to 'meta-python/recipes-extended/python-blivet/python3-blivet/0008-use-oe-variable-to-replace-hardcoded-dir.patch')
-rw-r--r-- | meta-python/recipes-extended/python-blivet/python3-blivet/0008-use-oe-variable-to-replace-hardcoded-dir.patch | 8 |
1 files changed, 6 insertions, 2 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 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 | |||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | 7 | ||
8 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 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> | ||
9 | --- | 13 | --- |
10 | setup.py | 8 ++++---- | 14 | setup.py | 8 ++++---- |
11 | 1 file changed, 4 insertions(+), 4 deletions(-) | 15 | 1 file changed, 4 insertions(+), 4 deletions(-) |
@@ -19,11 +23,11 @@ index b745a79..b5b4258 100644 | |||
19 | 23 | ||
20 | data_files = [ | 24 | data_files = [ |
21 | - ('/etc/dbus-1/system.d', ['dbus/blivet.conf']), | 25 | - ('/etc/dbus-1/system.d', ['dbus/blivet.conf']), |
22 | - ('/usr/share/dbus-1/system-services', ['dbus/com.redhat.Blivet1.service']), | 26 | - ('/usr/share/dbus-1/system-services', ['dbus/com.redhat.Blivet0.service']), |
23 | - ('/usr/libexec', ['dbus/blivetd']), | 27 | - ('/usr/libexec', ['dbus/blivetd']), |
24 | - ('/usr/lib/systemd/system', ['dbus/blivet.service']) | 28 | - ('/usr/lib/systemd/system', ['dbus/blivet.service']) |
25 | + (os.environ.get('sysconfdir')+'/dbus-1/system.d', ['dbus/blivet.conf']), | 29 | + (os.environ.get('sysconfdir')+'/dbus-1/system.d', ['dbus/blivet.conf']), |
26 | + (os.environ.get('datadir')+'/dbus-1/system-services', ['dbus/com.redhat.Blivet1.service']), | 30 | + (os.environ.get('datadir')+'/dbus-1/system-services', ['dbus/com.redhat.Blivet0.service']), |
27 | + (os.environ.get('libexecdir'), ['dbus/blivetd']), | 31 | + (os.environ.get('libexecdir'), ['dbus/blivetd']), |
28 | + (os.environ.get('systemd_system_unitdir'), ['dbus/blivet.service']) | 32 | + (os.environ.get('systemd_system_unitdir'), ['dbus/blivet.service']) |
29 | ] | 33 | ] |