From patchwork Fri May 6 14:54:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 15814 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 3AFBDC326C for ; Fri, 6 May 2022 14:55:17 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id EE96165653; Fri, 6 May 2022 16:55:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1651848915; bh=O45OCn0MzoZDSEqbqEq61DIKMlzSOl/dIVbUpTmGN3U=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=FF+kk1MAWoReSenaaTa/89JM4yVN7HPHT3mFav2aSc8DbMqRzCoMXtAYerQfImtwe X5nwIl+FYmJBRZs1Yrh8M7MIvhLWjmv+pO9BPAKqscdrWjuw/zr/S9zSbIqsFmpp4i QYMZ3I/5QcELbhONIff4xZ4ubEe8cRjtgIkV0cl/t3hYsbUk8zmVaL8KUCtUakQq+4 dQjrUxHzST7Rj9+RJQnH4N1RK4N7gogLlJg8CHkFx7ICtfbhEIeLIs7onE0uTlgIcz UGJ/Yry2/mLDOXXffWWEPOUcUatlJo1eWzWgweTBGDzIET2eCeqFlZkBS8qbhlFG5/ YYjln4byJdDBg== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 6B90165646 for ; Fri, 6 May 2022 16:55:11 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="AOUYcxNP"; dkim-atps=neutral Received: from deskari.lan (91-156-85-209.elisa-laajakaista.fi [91.156.85.209]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id D2557492; Fri, 6 May 2022 16:55:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1651848911; bh=O45OCn0MzoZDSEqbqEq61DIKMlzSOl/dIVbUpTmGN3U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AOUYcxNPjkT6rYXOc+UFoCACGp21EIhnZdwRj1f0j2VAnogy6igzr6U6aokRPjM/x ZtX+U4WX4dUlxpi7Dioj8PgRinQNr6WKRP7F5Ubas4qoIryo5ZGPmHeg9fKEdY2oDJ g9nXYUVXYEdHhIQciFtAKk68+5T+aWEeu0JXhDnM= To: libcamera-devel@lists.libcamera.org, David Plowman , Kieran Bingham , Laurent Pinchart , Jacopo Mondi Date: Fri, 6 May 2022 17:54:10 +0300 Message-Id: <20220506145414.99039-4-tomi.valkeinen@ideasonboard.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220506145414.99039-1-tomi.valkeinen@ideasonboard.com> References: <20220506145414.99039-1-tomi.valkeinen@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v8 3/7] meson: add 'check: true' for run_command() calls X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tomi Valkeinen via libcamera-devel From: Tomi Valkeinen Reply-To: Tomi Valkeinen Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add 'check: true' to all run_command() calls as suggested in https://github.com/mesonbuild/meson/issues/9300 to get rid of meson warning "You should add the boolean check kwarg to the run_command call." This makes meson fail if the executed command fails, which makes sense. Signed-off-by: Tomi Valkeinen Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- meson.build | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 10ad8c5c..0124e7d3 100644 --- a/meson.build +++ b/meson.build @@ -18,7 +18,8 @@ project('libcamera', 'c', 'cpp', # libcamera_git_version. libcamera_git_version = run_command('utils/gen-version.sh', meson.project_build_root(), - meson.project_source_root()).stdout().strip() + meson.project_source_root(), + check: true).stdout().strip() if libcamera_git_version == '' libcamera_git_version = meson.project_version() endif @@ -148,7 +149,7 @@ subdir('test') if not meson.is_cross_build() kernel_version_req = '>= 5.0.0' - kernel_version = run_command('uname', '-r').stdout().strip() + kernel_version = run_command('uname', '-r', check: true).stdout().strip() if not kernel_version.version_compare(kernel_version_req) warning('The current running kernel version @0@ is too old to run libcamera.' .format(kernel_version)) @@ -160,7 +161,8 @@ endif # Create a symlink from the build root to the source root. This is used when # running libcamera from the build directory to locate resources in the source # directory (such as IPA configuration files). -run_command('ln', '-fsT', meson.project_source_root(), meson.project_build_root() / 'source') +run_command('ln', '-fsT', meson.project_source_root(), meson.project_build_root() / 'source', + check: true) configure_file(output : 'config.h', configuration : config_h)