mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-14 17:59:59 +00:00
Code Issues Projects Releases Wiki Activity

python3-blivet: 2.2.0 -> 3.0.1

Browse Source 
- Drop 0004-Mount-var-volatile-during-install.patch and
  0005-update-fstab-by-appending.patch
  which are moved to python3-anaconda 28.22.11

- Drop 0013-Revert-Adapt-to-logging-module-name-change.patch
  whichis obsolete

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Hongxu Jia
2018-08-01 16:27:43 +08:00
committed by Khem Raj
parent 78de741008
commit d3ae34eec2
15 changed files with 64 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch
+10 -10
View File
@@ -1,7 +1,7 @@
From 7d483c27ac0a23ca3bba7f320918afc40013bd8e Mon Sep 17 00:00:00 2001
From 648a18bfc447f076d48ae4147d984b8ef56e37aa Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Mon, 8 May 2017 14:25:52 +0800
Subject: [PATCH 01/13] comment out selinux
Date: Mon, 30 Jul 2018 16:13:40 +0800
Subject: [PATCH 01/11] comment out selinux
Upstream-Status: Inappropriate [oe specific]
@@ -12,7 +12,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/blivet/flags.py b/blivet/flags.py
index 06822db..b55a93f 100644
index 1840121..8789390 100644
--- a/blivet/flags.py
+++ b/blivet/flags.py
@@ -20,7 +20,7 @@
@@ -24,7 +24,7 @@ index 06822db..b55a93f 100644
class Flags(object):
@@ -49,7 +49,8 @@ class Flags(object):
@@ -47,7 +47,8 @@ class Flags(object):
#
# enable/disable functionality
#
@@ -35,19 +35,19 @@ index 06822db..b55a93f 100644
self.dmraid = True
self.ibft = True
diff --git a/blivet/util.py b/blivet/util.py
index e3e71ce..0cf5188 100644
index 7334ff6..0f2a995 100644
--- a/blivet/util.py
+++ b/blivet/util.py
@@ -4,7 +4,7 @@ import glob
@@ -3,7 +3,7 @@ import functools
import glob
import itertools
import os
import shutil
-import selinux
+#import selinux
import subprocess
import re
import sys
@@ -431,6 +431,8 @@ def get_cow_sysfs_path(dev_path, dev_sysfsPath):
@@ -430,6 +430,8 @@ def get_cow_sysfs_path(dev_path, dev_sysfsPath):
def match_path_context(path):
""" Return the default SELinux context for the given path. """
context = None
@@ -56,7 +56,7 @@ index e3e71ce..0cf5188 100644
try:
context = selinux.matchpathcon(os.path.normpath(path), 0)[1]
except OSError as e:
@@ -455,6 +457,8 @@ def set_file_context(path, context, root=None):
@@ -454,6 +456,8 @@ def set_file_context(path, context, root=None):
True if successful, False if not.
"""