[{"id":28381,"web_url":"https://patchwork.libcamera.org/comment/28381/","msgid":"<87a5pkum7f.fsf@redhat.com>","date":"2024-01-05T10:08:20","subject":"Re: [libcamera-devel] [PATCH 4/8] utils: update-mojo.sh: Reject a\n\tdirty libcamera tree","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/people/177/","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"content":"Laurent Pinchart writes:\n\n> If the libcamera tree is dirty committing the result of the mojo update\n> will be messy. Bail out in that case.\n>\n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Milan Zamazal \n\n> ---\n> utils/update-mojo.sh | 8 +++++++-\n> 1 file changed, 7 insertions(+), 1 deletion(-)\n>\n> diff --git a/utils/update-mojo.sh b/utils/update-mojo.sh\n> index b6fbc6d14f2d..25a280e04331 100755\n> --- a/utils/update-mojo.sh\n> +++ b/utils/update-mojo.sh\n> @@ -15,6 +15,12 @@ chromium_dir=\"$(realpath \"$1\")\"\n> \n> cd \"${ipc_dir}/../../\"\n> \n> +# Reject dirty libcamera trees\n> +if [ -n \"$(git status --porcelain -uno)\" ] ; then\n> +\techo \"libcamera tree is dirty\"\n> +\texit 1\n> +fi\n> +\n> if [ ! -d \"${chromium_dir}/mojo\" ] ; then\n> \techo \"Directory ${chromium_dir} doesn't contain mojo\"\n> \texit 1\n> @@ -28,7 +34,7 @@ fi\n> # Get the chromium commit id\n> version=$(git -C \"${chromium_dir}\" rev-parse --short HEAD)\n> \n> -# Reject dirty trees\n> +# Reject dirty chromium trees\n> if [ -n \"$(git -C \"${chromium_dir}\" status --porcelain)\" ] ; then\n> \techo \"Chromium tree in ${chromium_dir} is dirty\"\n> \texit 1","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 1E05CBDB1D\n\tfor ;\n\tFri, 5 Jan 2024 10:08:28 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CB33E62B41;\n\tFri, 5 Jan 2024 11:08:27 +0100 (CET)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.133.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A6FDE62B32\n\tfor ;\n\tFri, 5 Jan 2024 11:08:25 +0100 (CET)","from mail-wr1-f70.google.com (mail-wr1-f70.google.com\n\t[209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS\n\t(version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n\tus-mta-510-CxG4_LTCMNathaOfCijoIw-1; Fri, 05 Jan 2024 05:08:23 -0500","by mail-wr1-f70.google.com with SMTP id\n\tffacd0b85a97d-33749dee29aso810448f8f.1\n\tfor ;\n\tFri, 05 Jan 2024 02:08:23 -0800 (PST)","from nuthatch (ip-77-48-47-2.net.vodafone.cz. [77.48.47.2])\n\tby smtp.gmail.com with ESMTPSA id\n\ty10-20020a5d620a000000b003372befd19bsm1083848wru.104.2024.01.05.02.08.21\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 05 Jan 2024 02:08:21 -0800 (PST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1704449307;\n\tbh=XwkpO7lMg8u0NAF21jRtdqja99XRQK5n96nvAKmKZP0=;\n\th=To:In-Reply-To:References:Date:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=Vk1hcbz/khIPpjoTjcjxvawU5EDvhNmqVPUQ7nr0v/G2aBWMS1CcQEVGlmwS5RMmA\n\tAz05NMBW1ebbQJ7j7pNo6F8z02asFUC2WZd3Dx9PrSTi1xbA62lIisrk7Yrm/XRPGo\n\t07qIlfzVRCzKPEyiM54ASZ/evKLOcQPhD/600bLloRsooUpwedfEVJgW6aQj6TZnTL\n\t82GbrZy212PjPaDk2iPOWgGFguNy51ltjv90AxuKnyNLbIM69u67sxNP3w0oHajd3S\n\t9OOaaPFgvKoQ520k0Zd4eyoQNXPE8UqjWZfjSDKuZtiCmnUmHwvWFnikLg5u7pfnsF\n\tu5c7Pgf5PnklA==","v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1704449304;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=tkK+fORW0sQGM6PihCXX0ifzS60BYxk2rnDo0HMfRww=;\n\tb=JdTdGQZQ84aPH9wcC1v9uXQz2sc8w8pVwKLUwvHvDDkZTgLFnG39mYX5Hi9yitNV0hPuea\n\tXw4wYgEbcnedrQKJemROyZIox7WpWN70fVSo7B9zqnXxZaPJ8oiE2vCS/+7MAFSKYy5CTA\n\t0Tk+ILVsKoVziTV0enrC3vksutVdaZY="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=redhat.com\n\theader.i=@redhat.com header.b=\"JdTdGQZQ\"; \n\tdkim-atps=neutral","X-MC-Unique":"CxG4_LTCMNathaOfCijoIw-1","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1704449302; x=1705054102;\n\th=mime-version:user-agent:message-id:date:references:in-reply-to\n\t:subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=tkK+fORW0sQGM6PihCXX0ifzS60BYxk2rnDo0HMfRww=;\n\tb=Es0kmpAU0H9WbwXTvLY6rQO+fVkzqfz7FckG6jUkEvqB8kMyauR/46YwvlTqMNIaRt\n\tSWs60KTqEZz2IZmLWuhghX+q8xcVQPxY/RHFjbsMA6B6qCg1D08zKfNAkruqnhESsjn8\n\tNSubDBYouHDdESBHDtCxNnI2tcX4xcRbAJ6k5wfJOp7XECoxWyDu3FsYTLkGOFzwGOGO\n\tDUsmN5/dpf6n6yHferVT302F/YMICu8/soM5FcZqpmxSNDYqDxP3PjbnH8VgDFbotyhT\n\tZzMGv9XnOx9H5Elpl+cRC9SgtcugzDzASKIPEaF54ncmhcGh57CUXfk7ez+9VzzXM7pw\n\tjXZw==","X-Gm-Message-State":"AOJu0YzS28Ese8JHp6GQxTGhbqiBkCdIbTOQefDrneGqxcPOzC2b0H1O\n\tkrhsZLsysopaSuyrvY/X6s7Z6tGacTSjBAXZOC3QCU/r3UoMKvzf9vvLh/bchuhsJQxN9eIb9lD\n\t3KcLKDA2RQy6/4CBakO1DK36vIuzRK7TcoEjnM3jmww==","X-Received":["by 2002:a7b:ce93:0:b0:40d:c2b1:5e43 with SMTP id\n\tq19-20020a7bce93000000b0040dc2b15e43mr1101788wmj.161.1704449302110; \n\tFri, 05 Jan 2024 02:08:22 -0800 (PST)","by 2002:a7b:ce93:0:b0:40d:c2b1:5e43 with SMTP id\n\tq19-20020a7bce93000000b0040dc2b15e43mr1101780wmj.161.1704449301880; \n\tFri, 05 Jan 2024 02:08:21 -0800 (PST)"],"X-Google-Smtp-Source":"AGHT+IHN7iOI4S3N4iDiTQHhaQ9leFlNQvgNfBFF0Raxz8k3BNvXGHSYMhrL+wQTDdHhh70nsFw89g==","To":"Laurent Pinchart ","In-Reply-To":"<20240104151548.2589-5-laurent.pinchart@ideasonboard.com>\n\t(Laurent Pinchart's message of \"Thu, 4 Jan 2024 17:15:44 +0200\")","References":"<20240104151548.2589-1-laurent.pinchart@ideasonboard.com>\n\t<20240104151548.2589-5-laurent.pinchart@ideasonboard.com>","Date":"Fri, 05 Jan 2024 11:08:20 +0100","Message-ID":"<87a5pkum7f.fsf@redhat.com>","User-Agent":"Gnus/5.13 (Gnus v5.13)","MIME-Version":"1.0","X-Mimecast-Spam-Score":"0","X-Mimecast-Originator":"redhat.com","Content-Type":"text/plain","Subject":"Re: [libcamera-devel] [PATCH 4/8] utils: update-mojo.sh: Reject a\n\tdirty libcamera tree","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Milan Zamazal via libcamera-devel ","Reply-To":"Milan Zamazal ","Cc":"libcamera-devel@lists.libcamera.org, Khem Raj ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":28404,"web_url":"https://patchwork.libcamera.org/comment/28404/","msgid":"<170480223032.3044059.1200408233642664962@ping.linuxembedded.co.uk>","date":"2024-01-09T12:10:30","subject":"Re: [libcamera-devel] [PATCH 4/8] utils: update-mojo.sh: Reject a\n\tdirty libcamera tree","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Laurent Pinchart via libcamera-devel (2024-01-04 15:15:44)\n> If the libcamera tree is dirty committing the result of the mojo update\n> will be messy. Bail out in that case.\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Kieran Bingham \n\n> ---\n> utils/update-mojo.sh | 8 +++++++-\n> 1 file changed, 7 insertions(+), 1 deletion(-)\n> \n> diff --git a/utils/update-mojo.sh b/utils/update-mojo.sh\n> index b6fbc6d14f2d..25a280e04331 100755\n> --- a/utils/update-mojo.sh\n> +++ b/utils/update-mojo.sh\n> @@ -15,6 +15,12 @@ chromium_dir=\"$(realpath \"$1\")\"\n> \n> cd \"${ipc_dir}/../../\"\n> \n> +# Reject dirty libcamera trees\n> +if [ -n \"$(git status --porcelain -uno)\" ] ; then\n> + echo \"libcamera tree is dirty\"\n> + exit 1\n> +fi\n> +\n> if [ ! -d \"${chromium_dir}/mojo\" ] ; then\n> echo \"Directory ${chromium_dir} doesn't contain mojo\"\n> exit 1\n> @@ -28,7 +34,7 @@ fi\n> # Get the chromium commit id\n> version=$(git -C \"${chromium_dir}\" rev-parse --short HEAD)\n> \n> -# Reject dirty trees\n> +# Reject dirty chromium trees\n> if [ -n \"$(git -C \"${chromium_dir}\" status --porcelain)\" ] ; then\n> echo \"Chromium tree in ${chromium_dir} is dirty\"\n> exit 1\n> -- \n> Regards,\n> \n> Laurent Pinchart\n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id C36C4C323E\n\tfor ;\n\tTue, 9 Jan 2024 12:10:34 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 72C0862B49;\n\tTue, 9 Jan 2024 13:10:34 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1894462B30\n\tfor ;\n\tTue, 9 Jan 2024 13:10:33 +0100 (CET)","from pendragon.ideasonboard.com\n\t(aztw-30-b2-v4wan-166917-cust845.vm26.cable.virginm.net\n\t[82.37.23.78])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 27346552;\n\tTue, 9 Jan 2024 13:09:29 +0100 (CET)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1704802234;\n\tbh=y6kFvhdW9VMBt+gql0tDiF10S7v4woMh5QmvM7DkjqA=;\n\th=In-Reply-To:References:To:Date:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=j+G0oapJ+3UGKnff+5/yeLvx7/iBkh7dVZ2O52I86ac9EI6EdtOs5sWfUTKSHuM29\n\tMz1Hq96nM0nq0E6tF7gJY03IggPjmMHkzX1Wz/sw/flvoqm+Q/BSak4Se3F6miWFNl\n\t/XHaMeDTfjvWfHJsrQdF0ewb7dL6HXu998rQ+rhj+Wo3aCStrTo2D99Mn6IzX2T1lS\n\tPNzbqHqrdFPgKkHVL3oYVObr3+QvMz5LUCxH8dbyRq3J57LXFuwTrR1MRLFQ9cIa34\n\tTnehdi5B+b6ZcneQCbmX07D0mxDbliFjzJCH+MEYYg4yr93bvGt2deLBqNNNL7D6X5\n\t9XnjMKkuink/w==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1704802169;\n\tbh=y6kFvhdW9VMBt+gql0tDiF10S7v4woMh5QmvM7DkjqA=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=P7kSplnETvAHJ+CZZ8c6DIntiAsW98WyK0+SSv64OVwrxUQ3rYSAJG/NtsNsz5o1Z\n\tMab388K4vcXjBHUQnF/BEAzsAYLUIwf63p18yo+MlWymfgUIs7d8afZPXdxwG69sig\n\tXxvmurdBk65J8vNuSuvdAVhIZ25z6ys/vKBl6EqU="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"P7kSplnE\"; dkim-atps=neutral","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20240104151548.2589-5-laurent.pinchart@ideasonboard.com>","References":"<20240104151548.2589-1-laurent.pinchart@ideasonboard.com>\n\t<20240104151548.2589-5-laurent.pinchart@ideasonboard.com>","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Tue, 09 Jan 2024 12:10:30 +0000","Message-ID":"<170480223032.3044059.1200408233642664962@ping.linuxembedded.co.uk>","User-Agent":"alot/0.10","Subject":"Re: [libcamera-devel] [PATCH 4/8] utils: update-mojo.sh: Reject a\n\tdirty libcamera tree","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Kieran Bingham via libcamera-devel\n\t","Reply-To":"Kieran Bingham ","Cc":"Khem Raj ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]