[gnome-build-meta/valentindavid/more-updates: 8/10] fwupd: Update to 1.6.0

[Valentin David <valentindavid src gnome org>]

commit d8d25b12d60efcad201a182e942c68be4a4014ac
Author: Valentin David <valentin david codethink co uk>
Date:   Tue Apr 27 16:50:27 2021 +0200

    fwupd: Update to 1.6.0

 elements/core-deps/fwupd-efi.bst | 12 ++++++++++++
 elements/core-deps/fwupd.bst     | 27 +++++++++++++++++++--------
 2 files changed, 31 insertions(+), 8 deletions(-)
---
diff --git a/elements/core-deps/fwupd-efi.bst b/elements/core-deps/fwupd-efi.bst
new file mode 100644
index 00000000..f14efb39
--- /dev/null
+++ b/elements/core-deps/fwupd-efi.bst
@@ -0,0 +1,12 @@
+kind: meson
+
+sources:
+- kind: tar
+  url: github_com:fwupd/fwupd-efi/archive/1.0.tar.gz
+
+build-depends:
+- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
+
+depends:
+- freedesktop-sdk.bst:components/gnu-efi.bst
+- freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core-deps/fwupd.bst b/elements/core-deps/fwupd.bst
index 964e15a8..54047aeb 100644
--- a/elements/core-deps/fwupd.bst
+++ b/elements/core-deps/fwupd.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: github_com:fwupd/fwupd/archive/1.4.4.tar.gz
+  url: github_com:fwupd/fwupd/archive/1.6.0.tar.gz
 
 build-depends:
 - sdk/gobject-introspection.bst
@@ -34,12 +34,23 @@ depends:
 - freedesktop-sdk.bst:components/python3-pil.bst
 - freedesktop-sdk.bst:components/tpm2-tss.bst
 
+(?):
+- arch in ["arm", "aarch64", "x86_64", "i686"]:
+    depends:
+      (>):
+      - core-deps/fwupd-efi.bst
+
 variables:
+  meson-local: >-
+    -Dplugin_msr=%{msr}
+    -Dplugin_dell=%{dell}
+    -Dplugin_uefi=%{uefi}
+  msr: "false" # MSR is only for Intel processors
+  dell: "false"
+  uefi: "true"
   (?):
-  - arch in ["arm", "aarch64"]:
-      meson-local: >-
-        -Dplugin_dell=false
-  - arch == "ppc64le":
-      meson-local: >-
-        -Dplugin_dell=false
-        -Dplugin_uefi=false
+  - arch in ["x86_64", "i686"]:
+      dell: "true"
+      msr: "true"
+  - arch in ["ppc64le"]:
+      uefi: "false"