From f92e1f20e0f7782db7e85751f45a0a512cb4946a Mon Sep 17 00:00:00 2001 From: Daniel Campello Date: Fri, 8 Feb 2019 10:21:32 -0700 Subject: [PATCH] fwupd: Hide firmware-packager behind meson option fwupd installs by default firmware-packager (a python3 script) into the CrOS image. CrOS does not support python3 interpreter and fails passing the TestValidInterpreter. Removing this script from the default installation fixes the issue. TEST=emerge-sarien fwupd BUG=chromium:857263,b/121131967 Change-Id: I855c7994fd15faa0ce3d520734537674d7538b4e --- contrib/firmware-packager/meson.build | 6 ++++-- meson_options.txt | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/contrib/firmware-packager/meson.build b/contrib/firmware-packager/meson.build index fb7a83746..8d3e1a9dd 100644 --- a/contrib/firmware-packager/meson.build +++ b/contrib/firmware-packager/meson.build @@ -1,2 +1,4 @@ -install_data('firmware-packager', - install_dir : 'share/fwupd') +if get_option('firmware-packager') + install_data('firmware-packager', + install_dir : 'share/fwupd') +endif diff --git a/meson_options.txt b/meson_options.txt index 23ef8cdb8..c9b7ba675 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,5 +1,6 @@ option('daemon', type : 'boolean', value : true, description : 'enable the fwupd daemon') option('consolekit', type : 'boolean', value : true, description : 'enable ConsoleKit support') +option('firmware-packager', type : 'boolean', value : true, description : 'enable firmware-packager installation') option('gpg', type : 'boolean', value : true, description : 'enable the GPG verification support') option('gtkdoc', type : 'boolean', value : true, description : 'enable developer documentation') option('introspection', type : 'boolean', value : true, description : 'generate GObject Introspection data')