Date: Sunday, March 4, 2018 @ 17:07:10
Author: archange
Revision: 302439
Add patch for allowing different ESP mount point
As well as a previous commit required to patch.
Added:
fwupd/trunk/capsule-changes.patch
fwupd/trunk/config-esp-path.patch
Modified:
fwupd/trunk/PKGBUILD
---+
PKGBUILD | 18 ++-
capsule-changes.patch | 135 ++
config-esp-path.patch | 242
3 files changed, 390 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-03-04 16:22:40 UTC (rev 302438)
+++ PKGBUILD2018-03-04 17:07:10 UTC (rev 302439)
@@ -4,7 +4,7 @@
pkgname=fwupd
pkgver=1.0.5
-pkgrel=1
+pkgrel=2
pkgdesc='A simple daemon to allow session software to update firmware'
arch=('x86_64')
url='https://github.com/hughsie/fwupd'
@@ -13,14 +13,22 @@
makedepends=('meson' 'valgrind' 'gtk-doc' 'help2man' 'python-pillow'
'gobject-introspection'
'python-cairo' 'ttf-dejavu' 'adobe-source-han-sans-cn-fonts'
'python-gobject')
checkdepends=('umockdev')
-source=(${pkgname}-${pkgver}.tar.gz::"${url}/archive/${pkgver}.tar.gz")
-sha256sums=('236289aab278fc6611e0a425f7a186895d6755cfdbfd9f182c7bd4bb7fee0324')
+source=(${pkgname}-${pkgver}.tar.gz::"${url}/archive/${pkgver}.tar.gz"
+'capsule-changes.patch'
+'config-esp-path.patch')
+sha256sums=('236289aab278fc6611e0a425f7a186895d6755cfdbfd9f182c7bd4bb7fee0324'
+'5361c6cfc2b7d0cb9a161b7082b780ba30b468347b6489dd32a83e7a376716ac'
+'541b7d31eee9fc9386ad451bf92bb17f400216183bd76c554e7628c7006e90ba')
+prepare() {
+cd ${pkgname}-${pkgver}
+patch -p1 -i ../capsule-changes.patch
+patch -p1 -i ../config-esp-path.patch
+}
+
build() {
cd ${pkgname}-${pkgver}
-
arch-meson -D b_lto=false ../build
-
ninja -v -C ../build
}
Added: capsule-changes.patch
===
--- capsule-changes.patch (rev 0)
+++ capsule-changes.patch 2018-03-04 17:07:10 UTC (rev 302439)
@@ -0,0 +1,135 @@
+From 02c469052f56dc088705484cbb9f0b788df23b08 Mon Sep 17 00:00:00 2001
+From: Mario Limonciello
+Date: Mon, 19 Feb 2018 13:11:27 -0600
+Subject: [PATCH] uefi: Report if UX capsule was supported in the report
+ metadata
+
+---
+ plugins/uefi/fu-plugin-uefi.c | 47 +++
+ 1 file changed, 21 insertions(+), 26 deletions(-)
+
+diff --git a/plugins/uefi/fu-plugin-uefi.c b/plugins/uefi/fu-plugin-uefi.c
+index 1f59a99c..87950d7c 100644
+--- a/plugins/uefi/fu-plugin-uefi.c
b/plugins/uefi/fu-plugin-uefi.c
+@@ -29,6 +29,10 @@
+ #include "fu-plugin.h"
+ #include "fu-plugin-vfuncs.h"
+
++struct FuPluginData {
++ gbooleanux_capsule;
++};
++
+ /* drop when upgrading minimum required version of efivar to 33 */
+ #if !defined (efi_guid_ux_capsule)
+ #define efi_guid_ux_capsule
EFI_GUID(0x3b8c8162,0x188c,0x46a4,0xaec9,0xbe,0x43,0xf1,0xd6,0x56,0x97)
+@@ -37,6 +41,8 @@
+ void
+ fu_plugin_init (FuPlugin *plugin)
+ {
++ FuPluginData *data = fu_plugin_alloc_data (plugin, sizeof
(FuPluginData));
++ data->ux_capsule = FALSE;
+ fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_RUN_AFTER, "upower");
+ fu_plugin_add_report_metadata (plugin, "FwupdateVersion",
LIBFWUP_LIBRARY_VERSION);
+ fu_plugin_add_report_metadata (plugin, "EfivarVersion",
EFIVAR_LIBRARY_VERSION);
+@@ -89,22 +95,6 @@ fu_plugin_uefi_find (fwup_resource_iter *iter, const gchar
*guid_str, GError **e
+ return re_matched;
+ }
+
+-static fwup_resource *
+-fu_plugin_uefi_find_raw (fwup_resource_iter *iter, efi_guid_t *guid)
+-{
+- fwup_resource *re_matched = NULL;
+- fwup_resource *re = NULL;
+- while (fwup_resource_iter_next (iter, ) > 0) {
+- efi_guid_t *guid_tmp;
+- fwup_get_guid (re, _tmp);
+- if (efi_guid_cmp (guid_tmp, guid) == 0) {
+- re_matched = re;
+- break;
+- }
+- }
+- return re_matched;
+-}
+-
+ static void
+ _fwup_resource_iter_free (fwup_resource_iter *iter)
+ {
+@@ -317,12 +307,6 @@ fu_plugin_uefi_update_splash (GError **error)
+ { 0, 0 }
+ };
+
+- /* is this supported? */
+- fwup_resource_iter_create ();
+- re = fu_plugin_uefi_find_raw (iter, _guid_ux_capsule);
+- if (re == NULL)
+- return TRUE;
+-
+ /* get the boot graphics resource table data */
+ #ifdef HAVE_FWUP_GET_BGRT_INFO
+ rc = fwup_get_ux_capsule_info (_width, _height);
+@@ -381,6 +365,7 @@ fu_plugin_update (FuPlugin *plugin,
+ FwupdInstallFlags flags,
+ GError **error)
+ {
++ FuPluginData *data = fu_plugin_get_data (plugin);
+ fwup_resource *re = NULL;
+ guint64 hardware_instance = 0; /*
