From patchwork Tue May 17 17:16:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 15938 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 DCBC3C3256 for ; Tue, 17 May 2022 17:16:50 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 91A226041E; Tue, 17 May 2022 19:16:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1652807810; bh=lQO2EooYXP8U8Hg9kIIOx+DH+8gbfUac75sFqCRKSYA=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=wk5THF3EDfe7HDp2ybFbyBxKZP6HMaFEEttR48/NNPxsluqZytK1TB9ijgKY53KiC WArEx8fALJQYi1gnfzOdUARHrHwK7qcos+oRSn0DQ8ydhmmiQi26ENng2uuZ4/M0wq P3hPdq/so5Gsv/HBPIZlatG5IG9kKLPcv3zAYS2YlY4nBtqLg5GlJFo3Ev+IjALXpc ntp0Cyp0oP5K3x881sDIToaAApHTQ7Nqrxsl3Y2++KDDDYqB6jhRogK5Wp8hLapNF7 cFDh2MSTzIm2bGL/ZnCyb/fMWMUD2Oq7CNnfYtY9/InNRUPGNAeFZ4VGSG/+k8YtHE s6S8h7y6yIgKQ== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1A45E6041D for ; Tue, 17 May 2022 19:16:49 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="f2cArq6X"; dkim-atps=neutral Received: from localhost.localdomain (unknown [45.131.31.124]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id A1BD74A8; Tue, 17 May 2022 19:16:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1652807808; bh=lQO2EooYXP8U8Hg9kIIOx+DH+8gbfUac75sFqCRKSYA=; h=From:To:Cc:Subject:Date:From; b=f2cArq6XarNorluV1rWgK3F5vHvmVqDAAMI+ttb3Pykve8IbTCeSCE0s9n2naRjnp 93J2roE6njkwRdanYMkcoIDW/4df0EcOxOgymHb/VEYUfiopbUvhAkZCrRJKPLCUyf lViquq8G1ykEyLidK5SLVcxRzhyaPes4QF4zQJ1k= To: libcamera-devel@lists.libcamera.org Date: Tue, 17 May 2022 20:16:38 +0300 Message-Id: <20220517171638.19164-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] py: Fix link generation to __init__.py 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: Laurent Pinchart via libcamera-devel From: Laurent Pinchart Reply-To: Laurent Pinchart Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The command to create a symlink to the __init__.py file in the source directory uses a relative path from the build directory, which hardcodes the assumption that the build directory is a direct child of the source directory. This isn't always true. Fix it by using the files() function. Fixes: 8aa02271fd71 ("Add Python bindings") Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham Reviewed-by: Tomi Valkeinen --- src/py/libcamera/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 5efb6c8e2acdc2dc9edf1f22f6c2a5818062b69e diff --git a/src/py/libcamera/meson.build b/src/py/libcamera/meson.build index 0cd7c75bb86c..2fc2eaec1c82 100644 --- a/src/py/libcamera/meson.build +++ b/src/py/libcamera/meson.build @@ -54,7 +54,7 @@ pycamera = shared_module('_libcamera', dependencies : pycamera_deps, cpp_args : pycamera_args) -run_command('ln', '-fsT', '../../../../src/py/libcamera/__init__.py', +run_command('ln', '-fsT', files('__init__.py'), meson.current_build_dir() / '__init__.py', check: true)