summaryrefslogtreecommitdiffstats
path: root/meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch
diff options
context:
space:
mode:
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.patch12
1 files changed, 6 insertions, 6 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 c77b86a45..90fa387b0 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,6 +1,6 @@
1From 648a18bfc447f076d48ae4147d984b8ef56e37aa Mon Sep 17 00:00:00 2001 1From fc8e93530ba017ecfe111e53d3cbdc3a5b3ac286 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Mon, 30 Jul 2018 16:13:40 +0800 3Date: Fri, 23 Nov 2018 16:58:38 +0800
4Subject: [PATCH 01/11] comment out selinux 4Subject: [PATCH 01/11] comment out selinux
5 5
6Upstream-Status: Inappropriate [oe specific] 6Upstream-Status: Inappropriate [oe specific]
@@ -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
14diff --git a/blivet/flags.py b/blivet/flags.py 14diff --git a/blivet/flags.py b/blivet/flags.py
15index 1840121..8789390 100644 15index 4e26d82..94324ff 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 @@
@@ -35,7 +35,7 @@ index 1840121..8789390 100644
35 self.dmraid = True 35 self.dmraid = True
36 self.ibft = True 36 self.ibft = True
37diff --git a/blivet/util.py b/blivet/util.py 37diff --git a/blivet/util.py b/blivet/util.py
38index 7334ff6..0f2a995 100644 38index 9daf151..4eac8b9 100644
39--- a/blivet/util.py 39--- a/blivet/util.py
40+++ b/blivet/util.py 40+++ b/blivet/util.py
41@@ -3,7 +3,7 @@ import functools 41@@ -3,7 +3,7 @@ import functools
@@ -47,7 +47,7 @@ index 7334ff6..0f2a995 100644
47 import subprocess 47 import subprocess
48 import re 48 import re
49 import sys 49 import sys
50@@ -430,6 +430,8 @@ def get_cow_sysfs_path(dev_path, dev_sysfsPath): 50@@ -444,6 +444,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 7334ff6..0f2a995 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@@ -454,6 +456,8 @@ def set_file_context(path, context, root=None): 59@@ -468,6 +470,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 """