fwupd: 1.7.7 → 1.8.0
https://github.com/fwupd/fwupd/releases/tag/1.8.0
https://blogs.gnome.org/hughsie/2022/04/28/fwupd-1-8-0-and-50-million-updates/
- Switch to feature type for meson configure flags.
- flashrom program has not actually been used for a while now, it was replaced by libflashrom:
13fd21d806
This commit is contained in:
parent
9c0429536d
commit
74c8b62411
@ -3,7 +3,6 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, gtk-doc
|
||||
, pkg-config
|
||||
@ -54,6 +53,8 @@
|
||||
, modemmanager
|
||||
, libqmi
|
||||
, libmbim
|
||||
, libcbor
|
||||
, xz
|
||||
}:
|
||||
|
||||
let
|
||||
@ -116,7 +117,7 @@ let
|
||||
|
||||
self = stdenv.mkDerivation rec {
|
||||
pname = "fwupd";
|
||||
version = "1.7.7";
|
||||
version = "1.8.0";
|
||||
|
||||
# libfwupd goes to lib
|
||||
# daemon, plug-ins and libfwupdplugin go to out
|
||||
@ -125,7 +126,7 @@ let
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
|
||||
sha256 = "sha256-QUmU06zfZ0qQ9wotoW2k4XalrRH+Y25qs/DhpJ4GKWk=";
|
||||
sha256 = "LAliLnOSowtORQQ0M4z2cNQzKMLyE/RsX//xAWifrps=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -140,13 +141,6 @@ let
|
||||
# they are not really part of the library.
|
||||
./install-fwupdplugin-to-out.patch
|
||||
|
||||
# Fix detection of installed tests
|
||||
# https://github.com/fwupd/fwupd/issues/3880
|
||||
(fetchpatch {
|
||||
url = "https://github.com/fwupd/fwupd/commit/5bc546221331feae9cedc1892219a25d8837955f.patch";
|
||||
sha256 = "XcLhcDrB2/MFCXjKAyhftQgvJG4BBkp07geM9eK3q1g=";
|
||||
})
|
||||
|
||||
# Installed tests are installed to different output
|
||||
# we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle.
|
||||
./installed-tests-path.patch
|
||||
@ -197,16 +191,20 @@ let
|
||||
protobufc
|
||||
modemmanager
|
||||
libmbim
|
||||
libcbor
|
||||
libqmi
|
||||
xz # for liblzma.
|
||||
] ++ lib.optionals haveDell [
|
||||
libsmbios
|
||||
] ++ lib.optionals haveFlashrom [
|
||||
flashrom
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Ddocs=gtkdoc"
|
||||
"-Dplugin_dummy=true"
|
||||
# We are building the official releases.
|
||||
"-Dsupported_build=true"
|
||||
"-Dsupported_build=enabled"
|
||||
# Would dlopen libsoup to preserve compatibility with clients linking against older fwupd.
|
||||
# https://github.com/fwupd/fwupd/commit/173d389fa59d8db152a5b9da7cc1171586639c97
|
||||
"-Dsoup_session_compat=false"
|
||||
@ -217,7 +215,7 @@ let
|
||||
"--sysconfdir=/etc"
|
||||
"-Dsysconfdir_install=${placeholder "out"}/etc"
|
||||
"-Defi_os_dir=nixos"
|
||||
"-Dplugin_modem_manager=true"
|
||||
"-Dplugin_modem_manager=enabled"
|
||||
|
||||
# We do not want to place the daemon into lib (cyclic reference)
|
||||
"--libexecdir=${placeholder "out"}/libexec"
|
||||
@ -225,14 +223,14 @@ let
|
||||
# against libfwupdplugin which is in $out/lib.
|
||||
"-Dc_link_args=-Wl,-rpath,${placeholder "out"}/lib"
|
||||
] ++ lib.optionals (!haveDell) [
|
||||
"-Dplugin_dell=false"
|
||||
"-Dplugin_synaptics_mst=false"
|
||||
"-Dplugin_dell=disabled"
|
||||
"-Dplugin_synaptics_mst=disabled"
|
||||
] ++ lib.optionals (!haveRedfish) [
|
||||
"-Dplugin_redfish=false"
|
||||
] ++ lib.optionals haveFlashrom [
|
||||
"-Dplugin_flashrom=true"
|
||||
"-Dplugin_redfish=disabled"
|
||||
] ++ lib.optionals (!haveFlashrom) [
|
||||
"-Dplugin_flashrom=disabled"
|
||||
] ++ lib.optionals (!haveMSR) [
|
||||
"-Dplugin_msr=false"
|
||||
"-Dplugin_msr=disabled"
|
||||
];
|
||||
|
||||
# TODO: wrapGAppsHook wraps efi capsule even though it is not ELF
|
||||
@ -291,7 +289,7 @@ let
|
||||
efibootmgr
|
||||
bubblewrap
|
||||
tpm2-tools
|
||||
] ++ lib.optional haveFlashrom flashrom;
|
||||
];
|
||||
in ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
|
||||
|
@ -10,10 +10,10 @@ index b8ec916f0..38209b363 100644
|
||||
+ install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'),
|
||||
)
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 32fe6e408..b35d741e0 100644
|
||||
index d8bd9fdc7..ff924d373 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -183,8 +183,8 @@ else
|
||||
@@ -187,8 +187,8 @@ else
|
||||
datadir = join_paths(prefix, get_option('datadir'))
|
||||
sysconfdir = join_paths(prefix, get_option('sysconfdir'))
|
||||
localstatedir = join_paths(prefix, get_option('localstatedir'))
|
||||
@ -24,7 +24,7 @@ index 32fe6e408..b35d741e0 100644
|
||||
endif
|
||||
mandir = join_paths(prefix, get_option('mandir'))
|
||||
localedir = join_paths(prefix, get_option('localedir'))
|
||||
@@ -484,6 +484,7 @@ gnome = import('gnome')
|
||||
@@ -487,6 +487,7 @@ gnome = import('gnome')
|
||||
i18n = import('i18n')
|
||||
|
||||
conf.set_quoted('FWUPD_PREFIX', prefix)
|
||||
@ -33,19 +33,19 @@ index 32fe6e408..b35d741e0 100644
|
||||
conf.set_quoted('FWUPD_LIBDIR', libdir)
|
||||
conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir)
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index 0a0e2853..5f68d78b 100644
|
||||
index d00038dbc..be1c45b40 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -25,6 +26,7 @@ option('plugin_coreboot', type : 'boolean', value : true, description : 'enable
|
||||
option('systemd', type : 'boolean', value : true, description : 'enable systemd support')
|
||||
@@ -56,6 +56,7 @@ option('systemd', type : 'feature', description : 'systemd support', deprecated:
|
||||
option('systemd_unit_user', type : 'string', description : 'User account to use for fwupd-refresh.service (empty for DynamicUser)')
|
||||
option('systemd_root_prefix', type: 'string', value: '', description: 'Directory to base systemd’s installation directories on')
|
||||
option('elogind', type : 'boolean', value : false, description : 'enable elogind support')
|
||||
option('elogind', type : 'feature', description : 'elogind support', deprecated: {'true': 'enabled', 'false': 'disabled'})
|
||||
+option('installed_test_prefix', type: 'string', description: 'Prefix for installed tests')
|
||||
option('tests', type : 'boolean', value : true, description : 'enable tests')
|
||||
option('tpm', type : 'boolean', value : true, description : 'enable TPM support')
|
||||
option('udevdir', type: 'string', value: '', description: 'Directory for udev rules')
|
||||
option('soup_session_compat', type : 'boolean', value : true, description : 'enable SoupSession runtime compatibility support')
|
||||
option('curl', type : 'feature', description : 'libcurl support', deprecated: {'true': 'enabled', 'false': 'disabled'})
|
||||
diff --git a/plugins/redfish/fu-self-test.c b/plugins/redfish/fu-self-test.c
|
||||
index c507fabc8..0cddc3248 100644
|
||||
index 4d19e560f..91cfaa616 100644
|
||||
--- a/plugins/redfish/fu-self-test.c
|
||||
+++ b/plugins/redfish/fu-self-test.c
|
||||
@@ -27,7 +27,7 @@ fu_test_is_installed_test(void)
|
||||
|
Loading…
Reference in New Issue
Block a user