diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2022-09-12 11:25:15 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2022-09-12 11:29:53 -0700 |
| commit | 8e295e4e1e35a52a476e6a9f3c2b00276fb1444b (patch) | |
| tree | 49639beef49d98ac8497bf4b450ab5c7c6a4ecb5 /meta-oe/recipes-bsp | |
| parent | 1d23ebab288085c63b2c3e4a52edf74ad59b11eb (diff) | |
| download | meta-openembedded-8e295e4e1e35a52a476e6a9f3c2b00276fb1444b.tar.gz | |
fwupd: Fix tostring() call to not have xml_declaration param
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-bsp')
| -rw-r--r-- | meta-oe/recipes-bsp/fwupd/fwupd/0001-fwupd-Drop-unsupported-xml_declaration-parameter.patch | 33 | ||||
| -rw-r--r-- | meta-oe/recipes-bsp/fwupd/fwupd_1.8.4.bb | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd/0001-fwupd-Drop-unsupported-xml_declaration-parameter.patch b/meta-oe/recipes-bsp/fwupd/fwupd/0001-fwupd-Drop-unsupported-xml_declaration-parameter.patch new file mode 100644 index 0000000000..8fd0234695 --- /dev/null +++ b/meta-oe/recipes-bsp/fwupd/fwupd/0001-fwupd-Drop-unsupported-xml_declaration-parameter.patch @@ -0,0 +1,33 @@ +From 88a97229350010d73cee0ff38da0dbbe0a449dd2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 12 Sep 2022 11:20:59 -0700 +Subject: [PATCH] fwupd: Drop unsupported xml_declaration parameter + +This is not needed on Python3.7 + +Fixes +wupd-1.8.4/contrib/generate-gresource-xml.py", line 26, in <module> + f.write(ET.tostring(root, "utf-8", xml_declaration=True)) +TypeError: tostring() got an unexpected keyword argument 'xml_declaration' + +Upstream-Status: Submitted [https://github.com/fwupd/fwupd/pull/5025] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + contrib/generate-gresource-xml.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/contrib/generate-gresource-xml.py b/contrib/generate-gresource-xml.py +index 235a7700..4429f988 100755 +--- a/contrib/generate-gresource-xml.py ++++ b/contrib/generate-gresource-xml.py +@@ -23,6 +23,6 @@ for fn in sorted(sys.argv[2:]): + 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)) ++ f.write(ET.tostring(root, "utf-8")) + + sys.exit(0) +-- +2.37.3 + diff --git a/meta-oe/recipes-bsp/fwupd/fwupd_1.8.4.bb b/meta-oe/recipes-bsp/fwupd/fwupd_1.8.4.bb index 4258652744..3b5aa3483b 100644 --- a/meta-oe/recipes-bsp/fwupd/fwupd_1.8.4.bb +++ b/meta-oe/recipes-bsp/fwupd/fwupd_1.8.4.bb @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "glib-2.0 libxmlb json-glib sqlite3 libjcat gcab vala-native" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ + file://0001-fwupd-Drop-unsupported-xml_declaration-parameter.patch \ file://run-ptest" SRC_URI[sha256sum] = "adfa07434cdc29ec41c40fef460e8d970963fe0c7e849dec7f3932adb161f886" |