diff options
author | jmbills <42755197+jmbills@users.noreply.github.com> | 2019-10-25 19:18:16 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-25 19:18:16 +0300 |
commit | 0dbb60593ebb5a62190c0e6cff7f1770493303a2 (patch) | |
tree | 0df2ce67404dbca3ddc4ee063dbfd9ae455be682 /meta-openembedded/meta-python/recipes-extended | |
parent | 34a3942845ac3264ce27c648ae5486d302c3e6d8 (diff) | |
parent | cc9cea46d74d280de03c713c8b555153fd811f09 (diff) | |
download | openbmc-0dbb60593ebb5a62190c0e6cff7f1770493303a2.tar.xz |
Merge branch 'intel' into intel2
Diffstat (limited to 'meta-openembedded/meta-python/recipes-extended')
7 files changed, 37 insertions, 4 deletions
diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.1.2.bb b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.1.4.bb index 45565ba71..fe9d27ab8 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.1.2.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_3.1.4.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" S = "${WORKDIR}/git" B = "${S}" -SRCREV = "878f794a38120a652cab0026b77175b099bf1f9d" +SRCREV = "9b5ad2d5b5df159963e1c6c24523e1dfe1f71435" SRC_URI = "git://github.com/rhinstaller/blivet;branch=3.1-release \ file://0001-comment-out-selinux.patch \ file://0002-run_program-support-timeout.patch \ @@ -30,7 +30,7 @@ REQUIRED_DISTRO_FEATURES = "systemd" inherit setuptools3 python3native -RDEPENDS_${PN} = "python3-pykickstart python3-pyudev \ +RDEPENDS_${PN} += "python3-pykickstart python3-pyudev \ parted python3-pyparted multipath-tools \ lsof cryptsetup libblockdev \ libbytesize \ diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Fix-return-type-of-BlivetUtils.get_disks-1658893.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Fix-return-type-of-BlivetUtils.get_disks-1658893.patch new file mode 100644 index 000000000..cf8056685 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Fix-return-type-of-BlivetUtils.get_disks-1658893.patch @@ -0,0 +1,32 @@ +From 4d0f9f961704bc1dd83fdf6808fb6ab91dc6a768 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny <vtrefny@redhat.com> +Date: Thu, 13 Dec 2018 13:39:03 +0100 +Subject: [PATCH] Fix return type of BlivetUtils.get_disks (#1658893) + +This must be a list, not a generator, because we are iterating +over it multiple times in some cases. + +Upstream-Status: Backport[git://github.com/rhinstaller/blivet-gui] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + +--- + blivetgui/blivet_utils.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/blivetgui/blivet_utils.py b/blivetgui/blivet_utils.py +index e2bd802..ddb04fc 100644 +--- a/blivetgui/blivet_utils.py ++++ b/blivetgui/blivet_utils.py +@@ -204,7 +204,7 @@ class BlivetUtils(object): + + """ + +- return (device for device in self.storage.disks if device.type != "mdarray") ++ return [device for device in self.storage.disks if device.type != "mdarray"] + + def get_group_devices(self): + """ Return list of LVM2 Volume Group devices +-- +2.7.4 + diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.10.bb b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.10.bb index 2ea810327..b7e2493c3 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.10.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.10.bb @@ -10,6 +10,7 @@ B = "${S}" SRCREV = "67ec0b7a0e065ba24ab87963409bfb21b2aac6dd" SRC_URI = "git://github.com/rhinstaller/blivet-gui;branch=master \ + file://0001-Fix-return-type-of-BlivetUtils.get_disks-1658893.patch \ " inherit distro_features_check diff --git a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.18.bb b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.20.bb index 1a038848c..ed10ce958 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.18.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.20.bb @@ -18,7 +18,7 @@ SRC_URI = "git://github.com/rhinstaller/pykickstart.git;protocol=https;branch=ma file://0003-comment-out-sections-shutdown-and-environment-in-gen.patch \ file://0004-load.py-retry-to-invoke-request-with-timeout.patch \ " -SRCREV = "ad942f2644337c4672c7a22bd24a5b7268c1f5e9" +SRCREV = "487edfded19d5969db0673b200ee4272b7dc6697" UPSTREAM_CHECK_GITTAGREGEX = "r(?P<pver>\d+(\.\d+)+(-\d+)*)" diff --git a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted.inc b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted.inc index a0ec02817..f769f95a0 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted.inc +++ b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted.inc @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "\ DEPENDS += "parted" # upstream only publishes releases in github archives which are discouraged -SRCREV = "1fdb15120f35f5da1dc7ec116522f0c796a8376a" +SRCREV = "2396ba7df56de277b4999bdd5f7d1a1706a6388a" SRC_URI = "git://github.com/rhinstaller/pyparted.git;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.1.bb b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.2.bb index 32aa378cc..32aa378cc 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.1.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.2.bb diff --git a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.1.bb b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.2.bb index d83901ff3..d83901ff3 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.1.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.2.bb |