.gear/fwupd.spec | 563 +++++++++++++++++++++ .gear/fwupd.watch | 6 + .gear/rules | 4 + .../tags/15e9a09c9cfe94fc90674a81733ef1f3c59f1765 | 17 + .gear/tags/list | 1 + .gear/upstream/remotes | 3 + meson.build | 2 +- plugins/uefi-capsule/fu-uefi-common.c | 2 +- plugins/uefi-capsule/fwupd.grub.conf.in | 5 +- 9 files changed, 599 insertions(+), 4 deletions(-) diff --git a/.gear/fwupd.spec b/.gear/fwupd.spec new file mode 100644 index 000000000..41bf73662 --- /dev/null +++ b/.gear/fwupd.spec @@ -0,0 +1,563 @@ +%define _unpackaged_files_terminate_build 1 +%define _libexecdir %_prefix/libexec + +# 1.9.3: test suite fails on ppc64le +%ifarch ppc64le +%def_without check +%endif + +%def_enable tests +%def_enable dummy +%def_enable flashrom + +# fwupdate is only available on these arches +%ifarch x86_64 aarch64 +%def_enable uefi +%def_enable gpio +%endif + +%ifarch x86_64 %ix86 +%def_enable msr +%endif + +# libsmbios is only available on x86, and fwupdate is available on just x86_64 +%ifarch x86_64 +%def_enable dell +%endif + +%define fwupd_pluginsdir %_libdir/fwupd-%version + +Summary: Firmware update daemon +Name: fwupd +Version: 1.9.4 +Release: alt1 +License: LGPL-2.1+ +Group: System/Configuration/Hardware +Url: https://github.com/fwupd/fwupd + +Source0: %name-%version.tar +Source2: fwupd.watch +Patch0: %name-%version-alt.patch + +BuildRequires: bash-completion +BuildRequires: cmake +BuildRequires: gcab +BuildRequires: rpm-build-python3 +BuildRequires: git-core +BuildRequires: gi-docgen +BuildRequires: libappstream-glib-devel +BuildRequires: libmm-glib-devel +BuildRequires: libqmi-glib-devel +BuildRequires: libmbim-glib-devel +BuildRequires: libprotobuf-c-devel +BuildRequires: /usr/bin/protoc /usr/bin/protoc-gen-c +BuildRequires: libarchive-devel +BuildRequires: libcolord-devel +BuildRequires: liblzma-devel +BuildRequires: libcbor-devel +BuildRequires: libcurl-devel +BuildRequires: libelf-devel +BuildRequires: libgcab-devel +BuildRequires: libgnutls-devel +BuildRequires: libgpgme-devel +BuildRequires: libgudev-devel +BuildRequires: libgusb-gir-devel +BuildRequires: libjcat-devel >= 0.1.10 +BuildRequires: libpango-devel +BuildRequires: libpolkit-devel +%if_enabled dell +BuildRequires: libsmbios-devel +%endif +%if_enabled flashrom +BUildRequires: libflashrom-devel +%endif +BuildRequires: libsoup-devel +BuildRequires: libsqlite3-devel +BuildRequires: libsystemd-devel +BuildRequires: libtpm2-tss-devel +BuildRequires: libudev-devel +BuildRequires: libumockdev-devel +BuildRequires: libuuid-devel +BuildRequires: libxmlb-devel +BuildRequires: meson +BuildRequires: python3-module-Pillow +BuildRequires: python3-module-pycairo +BuildRequires: python3-module-pygobject3 +BuildRequires: vala-tools +BuildRequires: /proc + +%if_enabled uefi +BuildRequires: libpango-devel +BuildRequires: libcairo-devel libcairo-gobject-devel +BuildRequires: libfreetype-devel +BuildRequires: fontconfig +BuildRequires: fonts-ttf-dejavu +BuildRequires: gnu-efi +Requires: gcab +Requires: fwupd-efi +Provides: fwupdate +Obsoletes: fwupdate +%endif + +%if_enabled tests +BuildRequires: rpm-build-vm /dev/kvm +%endif + +Requires: bubblewrap +Requires: libgusb >= 0.3.5 + +Obsoletes: fwupd-labels <= %EVR + +%description +fwupd is a daemon to allow session software to update device firmware. + +%package devel +Summary: Development package for %name +Group: Development/C +Requires: %name = %EVR + +%description devel +Files for development with %name. + +%package tests +Group: System/Configuration/Hardware +Summary: Data files for installed tests + +%description tests +Data files for installed tests. + +%package plugin-modem-manager +Group: System/Configuration/Hardware +Summary: fwupd plugin using ModemManger +Requires: %name = %EVR + +%description plugin-modem-manager +This provides the optional package which is only required on hardware that +might have mobile broadband hardware. It is probably not required on servers. + +%prep +%setup +%patch0 -p1 + +# 1.8.8: 'lenovo-thinklmi-self-test' fails on aarch64 with: +# "Failed to load SMBIOS: neither SMBIOS or DT found" +# due to missing /sys/class/dmi/id in qemu-system-aarch64 +%ifarch aarch64 +sed -i -e "/get_option('tests')/ s/$/ and false/" \ + plugins/lenovo-thinklmi/meson.build +%endif + +%build +%meson \ + -Ddocs=enabled \ + --debug \ + -Dfirmware-packager=true \ + -Dman=true \ + -Dlvfs=true \ + -Dsupported_build=enabled \ +%if_enabled flashrom + -Dplugin_flashrom=enabled \ +%else + -Dplugin_flashrom=disabled \ +%endif +%if_enabled msr + -Dplugin_msr=enabled \ +%else + -Dplugin_msr=disabled \ +%endif +%if_enabled tests + -Dtests=true \ +%else + -Dtests=false \ +%endif +%if_enabled dummy + -Dplugin_dummy=true \ +%else + -Dplugin_dummy=false \ +%endif +%if_enabled gpio + -Dplugin_gpio=enabled \ +%else + -Dplugin_gpio=disabled \ +%endif +%if_enabled uefi + -Dplugin_uefi_capsule=enabled \ + -Dplugin_uefi_pk=enabled \ + -Defi_binary=false \ +%else + -Dplugin_redfish=enabled \ + -Dplugin_uefi_capsule=disabled \ + -Dplugin_uefi_pk=disabled \ + -Dplugin_nvme=enabled \ +%endif +%if_enabled dell + -Dplugin_dell=enabled \ + -Dplugin_synaptics_mst=enabled \ +%else + -Dplugin_dell=disabled \ + -Dplugin_synaptics_mst=disabled \ +%endif + -Dplugin_modem_manager=enabled \ +# + +%__meson_build + +%install +%__meson_install + +# CET is available only since i686 +%ifarch i386 i486 i586 +rm -f %buildroot%_libexecdir/fwupd/fwupd-detect-cet ||: +%endif + +mkdir -p --mode=0700 %buildroot%_localstatedir/fwupd/gnupg +mv %buildroot%_docdir/fwupd %buildroot%_docdir/fwupd-devel-%version +rm -f %buildroot%_docdir/%name-devel-%version/lib* +mv %buildroot%_docdir/libfw* %buildroot%_docdir/fwupd-devel-%version/ + +%find_lang %name + +%if_enabled tests +%check +vm-run --sbin --udevd --kvm=cond --overlay=ext4,30M:/usr/src \ + %__meson_test +%endif + +%files -f %name.lang +%doc README.md COPYING +%_man1dir/fwupdtool.1* +%_man1dir/fwupdmgr.1* +%_man1dir/dbxtool.1* +%_man5dir/* +%_man8dir/* +%config(noreplace)%_sysconfdir/fwupd/fwupd.conf +%dir %_libexecdir/fwupd +%dir %_iconsdir/hicolor/scalable/apps +%_libexecdir/fwupd/fwupd +%_bindir/fwupdtool +%_libexecdir/fwupd/fwupdoffline +%ifarch x86_64 +%_libexecdir/fwupd/fwupd-detect-cet +%endif +%_datadir/bash-completion/completions/* +%_datadir/fish/vendor_completions.d/fwupdmgr.fish +%_iconsdir/hicolor/scalable/apps/org.freedesktop.fwupd.svg +%_bindir/dbxtool +%_bindir/fwupdmgr +%dir %_sysconfdir/fwupd +%dir %_sysconfdir/fwupd/remotes.d +%_sysconfdir/fwupd/bios-settings.d +%config(noreplace)%_sysconfdir/fwupd/remotes.d/*.conf +%if_enabled tests +%exclude %_sysconfdir/fwupd/remotes.d/fwupd-tests.conf +%endif +%_sysconfdir/pki/fwupd +%_sysconfdir/pki/fwupd-metadata +%dir %_datadir/fwupd +%dir %_datadir/fwupd/metainfo +%dir %_datadir/fwupd/remotes.d +%dir %_datadir/fwupd/remotes.d/vendor +%_datadir/dbus-1/system.d/org.freedesktop.fwupd.conf +%ifarch x86_64 +%dir %_datadir/fwupd/remotes.d/dell-esrt +%_datadir/fwupd/remotes.d/dell-esrt/metadata.xml +%endif +%_datadir/fwupd/remotes.d/vendor/firmware +%_datadir/dbus-1/interfaces/org.freedesktop.fwupd.xml +%_datadir/polkit-1/actions/org.freedesktop.fwupd.policy +%_datadir/polkit-1/rules.d/org.freedesktop.fwupd.rules +%_datadir/dbus-1/system-services/org.freedesktop.fwupd.service +%_datadir/metainfo/org.freedesktop.fwupd.metainfo.xml +%_datadir/fwupd/metainfo/org.freedesktop.fwupd.remotes.lvfs-testing.metainfo.xml +%_datadir/fwupd/metainfo/org.freedesktop.fwupd.remotes.lvfs.metainfo.xml +%_datadir/fwupd/firmware_packager.py +%_datadir/fwupd/add_capsule_header.py +%_datadir/fwupd/install_dell_bios_exe.py +%_datadir/fwupd/simple_client.py +%_presetdir/fwupd-refresh.preset +%_unitdir/fwupd-offline-update.service +%_unitdir/fwupd.service +%_unitdir/fwupd-refresh.timer +%_unitdir/fwupd-refresh.service +%_unitdir/system-update.target.wants/ +/lib/systemd/system-shutdown/fwupd.shutdown +%dir %_localstatedir/fwupd +%dir %_datadir/fwupd/quirks.d +%_datadir/fwupd/quirks.d/builtin.quirk.gz +%_libdir/libfwupd*.so.* +%_libdir/girepository-1.0/Fwupd-2.0.typelib +/lib/udev/rules.d/*.rules +%dir %fwupd_pluginsdir +%fwupd_pluginsdir/libfwupd*.so +%if_enabled flashrom +%fwupd_pluginsdir/libfu_plugin_flashrom.so +%endif +%if_enabled msr +%_modulesloaddir/fwupd-msr.conf +%endif +%if_enabled uefi +%config(noreplace)%_sysconfdir/grub.d/35_fwupd +%_datadir/fwupd/uefi-capsule-ux.tar.xz +%endif + +%ghost %_localstatedir/fwupd/gnupg + +%files plugin-modem-manager +%fwupd_pluginsdir/libfu_plugin_modem_manager.so + +%files devel +%_datadir/gir-1.0/Fwupd-2.0.gir +%_docdir/fwupd-devel-%version +%_includedir/fwupd-1 +%_libdir/libfwupd*.so +%_libdir/pkgconfig/fwupd.pc +%_datadir/vala/vapi/* + +%files tests +%if_enabled tests +%_datadir/fwupd/host-emulate.d/*.json.gz +%dir %_datadir/installed-tests/fwupd +%dir %_datadir/installed-tests/fwupd/tests +%if_enabled uefi +%_datadir/installed-tests/fwupd/efi +%endif +%_datadir/installed-tests/fwupd/tests/* +%_datadir/installed-tests/fwupd/fwupd-tests.xml +%_datadir/installed-tests/fwupd/*.test +%_datadir/installed-tests/fwupd/*.zip +%_datadir/installed-tests/fwupd/*.cab +%_datadir/installed-tests/fwupd/*.sh +%_datadir/installed-tests/fwupd/chassis_type +%_datadir/installed-tests/fwupd/sys_vendor +%_datadir/fwupd/device-tests/*.json +%_libexecdir/installed-tests/fwupd +%dir %_sysconfdir/fwupd/remotes.d +%config(noreplace)%_sysconfdir/fwupd/remotes.d/fwupd-tests.conf +%endif + +%changelog +* Tue Aug 22 2023 Egor Ignatov 1.9.4-alt1 +- 1.9.3 -> 1.9.4 + +* Fri Jul 14 2023 Egor Ignatov 1.9.3-alt1 +- 1.9.2 -> 1.9.3 + +* Tue Jun 13 2023 Egor Ignatov 1.9.2-alt1 +- 1.9.1 -> 1.9.2 + +* Fri May 19 2023 Egor Ignatov 1.9.1-alt1 +- 1.8.14 -> 1.9.1 + +* Fri Mar 31 2023 Egor Ignatov 1.8.14-alt1 +- New version 1.8.14. + +* Mon Feb 27 2023 Egor Ignatov 1.8.12-alt1 +- 1.8.10 -> 1.8.12 + +* Tue Jan 31 2023 Egor Ignatov 1.8.10-alt1 +- 1.8.9 -> 1.8.10 + +* Tue Jan 03 2023 Egor Ignatov 1.8.9-alt1 +- 1.8.8 -> 1.8.9 + +* Fri Dec 16 2022 Egor Ignatov 1.8.8-alt1 +- 1.8.7 -> 1.8.8 +- enable tests for all architectures +- start tests with vm-run only if uefi enabled +- aarch64: disable 'lenovo-thinklmi-self-test' + +* Wed Nov 23 2022 Egor Ignatov 1.8.7-alt1 +- 1.8.5 -> 1.8.7 +- run tests in qemu (vm-run) +- clean up spec + +* Sun Sep 25 2022 Anton Farygin 1.8.5-alt1 +- 1.8.4 -> 1.8.5 + +* Mon Sep 19 2022 Anton Farygin 1.8.4-alt1 +- 1.8.1 -> 1.8.4 + +* Sat Jun 04 2022 Anton Farygin 1.8.1-alt1 +- 1.8.0 -> 1.8.1 + +* Thu May 12 2022 Anton Farygin 1.8.0-alt1 +- 1.7.7 -> 1.8.0 + +* Mon Apr 11 2022 Anton Farygin 1.7.7-alt1 +- 1.7.6 -> 1.7.7 + +* Mon Mar 28 2022 Anton Farygin 1.7.6-alt1 +- 1.7.5 -> 1.7.6 + +* Sat Feb 19 2022 Anton Farygin 1.7.5-alt1 +- 1.7.5 +- switched to use /usr/libexec for libexecdir instead of /usr/lib + +* Thu Jan 27 2022 Ivan A. Melnikov 1.7.4-alt2 +- enable build with flashrom on all architectures + +* Wed Jan 26 2022 Anton Farygin 1.7.4-alt1 +- 1.7.3 -> 1.7.4 + +* Fri Dec 24 2021 Anton Farygin 1.7.3-alt1 +- 1.7.2 -> 1.7.3 + +* Thu Dec 02 2021 Nikolai Kostrigin 1.7.2-alt3 +- improve package backportability by unconditionally not packing + of fwupd-detect-cet on ix86 at all + +* Thu Dec 02 2021 Nikolai Kostrigin 1.7.2-alt2 +- remove unused BR: gi-docgen causing extensive dependencies on python modules +- update minimal required version of libgusb to 0.3.5 + +* Mon Nov 22 2021 Anton Farygin 1.7.2-alt1 +- 1.7.2 + +* Mon Nov 15 2021 Anton Farygin 1.7.1-alt1 +- 1.7.1 +- built with flashrom support +- removed labels subpackage +- enabled redfish and nvme plugins for all architectures +- removed ExclusiveArch - try build it for e2k + +* Wed Jun 23 2021 Egor Ignatov 1.6.1-alt1 +- 1.6.1 +- cleanup spec +- enable man pages + +* Thu Apr 15 2021 Anton Farygin 1.5.9-alt1 +- 1.5.9 + +* Fri Apr 09 2021 Nikolai Kostrigin 1.5.8-alt2 +- add ALT release information to SBAT section + +* Thu Mar 25 2021 Anton Farygin 1.5.8-alt1 +- 1.5.8 + +* Tue Mar 09 2021 Anton Farygin 1.5.7-alt1 +- 1.5.7 + +* Fri Feb 19 2021 Anton Farygin 1.5.6-alt1 +- 1.5.6 + +* Thu Feb 04 2021 Nikita Ermakov 1.5.5-alt2 +- Added riscv64 to ExclusiveArch tag +- Removed extra libefivar-devel BR + +* Wed Jan 13 2021 Anton Farygin 1.5.5-alt1 +- 1.5.5 + +* Thu Dec 24 2020 Anton Farygin 1.5.4-alt1 +- 1.5.4 + +* Wed Nov 25 2020 Anton Farygin 1.5.2-alt1 +- 1.5.2 +- cleanup build requires + +* Mon Nov 09 2020 Anton Farygin 1.5.1-alt1 +- 1.5.1 + +* Tue Sep 15 2020 Anton Farygin 1.4.6-alt1 +- 1.4.6 + +* Wed Aug 05 2020 Anton Farygin 1.4.5-alt1 +- 1.4.5 +- the package with tests became architecture-dependent due to the arm platform + +* Sat Jun 13 2020 Anton Farygin 1.4.4-alt1 +- 1.4.4 + +* Thu May 21 2020 Anton Farygin 1.4.2-alt1 +- 1.4.2 + +* Mon Mar 30 2020 Anton Farygin 1.3.9-alt2 +- 1.3.9 + +* Thu Mar 26 2020 Gleb F-Malinovskiy 1.3.8-alt2 +- Rebuilt with libgusb 0.3.4 due to broken symbol versioning + of g_usb_version_string function. +- Added explicit libgusb >= 0.3.4 dependency. + +* Wed Feb 19 2020 Anton Farygin 1.3.8-alt1 +- 1.3.8 + +* Sun Feb 02 2020 Anton Farygin 1.3.7-alt1 +- 1.3.7 + +* Fri Jan 10 2020 Anton Farygin 1.3.6-alt1 +- 1.3.6 + +* Fri Dec 27 2019 Anton Farygin 1.3.5-alt2 +- added gcab to requires list (used in firmware_packager.py) + +* Mon Dec 02 2019 Anton Farygin 1.3.5-alt1 +- 1.3.5 + +* Mon Nov 25 2019 Anton Farygin 1.3.4-alt1 +- 1.3.4 + +* Tue Nov 19 2019 Anton Farygin 1.3.3-alt2 +- fixed work with EFI secure boot (closes: #37486) + +* Thu Nov 07 2019 Anton Farygin 1.3.3-alt1 +- 1.3.3 +- enabled tests + +* Mon Sep 30 2019 Anton Farygin 1.3.2-alt1 +- 1.3.2 + +* Mon Sep 16 2019 Anton Farygin 1.3.1-alt1 +- 1.3.1 + +* Tue Jul 30 2019 Anton Farygin 1.2.10-alt1 +- 1.2.10 + +* Mon Jul 15 2019 Gleb F-Malinovskiy 1.2.9-alt2 +- Added ppc64le to ExclusiveArch tag. + +* Fri May 24 2019 Anton Farygin 1.2.9-alt1 +- 1.2.9 + +* Thu Apr 25 2019 Anton Farygin 1.2.8-alt1 +- 1.2.8 + +* Tue Apr 16 2019 Anton Farygin 1.2.7-alt1 +- 1.2.7 + +* Mon Apr 01 2019 Anton Farygin 1.2.6-alt1 +- 1.2.6 + +* Wed Mar 06 2019 Anton Farygin 1.2.5-alt1 +- 1.2.5 + +* Mon Feb 11 2019 Anton Farygin 1.2.4-alt1 +- 1.2.4 + +* Mon Jan 07 2019 Anton Farygin 1.2.3-alt1 +- 1.2.3 + +* Mon Dec 03 2018 Anton Farygin 1.2.1-alt1 +- 1.2.1 + +* Mon Nov 12 2018 Anton Farygin 1.2.0-alt1 +- 1.2.0 + +* Wed Oct 17 2018 Anton Farygin 1.1.3-alt1 +- 1.1.3 + +* Mon Sep 03 2018 Anton Farygin 1.1.1-alt1 +- 1.1.1 + +* Tue Jul 31 2018 Anton Farygin 1.1.0-alt1 +- 1.1.0 + +* Fri May 04 2018 Anton Farygin 1.0.7-alt1 +- 1.0.7 + +* Thu Mar 22 2018 Anton Farygin 1.0.6-alt1 +- new version +- temporarily disabled check section due to impossible testing of the thunderbolt interface in the hasher environment + +* Wed Mar 07 2018 Anton Farygin 1.0.5-alt1 +- first build for ALT, based on RH spec + diff --git a/.gear/fwupd.watch b/.gear/fwupd.watch new file mode 100644 index 000000000..4d77e5279 --- /dev/null +++ b/.gear/fwupd.watch @@ -0,0 +1,6 @@ +# You can run the "uscan" command to check for upstream updates and more. +# See uscan(1) for format + +version=3 +opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/fwupd-$1\.tar\.gz/ \ +https://github.com/hughsie/fwupd/tags .*/v?(\d\S*)\.tar\.gz diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 000000000..83bb9da1f --- /dev/null +++ b/.gear/rules @@ -0,0 +1,4 @@ +spec: .gear/fwupd.spec +diff: @version@:. . name=@name@-@version@-alt.patch +tar: @version@:. +copy: .gear/fwupd.watch diff --git a/.gear/tags/15e9a09c9cfe94fc90674a81733ef1f3c59f1765 b/.gear/tags/15e9a09c9cfe94fc90674a81733ef1f3c59f1765 new file mode 100644 index 000000000..6e935b1ed --- /dev/null +++ b/.gear/tags/15e9a09c9cfe94fc90674a81733ef1f3c59f1765 @@ -0,0 +1,17 @@ +object fa85a87ddc14a254b0e7b79d72e123a58b8057af +type commit +tag 1.9.4 +tagger Richard Hughes 1692699647 +0100 + +Release fwupd 1.9.4 +-----BEGIN PGP SIGNATURE----- + +iQFIBAABCAAyFiEEFj61ARkiXbPfj0nqF6y6jfqXDhcFAmTki/8UHHJpY2hhcmRA +aHVnaHNpZS5jb20ACgkQF6y6jfqXDhcCmggAtXy5Odeh9fHJIOPl/ontzlVrf28n +K1+ExSOQ+v7w8UsLk47s7o1Hmoz35AgcAtO0+p/EdLfNZgX+S1lNCR+2VqvDYMb2 +b3p4BMYpwgPumlFN0l93enn6r9DjxSoD0XSJtZZIZnwNue49kypg4tQ+KLl2CNCw +MdRBcNIqIfZtk+c5b9poyNUmtTcyzr0rUxciY2vBCSqxK6tChrgBokX6UcQoKQLM +f23J1bXw/rKqMHzhmFCCkeSr7cCbwn0GNRzWy5IAzDUp3/hTuLgzQzeBSiPc0AAn +O4uMRE/LlVJk1LWf16d/0VLUlIxYiYmPZurnCHkQKA9a5iDmfpJAfpytqQ== +=/UZY +-----END PGP SIGNATURE----- diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 000000000..894a3f786 --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +15e9a09c9cfe94fc90674a81733ef1f3c59f1765 1.9.4 diff --git a/.gear/upstream/remotes b/.gear/upstream/remotes new file mode 100644 index 000000000..04f1b80ee --- /dev/null +++ b/.gear/upstream/remotes @@ -0,0 +1,3 @@ +[remote "upstream"] + url = https://github.com/fwupd/fwupd + fetch = +refs/heads/*:refs/remotes/upstream/* diff --git a/meson.build b/meson.build index ded8d97fc..fce772905 100644 --- a/meson.build +++ b/meson.build @@ -412,7 +412,7 @@ endif # EFI if build_standalone - efi_app_location = join_paths(libexecdir, 'fwupd', 'efi') + efi_app_location = join_paths(libdir, 'efi') conf.set_quoted('EFI_APP_LOCATION', efi_app_location) if host_cpu == 'x86' EFI_MACHINE_TYPE_NAME = 'ia32' diff --git a/plugins/uefi-capsule/fu-uefi-common.c b/plugins/uefi-capsule/fu-uefi-common.c index b1da5100a..2233fd0b2 100644 --- a/plugins/uefi-capsule/fu-uefi-common.c +++ b/plugins/uefi-capsule/fu-uefi-common.c @@ -96,7 +96,7 @@ fu_uefi_get_built_app_path(const gchar *binary, GError **error) prefix = fu_path_from_kind(FU_PATH_KIND_EFIAPPDIR); source_path = g_strdup_printf("%s/%s%s.efi", prefix, binary, suffix); - source_path_signed = g_strdup_printf("%s.signed", source_path); + source_path_signed = g_strdup_printf("%s", source_path); source_path_exists = g_file_test(source_path, G_FILE_TEST_EXISTS); source_path_signed_exists = g_file_test(source_path_signed, G_FILE_TEST_EXISTS); diff --git a/plugins/uefi-capsule/fwupd.grub.conf.in b/plugins/uefi-capsule/fwupd.grub.conf.in index 6d17fc3cc..52583447c 100755 --- a/plugins/uefi-capsule/fwupd.grub.conf.in +++ b/plugins/uefi-capsule/fwupd.grub.conf.in @@ -5,10 +5,11 @@ set -e [ -d ${pkgdatadir:?} ] # shellcheck source=/dev/null . "$pkgdatadir/grub-mkconfig_lib" +GRUB_UEFI_CAPSULE_CONF="@localstatedir@/lib/fwupd/uefi_capsule.conf" -if [ -f @localstatedir@/lib/fwupd/uefi_capsule.conf ] && +if [ -f "${GRUB_UEFI_CAPSULE_CONF}" ] && ls /sys/firmware/efi/efivars/fwupd-*-0abba7dc-e516-4167-bbf5-4d9d1c739416 1>/dev/null 2>&1; then - . @localstatedir@/lib/fwupd/uefi_capsule.conf + source "{$GRUB_UEFI_CAPSULE_CONF}" if [ "${EFI_PATH}" != "" ] && [ "${ESP}" != "" ]; then echo "Adding Linux Firmware Updater entry" >&2 cat << EOF