NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

meson: summarise paths

Browse source 
The IPAs are loaded from a defined location set as IPA_MODULE_DIR.
Furthermore, configuration files for both libcamera and IPAs are loaded
from paths defined during the meson configuration.

To make it easy to identify these locations for a given configuration,
present them as a 'paths' section in the meson summary.

This adds a summary section to meson in the form:

  Paths
    LIBCAMERA_DATA_DIR       : "/usr/share/libcamera"
    LIBCAMERA_SYSCONF_DIR    : "/etc/camera/libcamera"
    IPA_PROXY_DIR            : "/usr/libexec/libcamera"
    IPA_CONFIG_DIR           : "/etc/camera/libcamera/ipa:/usr/share/libcamera/ipa"
    IPA_MODULE_DIR           : "/usr/lib/x86_64-linux-gnu/libcamera"

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Kieran Bingham 2021-04-29 16:53:25 +01:00
parent 1fea2730a1
commit 94d1af771e
3 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ipa/meson.build
View file

@ -15,6 +15,11 @@ config_h.set('IPA_CONFIG_DIR',
config_h.set('IPA_MODULE_DIR', config_h.set('IPA_MODULE_DIR',
'"' + get_option('prefix') / ipa_install_dir + '"') '"' + get_option('prefix') / ipa_install_dir + '"')
summary({
'IPA_CONFIG_DIR' : config_h.get('IPA_CONFIG_DIR'),
'IPA_MODULE_DIR' : config_h.get('IPA_MODULE_DIR'),
}, section : 'Paths')
subdir('libipa') subdir('libipa')
ipa_sign = files('ipa-sign.sh') ipa_sign = files('ipa-sign.sh')

4
src/libcamera/proxy/worker/meson.build
View file

@ -26,3 +26,7 @@ endforeach
config_h.set('IPA_PROXY_DIR', config_h.set('IPA_PROXY_DIR',
'"' + get_option('prefix') / proxy_install_dir + '"') '"' + get_option('prefix') / proxy_install_dir + '"')
summary({
'IPA_PROXY_DIR' : config_h.get('IPA_PROXY_DIR'),
}, section : 'Paths')

5
src/meson.build
View file

@ -8,6 +8,11 @@ libcamera_sysconfdir = get_option('sysconfdir') / 'libcamera'
config_h.set('LIBCAMERA_DATA_DIR', '"' + get_option('prefix') / libcamera_datadir + '"') config_h.set('LIBCAMERA_DATA_DIR', '"' + get_option('prefix') / libcamera_datadir + '"')
config_h.set('LIBCAMERA_SYSCONF_DIR', '"' + get_option('prefix') / libcamera_sysconfdir + '"') config_h.set('LIBCAMERA_SYSCONF_DIR', '"' + get_option('prefix') / libcamera_sysconfdir + '"')
summary({
'LIBCAMERA_DATA_DIR' : config_h.get('LIBCAMERA_DATA_DIR'),
'LIBCAMERA_SYSCONF_DIR' : config_h.get('LIBCAMERA_SYSCONF_DIR'),
}, section : 'Paths')
# Module Signing # Module Signing
openssl = find_program('openssl', required : true) openssl = find_program('openssl', required : true)
if openssl.found() if openssl.found()