trivial: Sync the flatpak manifest with the one from flathub

contrib/org.freedesktop.fwupd.json

@@ -5,7 +5,6 @@
   "branch": "master",
   "sdk": "org.gnome.Sdk",
   "command": "/app/libexec/fwupd/fwupdtool",
-    "tags": [],
   "finish-args": [
     "--device=all",
     "--filesystem=/boot",
@@ -15,7 +14,7 @@
     "--system-talk-name=org.freedesktop.fwupd",
     "--system-talk-name=org.freedesktop.UPower"
   ],
-    "build-options" : {
+  "build-options": {
       "cflags": "-O2 -g",
       "cxxflags": "-O2 -g"
   },
@@ -31,7 +30,8 @@
     "/share/gtk-doc",
     "/share/info",
     "/share/man",
-        "/share/pkgconfig" ],
+    "/share/pkgconfig"
+  ],
   "modules": [
     {
       /* not using shared-modules as we need gudev */
@@ -81,9 +81,11 @@
     {
       "name": "gusb",
       "buildsystem": "meson",
-            "config-opts": ["-Ddocs=false",
+      "config-opts": [
+        "-Ddocs=false",
         "-Dvapi=false",
-                            "-Dtests=false"],
+        "-Dtests=false"
+      ],
       "cleanup": [
         "/bin/gusbcmd"
       ],
@@ -98,7 +100,10 @@
     {
       "name": "efivar",
       "buildsystem": "simple",
-            "build-commands": ["make prefix=/app libdir=/app/lib", "make install prefix=/app libdir=/app/lib"],
+      "build-commands": [
+        "make prefix=/app libdir=/app/lib",
+        "make install prefix=/app libdir=/app/lib"
+      ],
       "cleanup": [
           "/bin/efivar"
       ],
@@ -112,9 +117,14 @@
     },
     {
       "name": "libsmbios_c",
-            "config-opts": ["--disable-doxygen",
+      "only-arches": [
+        "x86_64"
+      ],
+      "config-opts": [
+        "--disable-doxygen",
         "--disable-graphviz",
-                            "--disable-python"],
+        "--disable-python"
+      ],
       "cleanup": [
         "/sbin/smbios*",
         "/share/locale/*/LC_MESSAGES/libsmbios.mo"
@@ -129,8 +139,16 @@
     },
     {
       "name": "gnu-efi",
+      "only-arches": [
+        "aarch64",
+        "x86_64"
+      ],
       "buildsystem": "simple",
-            "build-commands": ["make", "make PREFIX=/app install"],
+      "build-commands": [
+        "make",
+        "make PREFIX=/app install"
+      ],
+      "no-autogen": true,
       "cleanup": [
         "/bin/efivar"
       ],
@@ -143,45 +161,49 @@
       ]
     },
     {
-            "name": "python-pillow",
+      "name": "python3-olefile",
-            "no-autogen": true,
+      "only-arches": [
-            "ensure-writable": ["/lib/python*/site-packages/easy-install.pth"],
+        "aarch64",
+        "x86_64"
+      ],
+      "buildsystem": "simple",
+      "build-commands": [
+        "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} olefile"
+      ],
       "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://pypi.python.org/packages/93/73/66854f63b1941aad9af18a1de59f9cf95ad1a87c801540222e332f6688d7/Pillow-4.1.1.tar.gz",
-                    "sha256": "00b6a5f28d00f720235a937ebc2f50f4292a5c7e2d6ab9a8b26153b625c4f431"
-                },
         {
           "type": "file",
-                    "path": "flatpak/pip-Makefile",
-                    "dest-filename": "Makefile"
-                }
-            ],
-            "modules": [
-                {
-                    "name": "python-olefile",
-                    "no-autogen": true,
-                    "ensure-writable": ["/lib/python*/site-packages/easy-install.pth"],
-                    "sources": [
-                        {
-                            "type": "archive",
           "url": "https://pypi.python.org/packages/35/17/c15d41d5a8f8b98cc3df25eb00c5cee76193114c78e5674df6ef4ac92647/olefile-0.44.zip",
           "sha256": "61f2ca0cd0aa77279eb943c07f607438edf374096b66332fae1ee64a6f0f73ad"
-                        },
-                        {
-                            "type": "file",
-                            "path": "flatpak/pip-Makefile",
-                            "dest-filename": "Makefile"
         }
       ]
+    },
+    {
+      "name": "python3-pillow",
+      "only-arches": [
+        "aarch64",
+        "x86_64"
+      ],
+      "buildsystem": "simple",
+      "build-commands": [
+        "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} Pillow"
+      ],
+      "cleanup": [
+        "/bin/*.py"
+      ],
+      "sources": [
+        {
+          "type": "file",
+          "url": "https://pypi.python.org/packages/93/73/66854f63b1941aad9af18a1de59f9cf95ad1a87c801540222e332f6688d7/Pillow-4.1.1.tar.gz",
+          "sha256": "00b6a5f28d00f720235a937ebc2f50f4292a5c7e2d6ab9a8b26153b625c4f431"
         }
       ]
     },
     {
       "name": "fwupd",
       "buildsystem": "meson",
-            "config-opts": ["-Dconsolekit=false",
+      "config-opts": [
+        "-Dconsolekit=false",
         "-Ddaemon=false",
         "-Dgpg=false",
         "-Dgtkdoc=false",
@@ -194,7 +216,29 @@
         "-Defi-ldsdir=/app/lib",
         "-Defi-libdir=/app/lib",
         "--sysconfdir=/app/etc",
-                            "--localstatedir=/var/data"],
+        "--localstatedir=/var/data"
+      ],
+      "build-options" : {
+        "arch": {
+            "i386": {
+                "config-opts": [
+                  "-Dplugin_dell=false",
+                  "-Dplugin_uefi=false"
+                ]
+            },
+            "arm": {
+                "config-opts": [
+                  "-Dplugin_dell=false",
+                  "-Dplugin_uefi=false"
+                ]
+            },
+            "aarch64": {
+                "config-opts": [
+                  "-Dplugin_dell=false"
+                ]
+            }
+        }
+      },
       "cleanup": [
         "/etc/dbus-1/system.d/org.freedesktop.fwupd.conf",
         "/share/fwupd/remotes.d/vendor"