diff --git a/_service b/_service
index a49f2b9..9819b90 100644
--- a/_service
+++ b/_service
@@ -4,7 +4,7 @@
git
@PARENT_TAG@
enable
- 1.5.8
+ 1.6.2
*.tar
diff --git a/_servicedata b/_servicedata
index 3fdc4a7..4903c88 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
https://github.com/hughsie/fwupd.git
- f9a8c3d6c6cd39ad6a421593d5203340fc59667f
\ No newline at end of file
+ 2f9eece2131754d9a46988fd0204a6751b06ce8d
diff --git a/fwupd-1.5.8.tar.xz b/fwupd-1.5.8.tar.xz
deleted file mode 100644
index 0fb11b6..0000000
--- a/fwupd-1.5.8.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:344ad01a19c10f43fd742bbd21aa7653d6807dcdcc3fae27851ae56953400367
-size 2919416
diff --git a/fwupd-1.6.2.tar.xz b/fwupd-1.6.2.tar.xz
new file mode 100644
index 0000000..3b414df
--- /dev/null
+++ b/fwupd-1.6.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b08d5496a0e86c9c7af8638f0583f6e7f74c4354f3e8b24b5217dae88d0bf6bf
+size 3030984
diff --git a/fwupd.changes b/fwupd.changes
index 77a60b1..a980de3 100644
--- a/fwupd.changes
+++ b/fwupd.changes
@@ -1,3 +1,60 @@
+-------------------------------------------------------------------
+Thu Oct 7 04:56:37 UTC 2021 - Joey Lee
+
+- Update to version 1.6.2
+ - The fwupd efi program be separated to fwupd-efi package.
+ - Removed pesign-obs-integration, moved needssslcertforbuild
+ , SBAT and EFI signing stuff to fwupd-efi.
+ - Moved libfwupdplugin1 to libfwupdplugin2
+- Change log from upstream:
+ https://github.com/fwupd/fwupd/blob/main/data/org.freedesktop.fwupd.metainfo.xml
+ - This release adds the following features:
+ * Add a plugin to check Lenovo firmware settings
+ * Add initial support for the powerd daemon
+ * Add support for CapsuleOnDisk
+ * Add support for installing UEFI updates from GRUB
+ * Add support for soft-requirements that can be ignored with --force
+ * Allow devices to only accept version upgrades
+ * Allow discovery of Redfish BMCs specified by VID-PID or MAC
+ * Allow the daemon to request interactive action from the end user
+ * Automatically connect the BMC network interface at startup
+ * Show the build timestamp if set on the device
+ * Show the user how to switch out of Wacom tablet Android-mode
+ - This release fixes the following bugs:
+ * Add the alternate vendor name into the 8BitDo allowlist
+ * Allow multiple devices to set WAIT_FOR_REPLUG
+ * Allow the client to watch for more property changes
+ * Always ensure the SuperIO version string is NUL terminated
+ * Automatically clear the update error as required
+ * Disable all UX capsules for Lenovo hardware
+ * Do not assume the metainfo file is NUL-terminated
+ * Do not save invalid files on LVFS server error
+ * Fix a VLI regression in enumerating the PD device
+ * Fix a VLI regression when installing VL820Q7 firmware
+ * Fix enumeration of the Synaptics Prometheus config child
+ * Fix parsing Redfish USB/PCI network VID/PIDs
+ * Fix the fwupdmgr progressbar spinner to actually work
+ * Fix version number for legacy Wacom Bluetooth modules
+ * Ignore virtual M.2 ATA devices
+ * Preserve NEEDS_REBOOT on successful update
+ * Prevent a corrupt PHAT table from allocating lots of memory
+ * Read the Redfish SMBIOS table when required
+ * Remove the vendor string from the device name where required
+ * Save the update state to the database correctly all of the time
+ * Switch from sysctl to ioctl for ESRT on FreeBSD
+ * Try reading from /sys/class/dmi if SMBIOS direct access fails
+ * Watch for children added or removed after setup has been completed
+ * Work around a XCC-ism on Lenovo hardware
+ - This release adds support for the following hardware:
+ * ModemManager devices supporting Firehose or MBIM QDU
+ * More models of RTS54HUB
+ * More Poly DFU devices
+ * Parade LSPCON
+ * PixArt receiver and wireless hardware
+ * Realtek MST with RTD2142
+ * SuperIO IT5570
+ * USB4 Dell dock
+
-------------------------------------------------------------------
Thu Apr 1 01:54:42 UTC 2021 - Gary Ching-Pang Lin
diff --git a/fwupd.spec b/fwupd.spec
index 27878e3..a783664 100644
--- a/fwupd.spec
+++ b/fwupd.spec
@@ -14,7 +14,6 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-# needssslcertforbuild
%ifarch %{ix86} x86_64 aarch64
@@ -23,6 +22,14 @@
%bcond_with efi_fw_update
%endif
+%ifarch %{ix86} x86_64
+%bcond_without msr_support
+%bcond_without dell_support
+%else
+%bcond_with msr_support
+%bcond_with dell_support
+%endif
+
%if 0%{?suse_version} > 1500
%bcond_without fish_support
%else
@@ -30,7 +37,7 @@
%endif
Name: fwupd
-Version: 1.5.8
+Version: 1.6.2
Release: 0
Summary: Device firmware updater daemon
License: GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -96,7 +103,6 @@ BuildRequires: pkgconfig(udev)
BuildRequires: pkgconfig(xmlb) >= 0.1.13
%if %{with efi_fw_update}
BuildRequires: gnu-efi
-BuildRequires: pesign-obs-integration
BuildRequires: pkgconfig(efiboot)
BuildRequires: pkgconfig(efivar) >= 33
%endif
@@ -107,7 +113,7 @@ BuildRequires: pkgconfig(libsmbios_c) >= 2.3.0
Obsoletes: dbxtool <= 8
Obsoletes: fwupdate <= 12
Provides: dbxtool
-%ifarch x86_64
+%ifarch x86_64 aarch64
Requires: shim >= 11
%endif
%endif
@@ -128,12 +134,12 @@ Requires: %{name} >= %{version}
fwupd is a daemon to allows session software to update device firmware on
the local machine.
-%package -n libfwupdplugin1
+%package -n libfwupdplugin2
Summary: Allow session software to update device firmware
Group: System/Libraries
Requires: %{name} >= %{version}
-%description -n libfwupdplugin1
+%description -n libfwupdplugin2
fwupd is a daemon to allows session software to update device firmware on
the local machine.
@@ -186,48 +192,45 @@ for file in $(grep -l %{_bindir}/env . -r); do
done
%build
-# Since Tumbleweed is still using openSUSE signkey, the SBAT distro id
-# should be opensuse.
-%if 0%{?sle_version}
-distro_id="sle"
-distro_name="SUSE Linux Enterprise"
-%else
-distro_id="opensuse"
-distro_name="The openSUSE project"
-%endif
-
# Dell support requires direct SMBIOS access,
# Synaptics requires Dell support, i.e. x86 only
%meson \
-%if %{without efi_fw_update}
- -Dplugin_nvme=false \
- -Dplugin_redfish=false \
+%if %{with efi_fw_update}
+ -Dplugin_uefi_capsule=true \
+ -Dplugin_uefi_pk=true \
+ -Defi_binary=false \
+%else
-Dplugin_uefi_capsule=false \
-Dplugin_uefi_pk=false \
+%endif
+%if %{with msr_support}
+ -Dplugin_msr=true \
%else
- -Defi_sbat_distro_id="${distro_id}" \
- -Defi_sbat_distro_summary="${distro_name}" \
- -Defi_sbat_distro_pkgname="%{name}" \
- -Defi_sbat_distro_version="%{version}" \
- -Defi_sbat_distro_url="https://build.opensuse.org" \
+ -Dplugin_msr=false \
+%endif
+%if %{with dell_support}
+ -Dplugin_dell=true \
+ -Dplugin_synaptics_mst=true \
+%else
+ -Dplugin_dell=false \
+ -Dplugin_synaptics_mst=false \
%endif
%ifnarch %{ix86} x86_64
-Dplugin_amt=false \
- -Dplugin_dell=false \
- -Dplugin_synaptics_mst=false \
-Dplugin_synaptics_rmi=false \
- -Dplugin_msr=false \
%endif
- -Dgtkdoc=true \
+ -Dplugin_nvme=false \
+ -Dplugin_redfish=false \
+ -Ddocs=gtkdoc \
-Dsupported_build=true \
- -Dtests=false
+ -Dtests=false \
%meson_build
%install
export BRP_PESIGN_FILES='%{_libexecdir}/fwupd/efi/fwupd*.efi'
%meson_install
# README.md is packaged as doc
-rm %{buildroot}%{_localstatedir}/lib/fwupd/builder/README.md
+rm %{buildroot}/usr/share/doc/fwupd/builder/README.md
# Add SUSE specific rcfoo service symlink
mkdir -p %{buildroot}%{_sbindir}
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
@@ -241,12 +244,6 @@ rm %{buildroot}%{_datadir}/polkit-1/rules.d/org.freedesktop.fwupd.rules
# do not package tests
rm -fr %{buildroot}%{_datadir}/installed-tests
-%if %{with efi_fw_update}
-# link fwupd*.efi.signed to fwupd*.efi (bsc#1129466)
-FWUPD_EFI=`basename %{buildroot}/%{_libexecdir}/fwupd/efi/fwupd*.efi`
-ln -s %{_libexecdir}/fwupd/efi/$FWUPD_EFI %{buildroot}/%{_libexecdir}/fwupd/efi/$FWUPD_EFI.signed
-%endif
-
%if %{without fish_support}
rm -fr %{buildroot}%{_datadir}/fish
%endif
@@ -254,8 +251,8 @@ rm -fr %{buildroot}%{_datadir}/fish
%post -n libfwupd2 -p /sbin/ldconfig
%postun -n libfwupd2 -p /sbin/ldconfig
-%post -n libfwupdplugin1 -p /sbin/ldconfig
-%postun -n libfwupdplugin1 -p /sbin/ldconfig
+%post -n libfwupdplugin2 -p /sbin/ldconfig
+%postun -n libfwupdplugin2 -p /sbin/ldconfig
%preun
%service_del_preun %{name}.service fwupd-offline-update.service fwupd-refresh.service
@@ -269,18 +266,6 @@ rm -fr %{buildroot}%{_datadir}/fish
%postun
%service_del_postun %{name}.service fwupd-offline-update.service fwupd-refresh.service
-%if %{with efi_fw_update}
-if [ -e /etc/os-release ]; then
- . /etc/os-release
- efi_distributor="$(echo "${NAME} ${VERSION}" | tr 'A-Z' 'a-z' | cut -d' ' -f1)"
-fi
-if [ "$1" = 0 ] && [ -d "/boot/efi/EFI/$efi_distributor" ]; then
- # Remove all capsule files
- rm -rf /boot/efi/EFI/"$efi_distributor"/fw
- # Remove the UEFI firmware update program
- rm -f /boot/efi/EFI/"$efi_distributor"/fwupd*.efi
-fi
-%endif
%files
@@ -293,15 +278,13 @@ fi
%{_unitdir}/fwupd-refresh.service
%{_unitdir}/fwupd-refresh.timer
%{_libexecdir}/fwupd
-%if %{with efi_fw_update}
-%{_bindir}/dbxtool
-%endif
%{_bindir}/fwupdagent
-%if %{with efi_fw_update}
-%{_bindir}/fwupdate
-%endif
%{_bindir}/fwupdmgr
%{_bindir}/fwupdtool
+%if %{with efi_fw_update}
+%{_bindir}/fwupdate
+%{_bindir}/dbxtool
+%endif
%{_sbindir}/rc%{name}
%{_sbindir}/rcfwupd-offline-update
%{_sbindir}/rcfwupd-refresh
@@ -314,7 +297,7 @@ fi
%dir %{_datadir}/%{name}/remotes.d
%dir %{_datadir}/%{name}/remotes.d/vendor
%dir %{_datadir}/%{name}/remotes.d/vendor/firmware
-%ifarch %{ix86} x86_64
+%if %{with dell_support}
%dir %{_datadir}/%{name}/remotes.d/dell-esrt
%{_datadir}/%{name}/remotes.d/dell-esrt/metadata.xml
%endif
@@ -322,21 +305,22 @@ fi
%{_datadir}/%{name}/firmware_packager.py
%{_datadir}/%{name}/install_dell_bios_exe.py
%{_datadir}/%{name}/simple_client.py
+%if %{with efi_fw_update}
+%{_datadir}/%{name}/uefi-capsule-ux.tar.xz
+%endif
%{_datadir}/%{name}/metainfo/org.freedesktop.fwupd.remotes.lvfs-testing.metainfo.xml
%{_datadir}/%{name}/metainfo/org.freedesktop.fwupd.remotes.lvfs.metainfo.xml
%{_datadir}/%{name}/quirks.d/*.quirk
%{_datadir}/%{name}/remotes.d/vendor/firmware/README.md
-%if %{with efi_fw_update}
-%{_mandir}/man1/dbxtool.1%{?ext_man}
-%endif
%{_mandir}/man1/fwupdagent.1%{?ext_man}
-%if %{with efi_fw_update}
-%{_mandir}/man1/fwupdate.1%{?ext_man}
-%endif
%{_mandir}/man1/fwupdmgr.1%{?ext_man}
%{_mandir}/man1/fwupdtool.1%{?ext_man}
+%if %{with efi_fw_update}
+%{_mandir}/man1/dbxtool.1%{?ext_man}
+%{_mandir}/man1/fwupdate.1%{?ext_man}
+%endif
%{_datadir}/polkit-1/actions/org.freedesktop.fwupd.policy
-%ifarch %{ix86} x86_64
+%if %{with msr_support}
%{_modulesloaddir}/fwupd-msr.conf
%endif
%config %{_sysconfdir}/%{name}/
@@ -349,11 +333,14 @@ fi
%{_sysconfdir}/pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service
%{_sysconfdir}/pki/fwupd/GPG-KEY-Linux-Foundation-Firmware
%{_sysconfdir}/pki/fwupd/LVFS-CA.pem
+%if %{with efi_fw_update}
+%dir %{_sysconfdir}/grub.d
+%{_sysconfdir}/grub.d/35_fwupd
+%endif
%{_udevrulesdir}/90-fwupd-devices.rules
%{_libdir}/fwupd-plugins-3/
%dir %{_datadir}/metainfo
%{_datadir}/metainfo/org.freedesktop.fwupd.metainfo.xml
-%dir %{_localstatedir}/lib/%{name}/
%{_datadir}/bash-completion/completions/fwupdmgr
%{_datadir}/bash-completion/completions/fwupdtool
%{_datadir}/bash-completion/completions/fwupdagent
@@ -363,9 +350,6 @@ fi
%{_datadir}/icons/hicolor/*
%{_prefix}/lib/systemd/system-shutdown/fwupd.shutdown
%{_prefix}/lib/systemd/system-preset/fwupd-refresh.preset
-%if %{with efi_fw_update}
-%{_datadir}/fwupd/uefi-capsule-ux.tar.xz
-%endif
%files -n dfu-tool
%{_bindir}/dfu-tool
@@ -378,7 +362,7 @@ fi
%files -n libfwupd2
%{_libdir}/libfwupd.so.*
-%files -n libfwupdplugin1
+%files -n libfwupdplugin2
%{_libdir}/libfwupdplugin.so.*
%files -n typelib-1_0-Fwupd-2_0
@@ -395,8 +379,6 @@ fi
%{_datadir}/gir-1.0/FwupdPlugin-1.0.gir
%{_datadir}/vala/vapi/fwupd.deps
%{_datadir}/vala/vapi/fwupd.vapi
-%{_datadir}/vala/vapi/fwupdplugin.deps
-%{_datadir}/vala/vapi/fwupdplugin.vapi
%{_includedir}/fwupd-1/
%{_libdir}/pkgconfig/fwupd.pc
%{_libdir}/pkgconfig/fwupdplugin.pc