From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Tue, 15 Oct 2024 11:46:38 +0200 Subject: [PATCH] Add option for installation sysconfdir Since /etc is the domain of NixOS, not Nix, we cannot install files there. Let's install the files to $prefix/etc while still reading them from /etc. NixOS module for fwupd will take care of copying the files appropriately. --- data/bios-settings.d/meson.build | 2 +- data/meson.build | 2 +- data/pki/meson.build | 4 ++-- data/remotes.d/meson.build | 10 +++++----- docs/meson.build | 16 ++++++++-------- meson.build | 6 ++++++ meson_options.txt | 6 ++++++ plugins/uefi-capsule/meson.build | 4 ++-- 8 files changed, 31 insertions(+), 19 deletions(-) diff --git a/data/bios-settings.d/meson.build b/data/bios-settings.d/meson.build index 2a2a0701612e54a838d4d72f2bb00a793a31e0a3..99df55afb7636b090e2f57a5033bec6fe0017c15 100644 --- a/data/bios-settings.d/meson.build +++ b/data/bios-settings.d/meson.build @@ -2,6 +2,6 @@ if build_standalone and host_machine.system() == 'linux' install_data( 'README.md', install_tag: 'doc', - install_dir: join_paths(sysconfdir, 'fwupd', 'bios-settings.d'), + install_dir: join_paths(datadir, 'fwupd', 'bios-settings.d'), ) endif diff --git a/data/meson.build b/data/meson.build index 74a9104c333330ce2aacaa7cac45c87d6c5c8e53..3d9cc87b443078888c6e72075095d644a9258dab 100644 --- a/data/meson.build +++ b/data/meson.build @@ -29,7 +29,7 @@ if build_standalone install_data( ['fwupd.conf'], install_tag: 'runtime', - install_dir: join_paths(sysconfdir, 'fwupd'), + install_dir: join_paths(sysconfdir_install, 'fwupd'), install_mode: 'rw-r-----', ) plugin_quirks += files( diff --git a/data/pki/meson.build b/data/pki/meson.build index 7574aebc60617d8d8456c210bb19fcaf25263e74..05e6642454123e715e2f80501cf1919f96905fde 100644 --- a/data/pki/meson.build +++ b/data/pki/meson.build @@ -1,10 +1,10 @@ install_data( ['LVFS-CA.pem', 'LVFS-CA-2025PQ.pem'], install_tag: 'runtime', - install_dir: join_paths(sysconfdir, 'pki', 'fwupd'), + install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd'), ) install_data( ['LVFS-CA.pem', 'LVFS-CA-2025PQ.pem'], install_tag: 'runtime', - install_dir: join_paths(sysconfdir, 'pki', 'fwupd-metadata'), + install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd-metadata'), ) diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build index c0b4862ce6e13861da967cc2b8442849f63f0520..8bd00e9dbefd0ff386ad61f08ec861e7ad005090 100644 --- a/data/remotes.d/meson.build +++ b/data/remotes.d/meson.build @@ -12,7 +12,7 @@ if build_standalone and get_option('lvfs') != 'false' configuration: con3, install: true, install_tag: 'runtime', - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) configure_file( input: 'lvfs-testing.conf', @@ -20,7 +20,7 @@ if build_standalone and get_option('lvfs') != 'false' configuration: con3, install: true, install_tag: 'runtime', - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) configure_file( input: 'lvfs-embargo.conf', @@ -28,7 +28,7 @@ if build_standalone and get_option('lvfs') != 'false' configuration: con3, install: true, install_tag: 'runtime', - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) i18n.merge_file( input: 'lvfs.metainfo.xml', @@ -67,7 +67,7 @@ configure_file( configuration: con2, install: get_option('vendor_metadata'), install_tag: 'runtime', - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) configure_file( input: 'vendor-directory.conf', @@ -75,5 +75,5 @@ configure_file( configuration: con2, install: true, install_tag: 'runtime', - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) diff --git a/docs/meson.build b/docs/meson.build index b4d48b086baf03a2f713ab9c7cb17e60b2a9d12b..8a1f8fc8ca9fc21f278575233348ca918635c161 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -196,7 +196,7 @@ if build_docs build_by_default: true, install: true, install_tag: 'doc', - install_dir: join_paths(datadir, 'doc'), + install_dir: join_paths(sysconfdir_install, 'doc'), ) subdir('hsi-tests.d') @@ -257,7 +257,7 @@ if build_docs build_by_default: true, install: true, install_tag: 'doc', - install_dir: join_paths(datadir, 'doc'), + install_dir: join_paths(sysconfdir_install, 'doc'), ) man_cmd = [] foreach man : man_md @@ -270,36 +270,36 @@ if build_docs command: [generate_index, '@INPUT@', '-o', '@OUTPUT@', man_cmd], install: true, install_tag: 'doc', - install_dir: join_paths(datadir, 'doc', 'fwupd'), + install_dir: join_paths(sysconfdir_install, 'doc', 'fwupd'), ) if hsi install_data( ['hsi.html'], install_tag: 'doc', - install_dir: join_paths(datadir, 'doc', 'fwupd'), + install_dir: join_paths(sysconfdir_install, 'doc', 'fwupd'), ) endif install_data( ['urlmap_fwupd.js'], install_tag: 'doc', - install_dir: join_paths(datadir, 'doc', 'libfwupd'), + install_dir: join_paths(sysconfdir_install, 'doc', 'libfwupd'), ) install_data( ['urlmap_fwupdplugin.js'], install_tag: 'doc', - install_dir: join_paths(datadir, 'doc', 'libfwupdplugin'), + install_dir: join_paths(sysconfdir_install, 'doc', 'libfwupdplugin'), ) #make devhelp work install_symlink( 'libfwupd', install_tag: 'doc', - install_dir: join_paths(datadir, 'doc', 'fwupd'), + install_dir: join_paths(sysconfdir_install, 'doc', 'fwupd'), pointing_to: join_paths('..', 'libfwupd'), ) install_symlink( 'libfwupdplugin', install_tag: 'doc', - install_dir: join_paths(datadir, 'doc', 'fwupd'), + install_dir: join_paths(sysconfdir_install, 'doc', 'fwupd'), pointing_to: join_paths('..', 'libfwupdplugin'), ) endif diff --git a/meson.build b/meson.build index 1561d1837a73425d9dda510d0ba25d16f92ed7f7..917770b38abb86056d6c42fa9c99dedf27ebe999 100644 --- a/meson.build +++ b/meson.build @@ -250,6 +250,12 @@ endif 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 + diffcmd = find_program('diff') gio = dependency( 'gio-2.0', diff --git a/meson_options.txt b/meson_options.txt index b89ba371cee9dccf8457414f316ca697ef33216a..0dc66c4ec1ecb1547a21c4ec673ac1032462d91e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -14,6 +14,12 @@ option( type: 'feature', description: 'BlueZ support', ) +option( + 'sysconfdir_install', + type: 'string', + value: '', + description: 'sysconfdir to use during installation', +) option( 'build', type: 'combo', diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build index c2eb3b4300437d0d6b87d934441e69c306ba99a8..5c90240170c11ad3c75840ab6913018b6f7de85f 100644 --- a/plugins/uefi-capsule/meson.build +++ b/plugins/uefi-capsule/meson.build @@ -23,7 +23,7 @@ if host_machine.system() == 'linux' configuration: con2, install: true, install_tag: 'runtime', - install_dir: join_paths(sysconfdir, 'grub.d') + install_dir: join_paths(sysconfdir_install, 'grub.d') ) elif host_machine.system() == 'freebsd' backend_srcs += 'fu-uefi-capsule-backend-freebsd.c' @@ -98,7 +98,7 @@ if get_option('plugin_uefi_capsule_splash') ], install: true, install_tag: 'runtime', - install_dir: join_paths(datadir, 'fwupd'), + install_dir: join_paths(sysconfdir_install, 'fwupd'), ) endif