diff options
author | Khem Raj <raj.khem@gmail.com> | 2024-04-27 11:03:01 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-04-29 11:11:51 -0700 |
commit | 25e1917a4444b3eae8cb62bd3d1d3b096e4c5cc0 (patch) | |
tree | ba66ae115476fe35dfe0c75798a3b5749be839bf | |
parent | a6fbd9371cdccd7401764ab8257489a0e2a41274 (diff) | |
download | meta-openembedded-25e1917a4444b3eae8cb62bd3d1d3b096e4c5cc0.tar.gz |
fwupd: Upgrade to 1.9.18 release
Drop patch which is already upstreamed in this release
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-bsp/fwupd/fwupd/0001-meson-Avoid-absolute-buildtime-paths-in-generated-he.patch | 41 | ||||
-rw-r--r-- | meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb (renamed from meta-oe/recipes-bsp/fwupd/fwupd_1.8.9.bb) | 92 |
2 files changed, 46 insertions, 87 deletions
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd/0001-meson-Avoid-absolute-buildtime-paths-in-generated-he.patch b/meta-oe/recipes-bsp/fwupd/fwupd/0001-meson-Avoid-absolute-buildtime-paths-in-generated-he.patch deleted file mode 100644 index 2273bdf10..000000000 --- a/meta-oe/recipes-bsp/fwupd/fwupd/0001-meson-Avoid-absolute-buildtime-paths-in-generated-he.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From b1df1ed3a21b8ef0244102043a8fb88b0ccc3f91 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 17 Apr 2023 11:30:21 -0700 | ||
4 | Subject: [PATCH] meson: Avoid absolute buildtime paths in generated headers | ||
5 | |||
6 | using meson.project_source_root() means the path emitted to include .h | ||
7 | files is absolute and it makes its way into PN-src as well, which infact | ||
8 | is not going to work if the -src package was used to re-build this in a | ||
9 | different build path. Therefore use relative path which is '.' and | ||
10 | relative to ${S} | ||
11 | |||
12 | Changes | ||
13 | include "<abspath>/plugins/acpi-dmar/fu-acpi-dmar-plugin.h" | ||
14 | to | ||
15 | include "./plugins/acpi-dmar/fu-acpi-dmar-plugin.h" | ||
16 | |||
17 | in generated build/src/fu-plugin-builtin.h | ||
18 | |||
19 | Upstream-Status: Pending | ||
20 | |||
21 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
22 | --- | ||
23 | src/meson.build | 2 +- | ||
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
25 | |||
26 | diff --git a/src/meson.build b/src/meson.build | ||
27 | index b9f6736..bb856ea 100644 | ||
28 | --- a/src/meson.build | ||
29 | +++ b/src/meson.build | ||
30 | @@ -188,7 +188,7 @@ plugins_hdr = custom_target('fwupd-generate-plugins-header', | ||
31 | command : [ | ||
32 | join_paths(meson.project_source_root(), 'contrib', 'generate-plugins-header.py'), | ||
33 | '@OUTPUT@', | ||
34 | - meson.project_source_root(), | ||
35 | + '.', | ||
36 | ','.join(plugin_names), | ||
37 | ], | ||
38 | ) | ||
39 | -- | ||
40 | 2.40.0 | ||
41 | |||
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd_1.8.9.bb b/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb index 1f95dee1b..d20d5ed2a 100644 --- a/meta-oe/recipes-bsp/fwupd/fwupd_1.8.9.bb +++ b/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb | |||
@@ -2,12 +2,11 @@ SUMMARY = "A simple daemon to allow session software to update firmware" | |||
2 | LICENSE = "LGPL-2.1-or-later" | 2 | LICENSE = "LGPL-2.1-or-later" |
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" |
4 | 4 | ||
5 | DEPENDS = "glib-2.0 libxmlb json-glib libjcat gcab vala-native" | 5 | DEPENDS = "glib-2.0 libxmlb json-glib libjcat gcab vala-native python3-jinja2-native" |
6 | 6 | ||
7 | SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ | 7 | SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ |
8 | file://0001-meson-Avoid-absolute-buildtime-paths-in-generated-he.patch \ | ||
9 | file://run-ptest" | 8 | file://run-ptest" |
10 | SRC_URI[sha256sum] = "719a791ac4ba5988aeb93ec42778bd65d33cb075d0c093b5c04e5e1682be528a" | 9 | SRC_URI[sha256sum] = "4e554f77a8a73383a41d5637b62e6c8a8936e66cd1d18585baf29d7fe47fc4d7" |
11 | 10 | ||
12 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" | 11 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" |
13 | 12 | ||
@@ -17,14 +16,16 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
17 | inherit meson vala gobject-introspection systemd bash-completion pkgconfig gi-docgen ptest manpages useradd | 16 | inherit meson vala gobject-introspection systemd bash-completion pkgconfig gi-docgen ptest manpages useradd |
18 | 17 | ||
19 | GIDOCGEN_MESON_OPTION = 'docs' | 18 | GIDOCGEN_MESON_OPTION = 'docs' |
20 | GIDOCGEN_MESON_ENABLE_FLAG = 'docgen' | 19 | GIDOCGEN_MESON_ENABLE_FLAG = 'enabled' |
21 | GIDOCGEN_MESON_DISABLE_FLAG = 'disabled' | 20 | GIDOCGEN_MESON_DISABLE_FLAG = 'disabled' |
21 | GIR_MESON_ENABLE_FLAG = 'enabled' | ||
22 | GIR_MESON_DISABLE_FLAG = 'disabled' | ||
22 | 23 | ||
23 | PACKAGECONFIG ??= "curl gnutls gudev gusb \ | 24 | PACKAGECONFIG ??= "curl gnutls gudev gusb \ |
24 | ${@bb.utils.filter('DISTRO_FEATURES', 'bluetooth polkit', d)} \ | 25 | ${@bb.utils.filter('DISTRO_FEATURES', 'bluetooth polkit', d)} \ |
25 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd offline', '', d)} \ | 26 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd offline', '', d)} \ |
26 | ${@bb.utils.contains('MACHINE_FEATURES', 'efi', 'plugin_uefi_capsule plugin_uefi_pk', '', d)} \ | 27 | ${@bb.utils.contains('MACHINE_FEATURES', 'efi', 'plugin_uefi_capsule plugin_uefi_pk', '', d)} \ |
27 | ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests plugin_dummy', '', d)} \ | 28 | ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ |
28 | hsi \ | 29 | hsi \ |
29 | plugin_android_boot \ | 30 | plugin_android_boot \ |
30 | plugin_acpi_phat \ | 31 | plugin_acpi_phat \ |
@@ -54,61 +55,59 @@ PACKAGECONFIG ??= "curl gnutls gudev gusb \ | |||
54 | plugin_upower \ | 55 | plugin_upower \ |
55 | sqlite" | 56 | sqlite" |
56 | 57 | ||
57 | PACKAGECONFIG[bluetooth] = "-Dbluez=true,-Dbluez=false" | 58 | PACKAGECONFIG[bluetooth] = "-Dbluez=enabled,-Dbluez=disabled" |
58 | PACKAGECONFIG[compat-cli] = "-Dcompat_cli=true,-Dcompat_cli=false" | 59 | PACKAGECONFIG[compat-cli] = "-Dcompat_cli=true,-Dcompat_cli=false" |
59 | PACKAGECONFIG[consolekit] = "-Dconsolekit=true,-Dconsolekit=false,consolekit" | 60 | PACKAGECONFIG[consolekit] = "-Dconsolekit=enabled,-Dconsolekit=disabled,consolekit" |
60 | PACKAGECONFIG[curl] = "-Dcurl=true,-Dcurl=false,curl" | 61 | PACKAGECONFIG[curl] = "-Dcurl=enabled,-Dcurl=disabled,curl" |
61 | PACKAGECONFIG[firmware-packager] = "-Dfirmware-packager=true,-Dfirmware-packager=false" | 62 | PACKAGECONFIG[firmware-packager] = "-Dfirmware-packager=true,-Dfirmware-packager=false" |
62 | PACKAGECONFIG[fish-completion] = "-Dfish_completion=true,-Dfish_completion=false" | 63 | PACKAGECONFIG[fish-completion] = "-Dfish_completion=true,-Dfish_completion=false" |
63 | PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" | 64 | PACKAGECONFIG[gnutls] = "-Dgnutls=enabled,-Dgnutls=disabled,gnutls" |
64 | PACKAGECONFIG[gudev] = "-Dgudev=true,-Dgudev=false,libgudev" | 65 | PACKAGECONFIG[gudev] = "-Dgudev=enabled,-Dgudev=disabled,libgudev" |
65 | PACKAGECONFIG[gusb] = "-Dgusb=true,-Dgusb=false,libgusb" | 66 | PACKAGECONFIG[gusb] = "-Dgusb=enabled,-Dgusb=disabled,libgusb" |
66 | PACKAGECONFIG[hsi] = "-Dhsi=true,-Dhsi=false" | 67 | PACKAGECONFIG[hsi] = "-Dhsi=enabled,-Dhsi=disabled" |
67 | PACKAGECONFIG[libarchive] = "-Dlibarchive=true,-Dlibarchive=false,libarchive" | 68 | PACKAGECONFIG[libarchive] = "-Dlibarchive=enabled,-Dlibarchive=disabled,libarchive" |
68 | PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false" | 69 | PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false" |
69 | PACKAGECONFIG[metainfo] = "-Dmetainfo=true,-Dmetainfo=false" | 70 | PACKAGECONFIG[metainfo] = "-Dmetainfo=true,-Dmetainfo=false" |
70 | PACKAGECONFIG[offline] = "-Doffline=true,-Doffline=false" | 71 | PACKAGECONFIG[offline] = "-Doffline=enabled,-Doffline=disabled" |
71 | PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false,polkit" | 72 | PACKAGECONFIG[polkit] = "-Dpolkit=enabled,-Dpolkit=disabled,polkit" |
72 | PACKAGECONFIG[sqlite] = "-Dsqlite=true,-Dsqlite=false,sqlite3" | 73 | PACKAGECONFIG[sqlite] = "-Dsqlite=enabled,-Dsqlite=disabled,sqlite3" |
73 | PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" | 74 | PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd" |
74 | PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,gcab-native" | 75 | PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,gcab-native" |
75 | 76 | ||
76 | 77 | ||
77 | # TODO plugins-all meta-option that expands to all plugin_*? | 78 | # TODO plugins-all meta-option that expands to all plugin_*? |
78 | PACKAGECONFIG[plugin_acpi_phat] = "-Dplugin_acpi_phat=true,-Dplugin_acpi_phat=false" | 79 | PACKAGECONFIG[plugin_acpi_phat] = "-Dplugin_acpi_phat=enabled,-Dplugin_acpi_phat=disabled" |
79 | PACKAGECONFIG[plugin_android_boot] = "-Dplugin_android_boot=enabled,-Dplugin_android_boot=disabled" | 80 | PACKAGECONFIG[plugin_android_boot] = "-Dplugin_android_boot=enabled,-Dplugin_android_boot=disabled" |
80 | PACKAGECONFIG[plugin_bcm57xx] = "-Dplugin_bcm57xx=true,-Dplugin_bcm57xx=false" | 81 | PACKAGECONFIG[plugin_bcm57xx] = "-Dplugin_bcm57xx=enabled,-Dplugin_bcm57xx=disabled" |
81 | PACKAGECONFIG[plugin_cfu] = "-Dplugin_cfu=true,-Dplugin_cfu=false" | 82 | PACKAGECONFIG[plugin_cfu] = "-Dplugin_cfu=enabled,-Dplugin_cfu=disabled" |
82 | PACKAGECONFIG[plugin_dell] = "-Dplugin_dell=true,-Dplugin_dell=false,libsmbios" | 83 | PACKAGECONFIG[plugin_emmc] = "-Dplugin_emmc=enabled,-Dplugin_emmc=disabled" |
83 | PACKAGECONFIG[plugin_dummy] = "-Dplugin_dummy=true,-Dplugin_dummy=false" | 84 | PACKAGECONFIG[plugin_ep963x] = "-Dplugin_ep963x=enabled,-Dplugin_ep963x=disabled" |
84 | PACKAGECONFIG[plugin_emmc] = "-Dplugin_emmc=true,-Dplugin_emmc=false" | 85 | PACKAGECONFIG[plugin_fastboot] = "-Dplugin_fastboot=enabled,-Dplugin_fastboot=disabled" |
85 | PACKAGECONFIG[plugin_ep963x] = "-Dplugin_ep963x=true,-Dplugin_ep963x=false" | 86 | PACKAGECONFIG[plugin_flashrom] = "-Dplugin_flashrom=enabled,-Dplugin_flashrom=disabled,flashrom" |
86 | PACKAGECONFIG[plugin_fastboot] = "-Dplugin_fastboot=true,-Dplugin_fastboot=false" | 87 | PACKAGECONFIG[plugin_gpio] = "-Dplugin_gpio=enabled,-Dplugin_gpio=disabled" |
87 | PACKAGECONFIG[plugin_flashrom] = "-Dplugin_flashrom=true,-Dplugin_flashrom=false,flashrom" | ||
88 | PACKAGECONFIG[plugin_gpio] = "-Dplugin_gpio=true,-Dplugin_gpio=false" | ||
89 | PACKAGECONFIG[plugin_igsc] = "-Dplugin_igsc=enabled,-Dplugin_igsc=disabled" | 88 | PACKAGECONFIG[plugin_igsc] = "-Dplugin_igsc=enabled,-Dplugin_igsc=disabled" |
90 | PACKAGECONFIG[plugin_intel_me] = "-Dplugin_intel_me=enabled,-Dplugin_intel_me=disabled" | 89 | PACKAGECONFIG[plugin_intel_me] = "-Dplugin_intel_me=enabled,-Dplugin_intel_me=disabled" |
91 | PACKAGECONFIG[plugin_intel_spi] = "-Dplugin_intel_spi=true -Dlzma=true,-Dplugin_intel_spi=false -Dlzma=false,xz" | 90 | PACKAGECONFIG[plugin_intel_spi] = "-Dplugin_intel_spi=true -Dlzma=enabled,-Dplugin_intel_spi=false -Dlzma=disabled,xz" |
92 | PACKAGECONFIG[plugin_logitech_bulkcontroller] = "-Dplugin_logitech_bulkcontroller=true,-Dplugin_logitech_bulkcontroller=false,protobuf-c-native protobuf-c" | 91 | PACKAGECONFIG[plugin_logitech_bulkcontroller] = "-Dplugin_logitech_bulkcontroller=enabled,-Dplugin_logitech_bulkcontroller=disabled,protobuf-c-native protobuf-c" |
93 | PACKAGECONFIG[plugin_logitech_scribe] = "-Dplugin_logitech_scribe=enabled,-Dplugin_logitech_scribe=disabled" | 92 | PACKAGECONFIG[plugin_logitech_scribe] = "-Dplugin_logitech_scribe=enabled,-Dplugin_logitech_scribe=disabled" |
94 | PACKAGECONFIG[plugin_modem_manager] = "-Dplugin_modem_manager=true,-Dplugin_modem_manager=false,libqmi modemmanager" | 93 | PACKAGECONFIG[plugin_modem_manager] = "-Dplugin_modem_manager=enabled,-Dplugin_modem_manager=disabled,libqmi modemmanager" |
95 | PACKAGECONFIG[plugin_msr] = "-Dplugin_msr=true,-Dplugin_msr=false,cpuid" | 94 | PACKAGECONFIG[plugin_msr] = "-Dplugin_msr=enabled,-Dplugin_msr=disabled,cpuid" |
96 | PACKAGECONFIG[plugin_nitrokey] = "-Dplugin_nitrokey=true,-Dplugin_nitrokey=false" | 95 | PACKAGECONFIG[plugin_nitrokey] = "-Dplugin_nitrokey=enabled,-Dplugin_nitrokey=disabled" |
97 | PACKAGECONFIG[plugin_nvme] = "-Dplugin_nvme=true,-Dplugin_nvme=false" | 96 | PACKAGECONFIG[plugin_nvme] = "-Dplugin_nvme=enabled,-Dplugin_nvme=disabled" |
98 | PACKAGECONFIG[plugin_parade_lspcon] = "-Dplugin_parade_lspcon=true,-Dplugin_parade_lspcon=false" | 97 | PACKAGECONFIG[plugin_parade_lspcon] = "-Dplugin_parade_lspcon=enabled,-Dplugin_parade_lspcon=disabled" |
99 | PACKAGECONFIG[plugin_pixart_rf] = "-Dplugin_pixart_rf=true,-Dplugin_pixart_rf=false" | 98 | PACKAGECONFIG[plugin_pixart_rf] = "-Dplugin_pixart_rf=enabled,-Dplugin_pixart_rf=disabled" |
100 | PACKAGECONFIG[plugin_powerd] = "-Dplugin_powerd=true,-Dplugin_powerd=false" | 99 | PACKAGECONFIG[plugin_powerd] = "-Dplugin_powerd=enabled,-Dplugin_powerd=disabled" |
101 | PACKAGECONFIG[plugin_realtek_mst] = "-Dplugin_realtek_mst=true,-Dplugin_realtek_mst=false" | 100 | PACKAGECONFIG[plugin_realtek_mst] = "-Dplugin_realtek_mst=enabled,-Dplugin_realtek_mst=disabled" |
102 | PACKAGECONFIG[plugin_redfish] = "-Dplugin_redfish=true,-Dplugin_redfish=false" | 101 | PACKAGECONFIG[plugin_redfish] = "-Dplugin_redfish=enabled,-Dplugin_redfish=disabled" |
103 | PACKAGECONFIG[plugin_scsi] = "-Dplugin_scsi=true,-Dplugin_scsi=false" | 102 | PACKAGECONFIG[plugin_scsi] = "-Dplugin_scsi=enabled,-Dplugin_scsi=disabled" |
104 | PACKAGECONFIG[plugin_synaptics_mst] = "-Dplugin_synaptics_mst=true,-Dplugin_synaptics_mst=false" | 103 | PACKAGECONFIG[plugin_synaptics_mst] = "-Dplugin_synaptics_mst=enabled,-Dplugin_synaptics_mst=disabled" |
105 | PACKAGECONFIG[plugin_synaptics_rmi] = "-Dplugin_synaptics_rmi=true,-Dplugin_synaptics_rmi=false" | 104 | PACKAGECONFIG[plugin_synaptics_rmi] = "-Dplugin_synaptics_rmi=enabled,-Dplugin_synaptics_rmi=disabled" |
106 | PACKAGECONFIG[plugin_tpm] = "-Dplugin_tpm=true,-Dplugin_tpm=false,tpm2-tss" | 105 | PACKAGECONFIG[plugin_tpm] = "-Dplugin_tpm=enabled,-Dplugin_tpm=disabled,tpm2-tss" |
107 | # Turn off the capsule splash as it needs G-I at buildtime, which isn't currently supported | 106 | # Turn off the capsule splash as it needs G-I at buildtime, which isn't currently supported |
108 | PACKAGECONFIG[plugin_uefi_capsule] = "-Dplugin_uefi_capsule=true -Dplugin_uefi_capsule_splash=false,-Dplugin_uefi_capsule=false,efivar fwupd-efi" | 107 | PACKAGECONFIG[plugin_uefi_capsule] = "-Dplugin_uefi_capsule=enabled -Dplugin_uefi_capsule_splash=disabled,-Dplugin_uefi_capsule=disabled,efivar fwupd-efi" |
109 | PACKAGECONFIG[plugin_uefi_pk] = "-Dplugin_uefi_pk=true,-Dplugin_uefi_pk=false" | 108 | PACKAGECONFIG[plugin_uefi_pk] = "-Dplugin_uefi_pk=enabled,-Dplugin_uefi_pk=disabled" |
110 | PACKAGECONFIG[plugin_uf2] = "-Dplugin_uf2=true,-Dplugin_uf2=false" | 109 | PACKAGECONFIG[plugin_uf2] = "-Dplugin_uf2=enabled,-Dplugin_uf2=disabled" |
111 | PACKAGECONFIG[plugin_upower] = "-Dplugin_upower=true,-Dplugin_upower=false" | 110 | PACKAGECONFIG[plugin_upower] = "-Dplugin_upower=enabled,-Dplugin_upower=disabled" |
112 | 111 | ||
113 | # Always disable these plugins on non-x86 platforms as they don't compile or are useless | 112 | # Always disable these plugins on non-x86 platforms as they don't compile or are useless |
114 | DISABLE_NON_X86 = "plugin_intel_me plugin_intel_spi plugin_msr" | 113 | DISABLE_NON_X86 = "plugin_intel_me plugin_intel_spi plugin_msr" |
@@ -130,6 +129,7 @@ do_install:append() { | |||
130 | FILES:${PN} += "${libdir}/fwupd-plugins-* \ | 129 | FILES:${PN} += "${libdir}/fwupd-plugins-* \ |
131 | ${libdir}/fwupd-${PV} \ | 130 | ${libdir}/fwupd-${PV} \ |
132 | ${systemd_unitdir} \ | 131 | ${systemd_unitdir} \ |
132 | ${nonarch_libdir}/sysusers.d/fwupd.conf \ | ||
133 | ${datadir}/fish \ | 133 | ${datadir}/fish \ |
134 | ${datadir}/metainfo \ | 134 | ${datadir}/metainfo \ |
135 | ${datadir}/icons \ | 135 | ${datadir}/icons \ |