diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0012-remove-dmraid-dependency-check.patch | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0012-remove-dmraid-dependency-check.patch')
-rw-r--r-- | meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0012-remove-dmraid-dependency-check.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0012-remove-dmraid-dependency-check.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0012-remove-dmraid-dependency-check.patch deleted file mode 100644 index 886e3ff93a..0000000000 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0012-remove-dmraid-dependency-check.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4476e846a1e64dde17df2e2370c803ce695514f9 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Mon, 6 Aug 2018 17:18:27 +0800 -Subject: [PATCH] remove dmraid dependency check - -OE does not support dmraid, remove it from dependency check - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - blivet/tasks/availability.py | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/blivet/tasks/availability.py b/blivet/tasks/availability.py -index 9a87cfd..843cf6a 100644 ---- a/blivet/tasks/availability.py -+++ b/blivet/tasks/availability.py -@@ -316,8 +316,7 @@ BLOCKDEV_DM_ALL_MODES = (blockdev.DMTechMode.CREATE_ACTIVATE | - blockdev.DMTechMode.QUERY) - BLOCKDEV_DM = BlockDevTechInfo(plugin_name="dm", - check_fn=blockdev.dm_is_tech_avail, -- technologies={blockdev.DMTech.MAP: BLOCKDEV_DM_ALL_MODES, -- blockdev.DMTech.RAID: BLOCKDEV_DM_ALL_MODES}) -+ technologies={blockdev.DMTech.MAP: BLOCKDEV_DM_ALL_MODES}) - BLOCKDEV_DM_TECH = BlockDevMethod(BLOCKDEV_DM) - - # libblockdev loop plugin required technologies and modes --- -2.7.4 - |