[{"id":27887,"web_url":"https://patchwork.libcamera.org/comment/27887/","msgid":"<169573027190.277971.17575952296316352330@ping.linuxembedded.co.uk>","date":"2023-09-26T12:11:11","subject":"Re: [libcamera-devel] [PATCH] utils: update-kernel-headers: Support\n\tgit worktrees","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 (2023-09-26 13:08:31)\n> When operating on a git worktree, the Linux kernel directory contains a\n> .git file, not a .git directory. Relax the git tree check to support\n> both.\n> \n\nOh, subtle. But yes - that sounds reasonable. Is the .git file a\nsymlink? Eitherway:\n\n\nReviewed-by: Kieran Bingham \n\n> Signed-off-by: Laurent Pinchart \n> ---\n> utils/update-kernel-headers.sh | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n> \n> diff --git a/utils/update-kernel-headers.sh b/utils/update-kernel-headers.sh\n> index a006452e6836..590986d2b7e2 100755\n> --- a/utils/update-kernel-headers.sh\n> +++ b/utils/update-kernel-headers.sh\n> @@ -18,7 +18,7 @@ if [ \"$line\" != \"# Kbuild for top-level directory of the kernel\" ] ; then\n> exit 1\n> fi\n> \n> -if [ ! -d \"${kernel_dir}/.git\" ] ; then\n> +if [ ! -e \"${kernel_dir}/.git\" ] ; then\n> echo \"Directory ${kernel_dir} doesn't contain a git tree\"\n> exit 1\n> fi\n> \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 3CA80BD808\n\tfor ;\n\tTue, 26 Sep 2023 12:11:17 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AB8AF62931;\n\tTue, 26 Sep 2023 14:11:16 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E778061E0E\n\tfor ;\n\tTue, 26 Sep 2023 14:11:14 +0200 (CEST)","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 C47F9842;\n\tTue, 26 Sep 2023 14:09:33 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1695730276;\n\tbh=9OCjeJpW7bIA6m9vCkeucRqBtkQHXTt7Bf+ecLwa4ec=;\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:\n\tFrom;\n\tb=GqAQQSDdl8lJf5+d1WpfT3f/xsL6nH07wchYjjvnTuIcJeUhd3lreNVnNHRsqdGMm\n\t9qNbRP+PZ6HG/bdfRztM8KShdYn3B+IJEobg/6hGbfukT4g0nHdLPhBGAjJ814D9j6\n\tyfV6dzWLupBaSxrRKWgf2y+2tfOG2AeJ+3w5ttSlnNhQh3uWcUslo0aXRiP9uzl/at\n\tZ9Iy3YPmplBFZfaJj17LPH4jqgecxxUhm79W0uvaFSiabJg5RE17BaJZXC8V1UFbXk\n\tn123GASLZxUAacum3iGQ163OnxVsZ4UTZjxhQd8+utQ02HylMla5ll7fFJLyQu4Wy3\n\tw01//jd8Rl8Xg==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1695730173;\n\tbh=9OCjeJpW7bIA6m9vCkeucRqBtkQHXTt7Bf+ecLwa4ec=;\n\th=In-Reply-To:References:Subject:From:To:Date:From;\n\tb=aivveF+zBSQ3TGeNf8F4NKNEyCYO4tbDQBMm0dsx5TejEgiqtSzlHuIa1r/8DBB48\n\tqWdl7xwN0JFlfTxpdAtOdyPjRgggRiex2PRyAN6jpXkfJ98+o5mugxB3pwRt4XXmWD\n\t5YtQMBenLNu+uQdgv7QXGLlGKJWl8DzuYjcLhPQ8="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"aivveF+z\"; dkim-atps=neutral","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20230926120831.8891-1-laurent.pinchart@ideasonboard.com>","References":"<20230926120831.8891-1-laurent.pinchart@ideasonboard.com>","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Tue, 26 Sep 2023 13:11:11 +0100","Message-ID":"<169573027190.277971.17575952296316352330@ping.linuxembedded.co.uk>","User-Agent":"alot/0.10","Subject":"Re: [libcamera-devel] [PATCH] utils: update-kernel-headers: Support\n\tgit worktrees","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 ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":27888,"web_url":"https://patchwork.libcamera.org/comment/27888/","msgid":"<20230926122031.GC5854@pendragon.ideasonboard.com>","date":"2023-09-26T12:20:31","subject":"Re: [libcamera-devel] [PATCH] utils: update-kernel-headers: Support\n\tgit worktrees","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"On Tue, Sep 26, 2023 at 01:11:11PM +0100, Kieran Bingham wrote:\n> Quoting Laurent Pinchart via libcamera-devel (2023-09-26 13:08:31)\n> > When operating on a git worktree, the Linux kernel directory contains a\n> > .git file, not a .git directory. Relax the git tree check to support\n> > both.\n> \n> Oh, subtle. But yes - that sounds reasonable. Is the .git file a\n> symlink? Eitherway:\n\nNo, it's a regular file that contains\n\ngitdir: /path/to/git/dir\n\nI considered testing for either a directory or a regular file, but I\nthink it's overkill, -e should be fine.\n\n> Reviewed-by: Kieran Bingham \n> \n> > Signed-off-by: Laurent Pinchart \n> > ---\n> > utils/update-kernel-headers.sh | 2 +-\n> > 1 file changed, 1 insertion(+), 1 deletion(-)\n> > \n> > diff --git a/utils/update-kernel-headers.sh b/utils/update-kernel-headers.sh\n> > index a006452e6836..590986d2b7e2 100755\n> > --- a/utils/update-kernel-headers.sh\n> > +++ b/utils/update-kernel-headers.sh\n> > @@ -18,7 +18,7 @@ if [ \"$line\" != \"# Kbuild for top-level directory of the kernel\" ] ; then\n> > exit 1\n> > fi\n> > \n> > -if [ ! -d \"${kernel_dir}/.git\" ] ; then\n> > +if [ ! -e \"${kernel_dir}/.git\" ] ; then\n> > echo \"Directory ${kernel_dir} doesn't contain a git tree\"\n> > exit 1\n> > fi\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 6030CC326B\n\tfor ;\n\tTue, 26 Sep 2023 12:20:23 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C706962945;\n\tTue, 26 Sep 2023 14:20:22 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 85A6C62931\n\tfor ;\n\tTue, 26 Sep 2023 14:20:21 +0200 (CEST)","from pendragon.ideasonboard.com (213-243-189-158.bb.dnainternet.fi\n\t[213.243.189.158])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7C96A842;\n\tTue, 26 Sep 2023 14:18:40 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1695730822;\n\tbh=gLXEDfLnlQGrOtp/FnFUclmLd8mVMrX2Yptwo3rYLKI=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=bR5XG5IeEuxRcgkE+uwP8nZOQNIsJdVpaAOFHsVrVTDuiDttOAiWWjwCOZ/pOI9j4\n\twayq5d7zsB0F+G1SlLFTwjyrlIcAkwibFDytP1T2gOFAb+BTTiIvPgfOw54wfk05JX\n\twbNtz8Aotj/1sQFHrpwJR6ytesvh1JhmbcuhSx79DEJgf2f/f440ZcSeztCsbMnbv6\n\t7xz18hUH1xxdIUK8rDH8z5jiNO6gowbL0IUI1yKm2JJ4mh4TaE4iwCTuc62gw1wA1J\n\tk+oKgCpRGAc5zRqsAm/rHdzgTlRyvG4R7l/K5hQZQ60AdFK+d1M6e8T8neWnIB3AF6\n\twA83Qvr39q3qw==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1695730720;\n\tbh=gLXEDfLnlQGrOtp/FnFUclmLd8mVMrX2Yptwo3rYLKI=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=B/qbNloAfC95Ij8DN5ClSPF7JMZnVce/h0x0/A9vQjV0yvLxhQWWSV+zEH8KSsqVo\n\tl1Vj5Ur8FjUdyyueTLvBNUFT2ho2c5AGuKqVQA5SoMWpGuV+kddui2BdaBFOcDBP8d\n\tmeIwc5hWEF2Cub9uBVRkDgKLJdQqw0YWRjTqFH9M="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"B/qbNloA\"; dkim-atps=neutral","Date":"Tue, 26 Sep 2023 15:20:31 +0300","To":"Kieran Bingham ","Message-ID":"<20230926122031.GC5854@pendragon.ideasonboard.com>","References":"<20230926120831.8891-1-laurent.pinchart@ideasonboard.com>\n\t<169573027190.277971.17575952296316352330@ping.linuxembedded.co.uk>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<169573027190.277971.17575952296316352330@ping.linuxembedded.co.uk>","Subject":"Re: [libcamera-devel] [PATCH] utils: update-kernel-headers: Support\n\tgit worktrees","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":"Laurent Pinchart via libcamera-devel\n\t","Reply-To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]