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

fwupd: 1.3.9 → 1.4.0

Browse Source 
https://github.com/fwupd/fwupd/releases/tag/1.4.0
This commit is contained in:
Jan Tojnar
2020-04-18 19:51:08 +02:00
parent 1fade973fc
commit 06e5800a73
3 changed files with 110 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch
+16 -11
View File
@@ -1,5 +1,5 @@
--- a/data/installed-tests/hardware.py
+++ b/data/installed-tests/hardware.py
--- a/data/device-tests/hardware.py
+++ b/data/device-tests/hardware.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!@installedTestsPython@/bin/python3
@@ -8,18 +8,23 @@
# Copyright (C) 2017 Richard Hughes <richard@hughsie.com>
--- a/data/installed-tests/meson.build
+++ b/data/installed-tests/meson.build
@@ -1,6 +1,6 @@
con2 = configuration_data()
con2.set('installedtestsdir',
- join_paths(datadir, 'installed-tests', 'fwupd'))
+ join_paths('@installedTests@', 'share', 'installed-tests', 'fwupd'))
con2.set('bindir', bindir)
@@ -1,4 +1,4 @@
-installed_test_datadir = join_paths(datadir, 'installed-tests', 'fwupd')
+installed_test_datadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', 'fwupd')
configure_file(
@@ -52,5 +52,5 @@
con2 = configuration_data()
con2.set('installedtestsdir', installed_test_datadir)
@@ -52,5 +52,5 @@ configure_file(
output : 'fwupd-tests.conf',
configuration : con2,
install: true,
- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
+ install_dir: join_paths('@installedTests@', 'etc', 'fwupd', 'remotes.d'),
+ install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'),
)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,4 @@
+option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests')
option('build', type : 'combo', choices : ['all', 'standalone', 'library'], value : 'all', description : 'build type')
option('agent', type : 'boolean', value : true, description : 'enable the fwupd agent')
option('consolekit', type : 'boolean', value : true, description : 'enable ConsoleKit support')