colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #259376 from R-VdP/fwupd_1_9_6

Browse Source 
fwupd: 1.9.5 -> 1.9.6
This commit is contained in:
maxine 2023-10-09 02:17:58 +02:00 committed by GitHub
commit 35c640b19a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
View File

@ -1,5 +1,5 @@
diff --git a/data/bios-settings.d/meson.build b/data/bios-settings.d/meson.build
index b0ff5b10..13ac380d 100644
index b0ff5b106..13ac380d0 100644
--- a/data/bios-settings.d/meson.build
+++ b/data/bios-settings.d/meson.build
@@ -1,5 +1,5 @@
@ -10,7 +10,7 @@ index b0ff5b10..13ac380d 100644
)
endif
diff --git a/data/meson.build b/data/meson.build
index 8999ee57..b57174dc 100644
index e13da4adf..6858c240f 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -26,7 +26,7 @@ endif
@ -23,7 +23,7 @@ index 8999ee57..b57174dc 100644
)
plugin_quirks += files([
diff --git a/data/pki/meson.build b/data/pki/meson.build
index 3649fece..c3462744 100644
index 3649fecea..c3462744b 100644
--- a/data/pki/meson.build
+++ b/data/pki/meson.build
@@ -12,13 +12,13 @@ install_data([
@ -57,7 +57,7 @@ index 3649fece..c3462744 100644
)
endif
diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build
index c20a1a05..5354bac7 100644
index c20a1a05e..5354bac7f 100644
--- a/data/remotes.d/meson.build
+++ b/data/remotes.d/meson.build
@@ -15,14 +15,14 @@ if build_standalone and get_option('lvfs') != 'false'
@ -93,10 +93,10 @@ index c20a1a05..5354bac7 100644
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
)
diff --git a/meson.build b/meson.build
index fa7a5599..5b53a407 100644
index ca6ccdf92..0a3097d90 100644
--- a/meson.build
+++ b/meson.build
@@ -191,6 +191,12 @@ endif
@@ -195,6 +195,12 @@ endif
mandir = join_paths(prefix, get_option('mandir'))
localedir = join_paths(prefix, get_option('localedir'))
@ -107,32 +107,24 @@ index fa7a5599..5b53a407 100644
+endif
+
diffcmd = find_program('diff')
gio = dependency('gio-2.0', version: '>= 2.45.8')
giounix = dependency('gio-unix-2.0', version: '>= 2.45.8', required: false)
gio = dependency('gio-2.0', version: '>= 2.68.0')
giounix = dependency('gio-unix-2.0', version: '>= 2.68.0', required: false)
diff --git a/meson_options.txt b/meson_options.txt
index 81d373f8..d214cf64 100644
index 877891126..986d0ee31 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,4 @@
+option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation')
option('build', type : 'combo', choices : ['all', 'standalone', 'library'], value : 'all', description : 'build type')
option('consolekit', type : 'feature', description : 'ConsoleKit support', deprecated: {'true': 'enabled', 'false': 'disabled'})
option('static_analysis', type : 'boolean', value : false, description : 'enable GCC static analysis support')
diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build
index 88c039f8..62a7691f 100644
--- a/plugins/dell-esrt/meson.build
+++ b/plugins/dell-esrt/meson.build
@@ -27,6 +27,6 @@ configure_file(
output: 'dell-esrt.conf',
configuration: con2,
install: true,
- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
)
endif
@@ -1,3 +1,8 @@
+option('sysconfdir_install',
+ type: 'string',
+ value: '',
+ description: 'sysconfdir to use during installation'
+)
option('build',
type: 'combo',
choices: [
diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build
index f4657a6a..28ca0653 100644
index eb196c21e..c9a29f680 100644
--- a/plugins/uefi-capsule/meson.build
+++ b/plugins/uefi-capsule/meson.build
@@ -20,7 +20,7 @@ if host_machine.system() == 'linux'
@ -144,5 +136,3 @@ index f4657a6a..28ca0653 100644
)
elif host_machine.system() == 'freebsd'
backend_srcs += 'fu-uefi-backend-freebsd.c'
--
2.40.1

7
pkgs/os-specific/linux/firmware/fwupd/default.nix
View File

@ -124,7 +124,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "fwupd";
version = "1.9.5";
version = "1.9.6";
# libfwupd goes to lib
# daemon, plug-ins and libfwupdplugin go to out
@ -135,7 +135,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "fwupd";
repo = "fwupd";
rev = finalAttrs.version;
hash = "sha256-dqbFgVgG2RQM5ZHIEIIJOmrjtwlaRXEyY+2OdDs4PGo=";
hash = "sha256-9mA6gETnOmmkI+cdF0kP1moPV6DDvASq1JXarupM/tU=";
};
patches = [
@ -213,6 +213,7 @@ stdenv.mkDerivation (finalAttrs: {
"-Dplugin_dummy=true"
# We are building the official releases.
"-Dsupported_build=enabled"
"-Dlaunchd=disabled"
"-Dudevdir=lib/udev"
"-Dsystemd_root_prefix=${placeholder "out"}"
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
@ -350,8 +351,6 @@ stdenv.mkDerivation (finalAttrs: {
"pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service"
"pki/fwupd-metadata/LVFS-CA.pem"
"grub.d/35_fwupd"
] ++ lib.optionals haveDell [
"fwupd/remotes.d/dell-esrt.conf"
];
# DisabledPlugins key in fwupd/daemon.conf

31
pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch
View File

@ -1,8 +1,8 @@
diff --git a/data/installed-tests/meson.build b/data/installed-tests/meson.build
index be3d5c6d9..14d45dcaf 100644
index dfce86b1c..5e34c4fa6 100644
--- a/data/installed-tests/meson.build
+++ b/data/installed-tests/meson.build
@@ -83,5 +83,5 @@ configure_file(
@@ -86,5 +86,5 @@ configure_file(
output: 'fwupd-tests.conf',
configuration: con2,
install: true,
@ -10,10 +10,10 @@ index be3d5c6d9..14d45dcaf 100644
+ install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'),
)
diff --git a/meson.build b/meson.build
index 30011f548..7ac8c937a 100644
index ca6ccdf92..36b1b47b0 100644
--- a/meson.build
+++ b/meson.build
@@ -186,8 +186,8 @@ else
@@ -188,8 +188,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 30011f548..7ac8c937a 100644
daemon_dir = join_paths(libexecdir, 'fwupd')
endif
mandir = join_paths(prefix, get_option('mandir'))
@@ -498,6 +498,7 @@ gnome = import('gnome')
@@ -497,6 +497,7 @@ gnome = import('gnome')
i18n = import('i18n')
conf.set_quoted('FWUPD_PREFIX', prefix)
@ -33,14 +33,17 @@ index 30011f548..7ac8c937a 100644
conf.set_quoted('FWUPD_LIBDIR', libdir)
conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir)
diff --git a/meson_options.txt b/meson_options.txt
index 6fc7e8437..29832fd08 100644
index 877891126..bfc5d1afd 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -57,6 +57,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 : '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('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'})
@@ -452,6 +452,10 @@ option('elogind',
'false': 'disabled',
},
)
+option('installed_test_prefix',
+ type: 'string',
+ description: 'Prefix for installed tests'
+)
option('tests',
type: 'boolean',
value: true,