From patchwork Thu Jan 4 15:15:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 19364 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 54688C32BC for ; Thu, 4 Jan 2024 15:15:47 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 179C562B54; Thu, 4 Jan 2024 16:15:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1704381346; bh=Pcgpje/WJkZnzq2/zUqwnP8HJTIQXqEdOZ0O6HMidoU=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=Yrzvn8UpuaSj1ovqmRBbMP407cOydQlCXGUaMeYwJefpdWUlQ+gJgxyP6eonfTk65 TEnwlA9qbjLJQ/qPq/rOD+HROGoTjdQ3jEFEOwXplPPrke6PKDHhId2vG3mvMZk6Ct 4UV0rN2jYBswgJVcLkzjaCV6/1vNlqvDptyvpKXYrGcQpN5fPDnxgjLQJu6TTsIGHN oLRrryG6nu506QxENxEOPrr4yY0iHOIR0LGtNrrtInIBUdmH7awvlGXHCXF2q9g/5T a1gu8e2gOzzp/WVvswgnqRc1l3UlIXqzXWEIPB8DMUm4QhhQZevz1Yybk+3x6dF9am +tRkCVbeJ40eg== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1BF6D62B32 for ; Thu, 4 Jan 2024 16:15:44 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="J4JRNzzN"; dkim-atps=neutral Received: from pendragon.ideasonboard.com (213-243-189-158.bb.dnainternet.fi [213.243.189.158]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 54FBC2D8; Thu, 4 Jan 2024 16:14:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1704381283; bh=Pcgpje/WJkZnzq2/zUqwnP8HJTIQXqEdOZ0O6HMidoU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J4JRNzzNOe4ZCjRTSF2u/AE/VF7t5QkFL1eq3+yCgBgOXLRmHSpvJqiIpveKz7vIr tEKSs3nZqN4C2e2dJ8/4amfRljFJApxPoZ37GXAWXc8k6b9xXVolejRnhXwNVl7Jr5 GwKMML5GwAoqZqB9ul/6ci0yaFH9KVV3y2FZjVWg= To: libcamera-devel@lists.libcamera.org Date: Thu, 4 Jan 2024 17:15:43 +0200 Message-ID: <20240104151548.2589-4-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240104151548.2589-1-laurent.pinchart@ideasonboard.com> References: <20240104151548.2589-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 3/8] utils: update-mojo.sh: Change to the libcamera source directory 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 Cc: Khem Raj Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Instead of prefixing all paths to IPC files with ${ipc_dir}, change to the libcamera sources root directory and use relative file paths. This simplifies the update script. Signed-off-by: Laurent Pinchart Reviewed-by: Milan Zamazal Reviewed-by: Kieran Bingham --- utils/update-mojo.sh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/utils/update-mojo.sh b/utils/update-mojo.sh index 831f5ab8753b..b6fbc6d14f2d 100755 --- a/utils/update-mojo.sh +++ b/utils/update-mojo.sh @@ -11,7 +11,9 @@ if [ $# != 1 ] ; then fi ipc_dir="$(dirname "$(realpath "$0")")/ipc" -chromium_dir="$1" +chromium_dir="$(realpath "$1")" + +cd "${ipc_dir}/../../" if [ ! -d "${chromium_dir}/mojo" ] ; then echo "Directory ${chromium_dir} doesn't contain mojo" @@ -33,16 +35,16 @@ if [ -n "$(git -C "${chromium_dir}" status --porcelain)" ] ; then fi # Remove the previously imported files. -rm -rf "${ipc_dir}/mojo/" -rm -rf "${ipc_dir}/tools/" +rm -rf utils/ipc/mojo/ +rm -rf utils/ipc/tools/ # Copy the diagnosis file -mkdir -p "${ipc_dir}/tools/diagnosis" -cp "${chromium_dir}/tools/diagnosis/crbug_1001171.py" "${ipc_dir}/tools/diagnosis" +mkdir -p utils/ipc/tools/diagnosis/ +cp "${chromium_dir}/tools/diagnosis/crbug_1001171.py" utils/ipc/tools/diagnosis/ # Copy the rest of mojo -mkdir -p "${ipc_dir}/mojo/public" -cp "${chromium_dir}/mojo/public/LICENSE" "${ipc_dir}/mojo/public" +mkdir -p utils/ipc/mojo/public/ +cp "${chromium_dir}/mojo/public/LICENSE" utils/ipc/mojo/public/ ( cd "${chromium_dir}" || exit @@ -61,8 +63,8 @@ modify them manually. EOF ) -echo "$readme" > "${ipc_dir}/mojo/README" -echo "$readme" > "${ipc_dir}/tools/README" +echo "$readme" > utils/ipc/mojo/README +echo "$readme" > utils/ipc/tools/README cat <