diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-bsp/fwupd')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd/c54ae9c524998e449b822feb465a0c90317cd735.patch | 26 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.8.4.bb (renamed from meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.8.1.bb) | 9 |
2 files changed, 30 insertions, 5 deletions
diff --git a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd/c54ae9c524998e449b822feb465a0c90317cd735.patch b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd/c54ae9c524998e449b822feb465a0c90317cd735.patch new file mode 100644 index 0000000000..947c764030 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd/c54ae9c524998e449b822feb465a0c90317cd735.patch @@ -0,0 +1,26 @@ +From c54ae9c524998e449b822feb465a0c90317cd735 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 20 Sep 2022 15:10:26 +0100 +Subject: [PATCH] trivial: Fix compile when using python 3.7 or older + +Upstream-Status: Backport [https://github.com/fwupd/fwupd/pull/5051] +Signed-off-by: Richard Hughes <richard@hughsie.com> +--- + contrib/generate-gresource-xml.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/contrib/generate-gresource-xml.py b/contrib/generate-gresource-xml.py +index 235a770020..569c804937 100755 +--- a/contrib/generate-gresource-xml.py ++++ b/contrib/generate-gresource-xml.py +@@ -23,6 +23,9 @@ + n_file.set("preprocess", "xml-stripblanks") + n_file.set("alias", os.path.basename(fn)) + with open(sys.argv[1], "wb") as f: +- f.write(ET.tostring(root, "utf-8", xml_declaration=True)) ++ try: ++ f.write(ET.tostring(root, "utf-8", xml_declaration=True)) ++ except TypeError: ++ f.write(ET.tostring(root, "utf-8")) + + sys.exit(0) diff --git a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.8.1.bb b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.8.4.bb index 7576b846fb..72f37aea85 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.8.1.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.8.4.bb @@ -2,11 +2,12 @@ SUMMARY = "A simple daemon to allow session software to update firmware" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -DEPENDS = "glib-2.0 libxmlb json-glib sqlite3 libjcat gcab vala-native" +DEPENDS = "glib-2.0 libxmlb json-glib libjcat gcab vala-native" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ + file://c54ae9c524998e449b822feb465a0c90317cd735.patch \ file://run-ptest" -SRC_URI[sha256sum] = "5756466442eb9134fb40cdc8a46f9e01003247c8eac82fa5d8b16f6420375b79" +SRC_URI[sha256sum] = "adfa07434cdc29ec41c40fef460e8d970963fe0c7e849dec7f3932adb161f886" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" @@ -47,7 +48,6 @@ PACKAGECONFIG ??= "curl gnutls gudev gusb \ plugin_synaptics_mst \ plugin_synaptics_rmi \ plugin_scsi \ - plugin_thunderbolt \ plugin_uf2 \ plugin_upower \ sqlite" @@ -99,7 +99,6 @@ PACKAGECONFIG[plugin_redfish] = "-Dplugin_redfish=true,-Dplugin_redfish=false" PACKAGECONFIG[plugin_scsi] = "-Dplugin_scsi=true,-Dplugin_scsi=false" PACKAGECONFIG[plugin_synaptics_mst] = "-Dplugin_synaptics_mst=true,-Dplugin_synaptics_mst=false" PACKAGECONFIG[plugin_synaptics_rmi] = "-Dplugin_synaptics_rmi=true,-Dplugin_synaptics_rmi=false" -PACKAGECONFIG[plugin_thunderbolt] = "-Dplugin_thunderbolt=true,-Dplugin_thunderbolt=false" PACKAGECONFIG[plugin_tpm] = "-Dplugin_tpm=true,-Dplugin_tpm=false,tpm2-tss" # Turn off the capsule splash as it needs G-I at buildtime, which isn't currently supported PACKAGECONFIG[plugin_uefi_capsule] = "-Dplugin_uefi_capsule=true -Dplugin_uefi_capsule_splash=false,-Dplugin_uefi_capsule=false,efivar fwupd-efi" @@ -108,7 +107,7 @@ PACKAGECONFIG[plugin_uf2] = "-Dplugin_uf2=true,-Dplugin_uf2=false" PACKAGECONFIG[plugin_upower] = "-Dplugin_upower=true,-Dplugin_upower=false" # Always disable these plugins on non-x86 platforms as they don't compile or are useless -DISABLE_NON_X86 = "plugin_amt plugin_intel_spi plugin_msr plugin_thunderbolt" +DISABLE_NON_X86 = "plugin_amt plugin_intel_spi plugin_msr" DISABLE_NON_X86:x86 = "" DISABLE_NON_X86:x86-64 = "" PACKAGECONFIG:remove = "${DISABLE_NON_X86}" |