mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-11-06 02:06:46 +01:00
f633bf64e9
* use C.UTF-8 instead of en_US * refresh sysconfdir_install patch * extend to vendor-directory.conf * update sysconfdir_install patch * update file listing
153 lines
5.3 KiB
Diff
153 lines
5.3 KiB
Diff
diff --git a/data/meson.build b/data/meson.build
|
|
index 61664cd6..f10abbba 100644
|
|
--- a/data/meson.build
|
|
+++ b/data/meson.build
|
|
@@ -11,7 +11,7 @@ if get_option('daemon')
|
|
endif
|
|
|
|
install_data(['daemon.conf'],
|
|
- install_dir : join_paths(sysconfdir, 'fwupd')
|
|
+ install_dir : join_paths(sysconfdir_install, 'fwupd')
|
|
)
|
|
|
|
install_data(['org.freedesktop.fwupd.metainfo.xml'],
|
|
@@ -23,7 +23,7 @@ install_data(['org.freedesktop.fwupd.svg'],
|
|
)
|
|
|
|
install_data(['org.freedesktop.fwupd.conf'],
|
|
- install_dir : join_paths(sysconfdir, 'dbus-1', 'system.d')
|
|
+ install_dir : join_paths(sysconfdir_install, 'dbus-1', 'system.d')
|
|
)
|
|
|
|
if get_option('daemon')
|
|
diff --git a/data/pki/meson.build b/data/pki/meson.build
|
|
index eefcc914..dc801fa1 100644
|
|
--- a/data/pki/meson.build
|
|
+++ b/data/pki/meson.build
|
|
@@ -4,14 +4,14 @@ if get_option('gpg')
|
|
'GPG-KEY-Linux-Foundation-Firmware',
|
|
'GPG-KEY-Linux-Vendor-Firmware-Service',
|
|
],
|
|
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd')
|
|
+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd')
|
|
)
|
|
|
|
install_data([
|
|
'GPG-KEY-Linux-Foundation-Metadata',
|
|
'GPG-KEY-Linux-Vendor-Firmware-Service',
|
|
],
|
|
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
|
|
+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata')
|
|
)
|
|
endif
|
|
|
|
@@ -19,12 +19,12 @@ if get_option('pkcs7')
|
|
install_data([
|
|
'LVFS-CA.pem',
|
|
],
|
|
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd')
|
|
+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd')
|
|
)
|
|
install_data([
|
|
'LVFS-CA.pem',
|
|
],
|
|
- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata')
|
|
+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata')
|
|
)
|
|
endif
|
|
|
|
diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build
|
|
index a27c31ef..374e09b6 100644
|
|
--- a/data/remotes.d/meson.build
|
|
+++ b/data/remotes.d/meson.build
|
|
@@ -3,7 +3,7 @@ if get_option('daemon') and get_option('lvfs')
|
|
'lvfs.conf',
|
|
'lvfs-testing.conf',
|
|
],
|
|
- install_dir : join_paths(sysconfdir, 'fwupd', 'remotes.d')
|
|
+ install_dir : join_paths(sysconfdir_install, 'fwupd', 'remotes.d')
|
|
)
|
|
i18n.merge_file(
|
|
input: 'lvfs.metainfo.xml',
|
|
@@ -37,12 +37,12 @@ configure_file(
|
|
output : 'vendor.conf',
|
|
configuration : con2,
|
|
install: true,
|
|
- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
|
|
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
|
|
)
|
|
configure_file(
|
|
input : 'vendor-directory.conf',
|
|
output : 'vendor-directory.conf',
|
|
configuration : con2,
|
|
install: true,
|
|
- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'),
|
|
+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'),
|
|
)
|
|
diff --git a/meson.build b/meson.build
|
|
index a89f9b3f..736896eb 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -145,6 +145,12 @@ localstatedir = join_paths(prefix, get_option('localstatedir'))
|
|
mandir = join_paths(prefix, get_option('mandir'))
|
|
localedir = join_paths(prefix, get_option('localedir'))
|
|
|
|
+if get_option('sysconfdir_install') != ''
|
|
+ sysconfdir_install = join_paths(prefix, get_option('sysconfdir_install'))
|
|
+else
|
|
+ sysconfdir_install = sysconfdir
|
|
+endif
|
|
+
|
|
gio = dependency('gio-2.0', version : '>= 2.45.8')
|
|
if gio.version().version_compare ('>= 2.55.0')
|
|
conf.set('HAVE_GIO_2_55_0', '1')
|
|
diff --git a/meson_options.txt b/meson_options.txt
|
|
index 5d4163e8..db81fd1f 100644
|
|
--- a/meson_options.txt
|
|
+++ b/meson_options.txt
|
|
@@ -21,6 +21,7 @@ option('plugin_modem_manager', type : 'boolean', value : false, description : 'e
|
|
option('systemd', type : 'boolean', value : true, description : 'enable systemd support')
|
|
option('systemdunitdir', type: 'string', value: '', description: 'Directory for systemd units')
|
|
option('elogind', type : 'boolean', value : false, description : 'enable elogind support')
|
|
+option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation')
|
|
option('tests', type : 'boolean', value : true, description : 'enable tests')
|
|
option('udevdir', type: 'string', value: '', description: 'Directory for udev rules')
|
|
option('efi-cc', type : 'string', value : 'gcc', description : 'the compiler to use for EFI modules')
|
|
diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build
|
|
index cb9f4555..b972d7fb 100644
|
|
--- a/plugins/dell-esrt/meson.build
|
|
+++ b/plugins/dell-esrt/meson.build
|
|
@@ -36,5 +36,5 @@ 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'),
|
|
)
|
|
diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build
|
|
index 5c88504e..7706da71 100644
|
|
--- a/plugins/redfish/meson.build
|
|
+++ b/plugins/redfish/meson.build
|
|
@@ -26,7 +26,7 @@ shared_module('fu_plugin_redfish',
|
|
)
|
|
|
|
install_data(['redfish.conf'],
|
|
- install_dir: join_paths(sysconfdir, 'fwupd')
|
|
+ install_dir: join_paths(sysconfdir_install, 'fwupd')
|
|
)
|
|
|
|
if get_option('tests')
|
|
diff --git a/plugins/uefi/meson.build b/plugins/uefi/meson.build
|
|
index ac9f5dd8..1ab51b5e 100644
|
|
--- a/plugins/uefi/meson.build
|
|
+++ b/plugins/uefi/meson.build
|
|
@@ -79,7 +79,7 @@ executable(
|
|
)
|
|
|
|
install_data(['uefi.conf'],
|
|
- install_dir: join_paths(sysconfdir, 'fwupd')
|
|
+ install_dir: join_paths(sysconfdir_install, 'fwupd')
|
|
)
|
|
|
|
if get_option('tests')
|