Signed-off-by: Khem Raj <raj.k...@gmail.com> --- ...nsupported-xml_declaration-parameter.patch | 33 ------------------- ...e9c524998e449b822feb465a0c90317cd735.patch | 26 +++++++++++++++ meta-oe/recipes-bsp/fwupd/fwupd_1.8.4.bb | 2 +- 3 files changed, 27 insertions(+), 34 deletions(-) delete mode 100644 meta-oe/recipes-bsp/fwupd/fwupd/0001-fwupd-Drop-unsupported-xml_declaration-parameter.patch create mode 100644 meta-oe/recipes-bsp/fwupd/fwupd/c54ae9c524998e449b822feb465a0c90317cd735.patch
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 deleted file mode 100644 index 8fd0234695..0000000000 --- a/meta-oe/recipes-bsp/fwupd/fwupd/0001-fwupd-Drop-unsupported-xml_declaration-parameter.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 88a97229350010d73cee0ff38da0dbbe0a449dd2 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.k...@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.k...@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/c54ae9c524998e449b822feb465a0c90317cd735.patch b/meta-oe/recipes-bsp/fwupd/fwupd/c54ae9c524998e449b822feb465a0c90317cd735.patch new file mode 100644 index 0000000000..947c764030 --- /dev/null +++ b/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.k...@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 <rich...@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-oe/recipes-bsp/fwupd/fwupd_1.8.4.bb b/meta-oe/recipes-bsp/fwupd/fwupd_1.8.4.bb index 2e9921d37d..72f37aea85 100644 --- a/meta-oe/recipes-bsp/fwupd/fwupd_1.8.4.bb +++ b/meta-oe/recipes-bsp/fwupd/fwupd_1.8.4.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" 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://0001-fwupd-Drop-unsupported-xml_declaration-parameter.patch \ + file://c54ae9c524998e449b822feb465a0c90317cd735.patch \ file://run-ptest" SRC_URI[sha256sum] = "adfa07434cdc29ec41c40fef460e8d970963fe0c7e849dec7f3932adb161f886" -- 2.37.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#98911): https://lists.openembedded.org/g/openembedded-devel/message/98911 Mute This Topic: https://lists.openembedded.org/mt/93819027/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
