From patchwork Thu May 5 10:40:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 15786 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 34335C326C for ; Thu, 5 May 2022 10:41:33 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id BCF6F65649; Thu, 5 May 2022 12:41:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1651747289; bh=XdDdQDQXDl9lQ0P90pPKtd1P2JY7LUYPJegdEbDP2cI=; 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=eV7cKraRrqZ1Al8/xR47yRh/s0FpkqushYQuGMFCfNXvNfCUVFRUOTB2cOvn7MLWz wqT9A/yvPmf4lOBdFU3N0/4mIm5ml1DOERfZLQW6L3hnj2rLKBxDFUEpZcNXs7OXty 8mdVcfKEOvFvMUlNsiH7X8fEDCexRBio0DTVH8Iy9cOf3drRtMG16vb4jYX92vLKng VmXKrig6uz1ilqT12WVicf7hl53M6kr/onAENWoZxyGD6gLhbX+2c3ewmTFwCZrrga iQSxC64TW/glIGwo3N4whCwh0Tk2su4ypDelp+3v3+hOq6FYjWJi5Z2+Rn93gQgmm9 xnc4t5q2hvPdg== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id CC2F36563F for ; Thu, 5 May 2022 12:41:26 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="QpUwNYRi"; 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 4121AA46; Thu, 5 May 2022 12:41:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1651747286; bh=XdDdQDQXDl9lQ0P90pPKtd1P2JY7LUYPJegdEbDP2cI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QpUwNYRigGBjDqafVbzncJ42YS0kFXKDqEho9RO7rV80qBsaN7gESvlMIp6cWPLQ/ 0OQks8KfAuWWMXNCNbq16jIWDa/PbVytygJToZX4E4A5c3shMWzTbZqILw/9n5ucMd 5/PYLJZjcA0+EWc0omlxx0DAXzvaDg4s5kY6Q498= To: libcamera-devel@lists.libcamera.org, David Plowman , Kieran Bingham , Laurent Pinchart , Jacopo Mondi Date: Thu, 5 May 2022 13:40:54 +0300 Message-Id: <20220505104104.70841-4-tomi.valkeinen@ideasonboard.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220505104104.70841-1-tomi.valkeinen@ideasonboard.com> References: <20220505104104.70841-1-tomi.valkeinen@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v7 03/13] 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)