diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-03-25 20:14:15 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-03-25 20:14:34 +0300 |
commit | c64341c1756fdd5ed23b9f3e2d0f0a4d8bb93a6a (patch) | |
tree | 0df3674475549cc201f1e07082bad50ec5daa350 /meta-openembedded/meta-python/recipes-extended/python-blivet | |
parent | f8caae304a2fa94cf2770b72a313ee843b2f177b (diff) | |
download | openbmc-c64341c1756fdd5ed23b9f3e2d0f0a4d8bb93a6a.tar.xz |
meta-openembedded: refresh thud: 6ef9657068..4cd3a39f22
Update meta-openembedded to thud HEAD.
Adrian Bunk (2):
wireless-regdb: update 2018.05.31 -> 2018.10.24
Split ntpq into an own package
André Draszik (2):
mosquitto: fix build in systemd environments
mosquitto: fully switch over to using PACKAGECONFIG_CONFARGS
Khem Raj (1):
rtmpdump: Switch to using GNU TLS instead of openssl10
Ovidiu Panait (1):
python3-blivetgui: Fix _supported_filesystems crash
Change-Id: Id488182d26039d9a5bf170503f867b515688a738
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-python/recipes-extended/python-blivet')
2 files changed, 40 insertions, 0 deletions
diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Set-_supported_filesystems-in-BlivetGUIAnaconda-init.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Set-_supported_filesystems-in-BlivetGUIAnaconda-init.patch new file mode 100644 index 0000000000..25a71d4a7b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Set-_supported_filesystems-in-BlivetGUIAnaconda-init.patch @@ -0,0 +1,39 @@ +From a7b76f783608033e449ba1e33d040c2b40c01a4d Mon Sep 17 00:00:00 2001 +From: Adam Williamson <awilliam@redhat.com> +Date: Wed, 17 Jan 2018 10:38:18 -0800 +Subject: [PATCH] Set _supported_filesystems in BlivetGUIAnaconda init + +BlivetGUIAnaconda subclasses BlivetGUI, but doesn't call the +parent class's __init__. c4b6e174 added supported_filesystems +to BlivetGUI and set _supported_filesystems for caching during +__init__, but this was not also added to BlivetGUIAnaconda, so +when anything tries to use the supported_filesystems property +of a BlivetGUIAnaconda instance, it will crash. This is causing +all attempts to use blivet-gui in anaconda to crash since 2.1.8 +landed in Rawhide. + +Upstream-Status: Backport [https://github.com/storaged-project/blivet-gui] + +Signed-off-by: Adam Williamson <awilliam@redhat.com> +Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> +--- + blivetgui/osinstall.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/blivetgui/osinstall.py b/blivetgui/osinstall.py +index 21806ca..32ff66b 100644 +--- a/blivetgui/osinstall.py ++++ b/blivetgui/osinstall.py +@@ -94,6 +94,9 @@ class BlivetGUIAnaconda(BlivetGUI): + self.builder.set_translation_domain("blivet-gui") + self.builder.add_from_file(locate_ui_file("blivet-gui.ui")) + ++ # supported filesystems ++ self._supported_filesystems = [] ++ + # CSS styles + css_provider = Gtk.CssProvider() + css_provider.load_from_path(locate_css_file("rectangle.css")) +-- +2.20.1 + diff --git a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.8.bb b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.8.bb index 91f0dff71c..5f62b9e5cd 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.8.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.8.bb @@ -10,6 +10,7 @@ B = "${S}" SRCREV = "a4fd427ee2acc5a8f5fb030bf7816917cee63bd8" SRC_URI = "git://github.com/rhinstaller/blivet-gui;branch=master \ + file://0001-Set-_supported_filesystems-in-BlivetGUIAnaconda-init.patch \ " inherit distro_features_check |