diff options
Diffstat (limited to 'meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch')
-rw-r--r-- | meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch index 0ee32057cb..c77b86a455 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch +++ b/meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 7d483c27ac0a23ca3bba7f320918afc40013bd8e Mon Sep 17 00:00:00 2001 | 1 | From 648a18bfc447f076d48ae4147d984b8ef56e37aa Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Mon, 8 May 2017 14:25:52 +0800 | 3 | Date: Mon, 30 Jul 2018 16:13:40 +0800 |
4 | Subject: [PATCH 01/13] comment out selinux | 4 | Subject: [PATCH 01/11] comment out selinux |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe specific] | 6 | Upstream-Status: Inappropriate [oe specific] |
7 | 7 | ||
@@ -12,7 +12,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
12 | 2 files changed, 8 insertions(+), 3 deletions(-) | 12 | 2 files changed, 8 insertions(+), 3 deletions(-) |
13 | 13 | ||
14 | diff --git a/blivet/flags.py b/blivet/flags.py | 14 | diff --git a/blivet/flags.py b/blivet/flags.py |
15 | index 06822db..b55a93f 100644 | 15 | index 1840121..8789390 100644 |
16 | --- a/blivet/flags.py | 16 | --- a/blivet/flags.py |
17 | +++ b/blivet/flags.py | 17 | +++ b/blivet/flags.py |
18 | @@ -20,7 +20,7 @@ | 18 | @@ -20,7 +20,7 @@ |
@@ -24,7 +24,7 @@ index 06822db..b55a93f 100644 | |||
24 | 24 | ||
25 | 25 | ||
26 | class Flags(object): | 26 | class Flags(object): |
27 | @@ -49,7 +49,8 @@ class Flags(object): | 27 | @@ -47,7 +47,8 @@ class Flags(object): |
28 | # | 28 | # |
29 | # enable/disable functionality | 29 | # enable/disable functionality |
30 | # | 30 | # |
@@ -35,19 +35,19 @@ index 06822db..b55a93f 100644 | |||
35 | self.dmraid = True | 35 | self.dmraid = True |
36 | self.ibft = True | 36 | self.ibft = True |
37 | diff --git a/blivet/util.py b/blivet/util.py | 37 | diff --git a/blivet/util.py b/blivet/util.py |
38 | index e3e71ce..0cf5188 100644 | 38 | index 7334ff6..0f2a995 100644 |
39 | --- a/blivet/util.py | 39 | --- a/blivet/util.py |
40 | +++ b/blivet/util.py | 40 | +++ b/blivet/util.py |
41 | @@ -4,7 +4,7 @@ import glob | 41 | @@ -3,7 +3,7 @@ import functools |
42 | import glob | ||
42 | import itertools | 43 | import itertools |
43 | import os | 44 | import os |
44 | import shutil | ||
45 | -import selinux | 45 | -import selinux |
46 | +#import selinux | 46 | +#import selinux |
47 | import subprocess | 47 | import subprocess |
48 | import re | 48 | import re |
49 | import sys | 49 | import sys |
50 | @@ -431,6 +431,8 @@ def get_cow_sysfs_path(dev_path, dev_sysfsPath): | 50 | @@ -430,6 +430,8 @@ def get_cow_sysfs_path(dev_path, dev_sysfsPath): |
51 | def match_path_context(path): | 51 | def match_path_context(path): |
52 | """ Return the default SELinux context for the given path. """ | 52 | """ Return the default SELinux context for the given path. """ |
53 | context = None | 53 | context = None |
@@ -56,7 +56,7 @@ index e3e71ce..0cf5188 100644 | |||
56 | try: | 56 | try: |
57 | context = selinux.matchpathcon(os.path.normpath(path), 0)[1] | 57 | context = selinux.matchpathcon(os.path.normpath(path), 0)[1] |
58 | except OSError as e: | 58 | except OSError as e: |
59 | @@ -455,6 +457,8 @@ def set_file_context(path, context, root=None): | 59 | @@ -454,6 +456,8 @@ def set_file_context(path, context, root=None): |
60 | 60 | ||
61 | True if successful, False if not. | 61 | True if successful, False if not. |
62 | """ | 62 | """ |