[{"id":15510,"web_url":"https://patchwork.libcamera.org/comment/15510/","msgid":"<6b7e93c0-35dd-389b-4d55-55be7c547217@ideasonboard.com>","date":"2021-03-08T12:23:19","subject":"Re: [libcamera-devel] [PATCH] utils: Add kernel headers update\n\tscript","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 03/03/2021 17:39, Laurent Pinchart wrote:\n> Add a script to update the local copy of kernel headers (in\n> include/linux/) from a Linux kernel git tree. The script handles header\n> installation, manual processing of the IPU3 header that is still in\n> staging, and update of the README file.\n> \n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> ---\n>  utils/update-kernel-headers.sh | 78 ++++++++++++++++++++++++++++++++++\n>  1 file changed, 78 insertions(+)\n>  create mode 100755 utils/update-kernel-headers.sh\n> \n> diff --git a/utils/update-kernel-headers.sh b/utils/update-kernel-headers.sh\n> new file mode 100755\n> index 000000000000..f5d91c8a8c08\n> --- /dev/null\n> +++ b/utils/update-kernel-headers.sh\n> @@ -0,0 +1,78 @@\n> +#!/bin/sh\n> +\n> +# SPDX-License-Identifier: GPL-2.0-or-later\n> +# Update the kernel headers copy from a kernel source tree\n> +\n> +if [ $# != 1 ] ; then\n> +\techo \"Usage: $0 <kernel dir>\"\n> +\texit 1\n> +fi\n> +\n> +header_dir=\"$(dirname \"$(realpath \"$0\")\")/../include/linux\"\n> +kernel_dir=\"$1\"\n> +\n> +# Bail out if the directory doesn't contain kernel sources\n> +line=$(head -3 \"${kernel_dir}/Kbuild\" 2>/dev/null | tail -1)\n> +if [ \"$line\" != \"# Kbuild for top-level directory of the kernel\" ] ; then\n> +\techo \"Directory ${kernel_dir} doesn't contain a kernel source tree\"\n> +\texit 1\n> +fi\n> +\n> +if [ ! -d \"${kernel_dir}/.git\" ] ; then\n> +\techo \"Directory ${kernel_dir} doesn't contain a git tree\"\n> +\texit 1\n> +fi\n> +\n> +# Install the headers to a temporary directory\n> +install_dir=$(mktemp -d)\n> +if [ ! -d \"${install_dir}\" ] ; then\n> +\techo \"Failed to create temporary directory\"\n> +\texit 1\n> +fi\n> +\n> +trap \"rm -rf ${install_dir}\" EXIT\n> +\n> +set -e\n> +make -C \"${kernel_dir}\" O=\"${install_dir}\" headers_install\n> +set +e\n> +\n> +# Copy the headers\n> +headers=\"\n> +\tdrm/drm_fourcc.h\n> +\tlinux/dma-buf.h\n> +\tlinux/dma-heap.h\n> +\tlinux/media-bus-format.h\n> +\tlinux/media.h\n> +\tlinux/rkisp1-config.h\n> +\tlinux/v4l2-common.h\n> +\tlinux/v4l2-controls.h\n> +\tlinux/v4l2-mediabus.h\n> +\tlinux/v4l2-subdev.h\n> +\tlinux/videodev2.h\n> +\"\n> +\n> +for header in $headers ; do\n> +\tname=$(basename \"${header}\")\n> +\tcp \"${install_dir}/usr/include/${header}\" \"${header_dir}/${name}\"\n> +done\n> +\n> +# The IPU3 header is a special case, as it's stored in staging. Handle it\n> +# manually.\n> +(cd \"${install_dir}\" ; \"${kernel_dir}scripts/headers_install.sh\" \\\n> +\t\"${kernel_dir}/drivers/staging/media/ipu3/include/intel-ipu3.h\" \\\n> +\t\"${header_dir}/intel-ipu3.h\")\n> +\n> +# Update the README file\n> +version=$(git --git-dir=\"${kernel_dir}/.git\" describe)\n\nShould this have any other parameters?\n\n --always --tags --dirty ?\n\n\n> +\n> +cat <<EOF > \"${header_dir}/README\"\n> +# SPDX-License-Identifier: CC0-1.0\n> +\n> +Files in this directory are imported from ${version} of the Linux kernel. Do not\n> +modify them manually.\n> +EOF\n> +\n> +# Cleanup\n> +rm -rf \"${install_dir}\"\n> +\n> +echo \"Kernel headers updated\"\n> \n\nAre there any other manual steps required which should be mentioned at\nthe end of the script so they do not get missed by someone running it?\n\nOtherwise\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 66B34BD80C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon,  8 Mar 2021 12:23:24 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D634D602EC;\n\tMon,  8 Mar 2021 13:23:23 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9EBEC602E6\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon,  8 Mar 2021 13:23:22 +0100 (CET)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 18BCDAC1;\n\tMon,  8 Mar 2021 13:23:22 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"BA3uArbO\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1615206202;\n\tbh=HuZChxn+g5h70AfDJKSaW7r51jXUUrhysFnDwgyWrHs=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=BA3uArbOFsulAtA54tZIG904Xz62fbiomSgx1IFX7/hDWrxLF2jgKqMInd4SnmRCD\n\tRgs9W6X7i9Iw9jrWbMUzPrRFClB20u2RKtgHQGu8rtsXb3ARzg9fPUzgcbBHn/E1um\n\tgnQltJCU3Z9Nm4KQ7p3yzXuwts+afMYXA5Mu5gHo=","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210303173921.8801-1-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<6b7e93c0-35dd-389b-4d55-55be7c547217@ideasonboard.com>","Date":"Mon, 8 Mar 2021 12:23:19 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20210303173921.8801-1-laurent.pinchart@ideasonboard.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH] utils: Add kernel headers update\n\tscript","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":15511,"web_url":"https://patchwork.libcamera.org/comment/15511/","msgid":"<YEYhOWMh64t2eko/@pendragon.ideasonboard.com>","date":"2021-03-08T13:06:01","subject":"Re: [libcamera-devel] [PATCH] utils: Add kernel headers update\n\tscript","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nOn Mon, Mar 08, 2021 at 12:23:19PM +0000, Kieran Bingham wrote:\n> On 03/03/2021 17:39, Laurent Pinchart wrote:\n> > Add a script to update the local copy of kernel headers (in\n> > include/linux/) from a Linux kernel git tree. The script handles header\n> > installation, manual processing of the IPU3 header that is still in\n> > staging, and update of the README file.\n> > \n> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> > ---\n> >  utils/update-kernel-headers.sh | 78 ++++++++++++++++++++++++++++++++++\n> >  1 file changed, 78 insertions(+)\n> >  create mode 100755 utils/update-kernel-headers.sh\n> > \n> > diff --git a/utils/update-kernel-headers.sh b/utils/update-kernel-headers.sh\n> > new file mode 100755\n> > index 000000000000..f5d91c8a8c08\n> > --- /dev/null\n> > +++ b/utils/update-kernel-headers.sh\n> > @@ -0,0 +1,78 @@\n> > +#!/bin/sh\n> > +\n> > +# SPDX-License-Identifier: GPL-2.0-or-later\n> > +# Update the kernel headers copy from a kernel source tree\n> > +\n> > +if [ $# != 1 ] ; then\n> > +\techo \"Usage: $0 <kernel dir>\"\n> > +\texit 1\n> > +fi\n> > +\n> > +header_dir=\"$(dirname \"$(realpath \"$0\")\")/../include/linux\"\n> > +kernel_dir=\"$1\"\n> > +\n> > +# Bail out if the directory doesn't contain kernel sources\n> > +line=$(head -3 \"${kernel_dir}/Kbuild\" 2>/dev/null | tail -1)\n> > +if [ \"$line\" != \"# Kbuild for top-level directory of the kernel\" ] ; then\n> > +\techo \"Directory ${kernel_dir} doesn't contain a kernel source tree\"\n> > +\texit 1\n> > +fi\n> > +\n> > +if [ ! -d \"${kernel_dir}/.git\" ] ; then\n> > +\techo \"Directory ${kernel_dir} doesn't contain a git tree\"\n> > +\texit 1\n> > +fi\n> > +\n> > +# Install the headers to a temporary directory\n> > +install_dir=$(mktemp -d)\n> > +if [ ! -d \"${install_dir}\" ] ; then\n> > +\techo \"Failed to create temporary directory\"\n> > +\texit 1\n> > +fi\n> > +\n> > +trap \"rm -rf ${install_dir}\" EXIT\n> > +\n> > +set -e\n> > +make -C \"${kernel_dir}\" O=\"${install_dir}\" headers_install\n> > +set +e\n> > +\n> > +# Copy the headers\n> > +headers=\"\n> > +\tdrm/drm_fourcc.h\n> > +\tlinux/dma-buf.h\n> > +\tlinux/dma-heap.h\n> > +\tlinux/media-bus-format.h\n> > +\tlinux/media.h\n> > +\tlinux/rkisp1-config.h\n> > +\tlinux/v4l2-common.h\n> > +\tlinux/v4l2-controls.h\n> > +\tlinux/v4l2-mediabus.h\n> > +\tlinux/v4l2-subdev.h\n> > +\tlinux/videodev2.h\n> > +\"\n> > +\n> > +for header in $headers ; do\n> > +\tname=$(basename \"${header}\")\n> > +\tcp \"${install_dir}/usr/include/${header}\" \"${header_dir}/${name}\"\n> > +done\n> > +\n> > +# The IPU3 header is a special case, as it's stored in staging. Handle it\n> > +# manually.\n> > +(cd \"${install_dir}\" ; \"${kernel_dir}scripts/headers_install.sh\" \\\n> > +\t\"${kernel_dir}/drivers/staging/media/ipu3/include/intel-ipu3.h\" \\\n> > +\t\"${header_dir}/intel-ipu3.h\")\n> > +\n> > +# Update the README file\n> > +version=$(git --git-dir=\"${kernel_dir}/.git\" describe)\n> \n> Should this have any other parameters?\n> \n>  --always --tags --dirty ?\n\nWe're expected to run this on a kernel git tree, if it doesn't have any\ntag, there's something clearly wrong :-) --always shouldn't be needed.\nSimilarly, for --tags, as we're tracking mainline tags are annotated.\nIf there are local tags in a kernel tree on top a mailine tag, ignoring\nthem would be less confusing I think.\n\n--dirty sounds good, and we should actually error out in that case. I'll\nsubmit a v2.\n\n> > +\n> > +cat <<EOF > \"${header_dir}/README\"\n> > +# SPDX-License-Identifier: CC0-1.0\n> > +\n> > +Files in this directory are imported from ${version} of the Linux kernel. Do not\n> > +modify them manually.\n> > +EOF\n> > +\n> > +# Cleanup\n> > +rm -rf \"${install_dir}\"\n> > +\n> > +echo \"Kernel headers updated\"\n> \n> Are there any other manual steps required which should be mentioned at\n> the end of the script so they do not get missed by someone running it?\n\nHow about this ?\n\ndiff --git a/utils/update-kernel-headers.sh b/utils/update-kernel-headers.sh\nindex f5d91c8a8c08..bb045d395359 100755\n--- a/utils/update-kernel-headers.sh\n+++ b/utils/update-kernel-headers.sh\n@@ -75,4 +75,9 @@ EOF\n # Cleanup\n rm -rf \"${install_dir}\"\n\n-echo \"Kernel headers updated\"\n+cat <<EOF\n+----------------------------------------------------------------------\n+Kernel headers updated. Please review and up-port local changes before\n+committing.\n+----------------------------------------------------------------------\n+EOF\n\n> Otherwise\n> \n> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 31B6CBD1F1\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon,  8 Mar 2021 13:06:34 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6BD9260520;\n\tMon,  8 Mar 2021 14:06:33 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 81724602E6\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon,  8 Mar 2021 14:06:32 +0100 (CET)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 00A77AC1;\n\tMon,  8 Mar 2021 14:06:31 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"hTH/sIiE\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1615208792;\n\tbh=khWsfS6LbBkRnSCwbTbdenZ+QX5CLs1tnWPlwq9Hj+A=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=hTH/sIiEXacJdcMmsJu/jTMpCMHRWPTec1bzcsYRw2eszoQ/ymAufd6G6ifcxPaSl\n\ttoujlOMLTtvdl4tgm3Vm8+8wXZmPHM6KxUMc5A/gVXrP8fCXSQ7nMGrCcOojRmNFFD\n\t0eigtgmrjmlrLokGx8i4v0KzsIk3Yn4+uKyd6zf0=","Date":"Mon, 8 Mar 2021 15:06:01 +0200","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Message-ID":"<YEYhOWMh64t2eko/@pendragon.ideasonboard.com>","References":"<20210303173921.8801-1-laurent.pinchart@ideasonboard.com>\n\t<6b7e93c0-35dd-389b-4d55-55be7c547217@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<6b7e93c0-35dd-389b-4d55-55be7c547217@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH] utils: Add kernel headers update\n\tscript","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":15514,"web_url":"https://patchwork.libcamera.org/comment/15514/","msgid":"<77f165a2-f42a-0a5a-cd3b-69e736cbfa6d@ideasonboard.com>","date":"2021-03-08T13:53:32","subject":"Re: [libcamera-devel] [PATCH] utils: Add kernel headers update\n\tscript","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"On 08/03/2021 13:06, Laurent Pinchart wrote:\n> Hi Kieran,\n> \n> On Mon, Mar 08, 2021 at 12:23:19PM +0000, Kieran Bingham wrote:\n>> On 03/03/2021 17:39, Laurent Pinchart wrote:\n>>> Add a script to update the local copy of kernel headers (in\n>>> include/linux/) from a Linux kernel git tree. The script handles header\n>>> installation, manual processing of the IPU3 header that is still in\n>>> staging, and update of the README file.\n>>>\n>>> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n>>> ---\n>>>  utils/update-kernel-headers.sh | 78 ++++++++++++++++++++++++++++++++++\n>>>  1 file changed, 78 insertions(+)\n>>>  create mode 100755 utils/update-kernel-headers.sh\n>>>\n>>> diff --git a/utils/update-kernel-headers.sh b/utils/update-kernel-headers.sh\n>>> new file mode 100755\n>>> index 000000000000..f5d91c8a8c08\n>>> --- /dev/null\n>>> +++ b/utils/update-kernel-headers.sh\n>>> @@ -0,0 +1,78 @@\n>>> +#!/bin/sh\n>>> +\n>>> +# SPDX-License-Identifier: GPL-2.0-or-later\n>>> +# Update the kernel headers copy from a kernel source tree\n>>> +\n>>> +if [ $# != 1 ] ; then\n>>> +\techo \"Usage: $0 <kernel dir>\"\n>>> +\texit 1\n>>> +fi\n>>> +\n>>> +header_dir=\"$(dirname \"$(realpath \"$0\")\")/../include/linux\"\n>>> +kernel_dir=\"$1\"\n>>> +\n>>> +# Bail out if the directory doesn't contain kernel sources\n>>> +line=$(head -3 \"${kernel_dir}/Kbuild\" 2>/dev/null | tail -1)\n>>> +if [ \"$line\" != \"# Kbuild for top-level directory of the kernel\" ] ; then\n>>> +\techo \"Directory ${kernel_dir} doesn't contain a kernel source tree\"\n>>> +\texit 1\n>>> +fi\n>>> +\n>>> +if [ ! -d \"${kernel_dir}/.git\" ] ; then\n>>> +\techo \"Directory ${kernel_dir} doesn't contain a git tree\"\n>>> +\texit 1\n>>> +fi\n>>> +\n>>> +# Install the headers to a temporary directory\n>>> +install_dir=$(mktemp -d)\n>>> +if [ ! -d \"${install_dir}\" ] ; then\n>>> +\techo \"Failed to create temporary directory\"\n>>> +\texit 1\n>>> +fi\n>>> +\n>>> +trap \"rm -rf ${install_dir}\" EXIT\n>>> +\n>>> +set -e\n>>> +make -C \"${kernel_dir}\" O=\"${install_dir}\" headers_install\n>>> +set +e\n>>> +\n>>> +# Copy the headers\n>>> +headers=\"\n>>> +\tdrm/drm_fourcc.h\n>>> +\tlinux/dma-buf.h\n>>> +\tlinux/dma-heap.h\n>>> +\tlinux/media-bus-format.h\n>>> +\tlinux/media.h\n>>> +\tlinux/rkisp1-config.h\n>>> +\tlinux/v4l2-common.h\n>>> +\tlinux/v4l2-controls.h\n>>> +\tlinux/v4l2-mediabus.h\n>>> +\tlinux/v4l2-subdev.h\n>>> +\tlinux/videodev2.h\n>>> +\"\n>>> +\n>>> +for header in $headers ; do\n>>> +\tname=$(basename \"${header}\")\n>>> +\tcp \"${install_dir}/usr/include/${header}\" \"${header_dir}/${name}\"\n>>> +done\n>>> +\n>>> +# The IPU3 header is a special case, as it's stored in staging. Handle it\n>>> +# manually.\n>>> +(cd \"${install_dir}\" ; \"${kernel_dir}scripts/headers_install.sh\" \\\n>>> +\t\"${kernel_dir}/drivers/staging/media/ipu3/include/intel-ipu3.h\" \\\n>>> +\t\"${header_dir}/intel-ipu3.h\")\n>>> +\n>>> +# Update the README file\n>>> +version=$(git --git-dir=\"${kernel_dir}/.git\" describe)\n>>\n>> Should this have any other parameters?\n>>\n>>  --always --tags --dirty ?\n> \n> We're expected to run this on a kernel git tree, if it doesn't have any\n> tag, there's something clearly wrong :-) --always shouldn't be needed.\n> Similarly, for --tags, as we're tracking mainline tags are annotated.\n> If there are local tags in a kernel tree on top a mailine tag, ignoring\n> them would be less confusing I think.\n\nAre we always guaranteed to have pull tags locally?\n\nAren't there conditions where the local git tree might not have the\ntags? (Perhaps not, but that's why I suggested the always).\n\n> \n> --dirty sounds good, and we should actually error out in that case. I'll\n> submit a v2.\n\nErroring out in that case sounds best indeed.\n\n\n\n> \n>>> +\n>>> +cat <<EOF > \"${header_dir}/README\"\n>>> +# SPDX-License-Identifier: CC0-1.0\n>>> +\n>>> +Files in this directory are imported from ${version} of the Linux kernel. Do not\n>>> +modify them manually.\n>>> +EOF\n>>> +\n>>> +# Cleanup\n>>> +rm -rf \"${install_dir}\"\n>>> +\n>>> +echo \"Kernel headers updated\"\n>>\n>> Are there any other manual steps required which should be mentioned at\n>> the end of the script so they do not get missed by someone running it?\n> \n> How about this ?\n> \n> diff --git a/utils/update-kernel-headers.sh b/utils/update-kernel-headers.sh\n> index f5d91c8a8c08..bb045d395359 100755\n> --- a/utils/update-kernel-headers.sh\n> +++ b/utils/update-kernel-headers.sh\n> @@ -75,4 +75,9 @@ EOF\n>  # Cleanup\n>  rm -rf \"${install_dir}\"\n> \n> -echo \"Kernel headers updated\"\n> +cat <<EOF\n> +----------------------------------------------------------------------\n> +Kernel headers updated. Please review and up-port local changes before\n> +committing.\n> +----------------------------------------------------------------------\n> +EOF\n> \n>> Otherwise\n>>\n>> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n>","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 83A6FBD80C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon,  8 Mar 2021 13:53:36 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0465368A9F;\n\tMon,  8 Mar 2021 14:53:36 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2B64F602ED\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon,  8 Mar 2021 14:53:35 +0100 (CET)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A3306AC1;\n\tMon,  8 Mar 2021 14:53:34 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"ktXkNbah\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1615211614;\n\tbh=Ilp/C6mKqzhvn+PumgkaFJYzDsUHfqFK7P0jc8eMLrg=;\n\th=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=ktXkNbahtjeQ6SO95mqx/KwCwnIFrwTQ/20+wh9FQeysdruYhCpdSYWyNCRsBn/EI\n\tnwM4SiQGZ61bkoilcscufihtM2RuykinMG12q6BxV7cyW70st7N9HSGOkvu8LooS3w\n\tZF/+vV1xILgMnBHAfoBiTP5mm3OBzHvpIgOzc2fU=","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","References":"<20210303173921.8801-1-laurent.pinchart@ideasonboard.com>\n\t<6b7e93c0-35dd-389b-4d55-55be7c547217@ideasonboard.com>\n\t<YEYhOWMh64t2eko/@pendragon.ideasonboard.com>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<77f165a2-f42a-0a5a-cd3b-69e736cbfa6d@ideasonboard.com>","Date":"Mon, 8 Mar 2021 13:53:32 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<YEYhOWMh64t2eko/@pendragon.ideasonboard.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH] utils: Add kernel headers update\n\tscript","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Reply-To":"kieran.bingham@ideasonboard.com","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":15521,"web_url":"https://patchwork.libcamera.org/comment/15521/","msgid":"<YEY5wQ1kDHBbe8vq@pendragon.ideasonboard.com>","date":"2021-03-08T14:50:41","subject":"Re: [libcamera-devel] [PATCH] utils: Add kernel headers update\n\tscript","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nOn Mon, Mar 08, 2021 at 01:53:32PM +0000, Kieran Bingham wrote:\n> On 08/03/2021 13:06, Laurent Pinchart wrote:\n> > On Mon, Mar 08, 2021 at 12:23:19PM +0000, Kieran Bingham wrote:\n> >> On 03/03/2021 17:39, Laurent Pinchart wrote:\n> >>> Add a script to update the local copy of kernel headers (in\n> >>> include/linux/) from a Linux kernel git tree. The script handles header\n> >>> installation, manual processing of the IPU3 header that is still in\n> >>> staging, and update of the README file.\n> >>>\n> >>> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> >>> ---\n> >>>  utils/update-kernel-headers.sh | 78 ++++++++++++++++++++++++++++++++++\n> >>>  1 file changed, 78 insertions(+)\n> >>>  create mode 100755 utils/update-kernel-headers.sh\n> >>>\n> >>> diff --git a/utils/update-kernel-headers.sh b/utils/update-kernel-headers.sh\n> >>> new file mode 100755\n> >>> index 000000000000..f5d91c8a8c08\n> >>> --- /dev/null\n> >>> +++ b/utils/update-kernel-headers.sh\n> >>> @@ -0,0 +1,78 @@\n> >>> +#!/bin/sh\n> >>> +\n> >>> +# SPDX-License-Identifier: GPL-2.0-or-later\n> >>> +# Update the kernel headers copy from a kernel source tree\n> >>> +\n> >>> +if [ $# != 1 ] ; then\n> >>> +\techo \"Usage: $0 <kernel dir>\"\n> >>> +\texit 1\n> >>> +fi\n> >>> +\n> >>> +header_dir=\"$(dirname \"$(realpath \"$0\")\")/../include/linux\"\n> >>> +kernel_dir=\"$1\"\n> >>> +\n> >>> +# Bail out if the directory doesn't contain kernel sources\n> >>> +line=$(head -3 \"${kernel_dir}/Kbuild\" 2>/dev/null | tail -1)\n> >>> +if [ \"$line\" != \"# Kbuild for top-level directory of the kernel\" ] ; then\n> >>> +\techo \"Directory ${kernel_dir} doesn't contain a kernel source tree\"\n> >>> +\texit 1\n> >>> +fi\n> >>> +\n> >>> +if [ ! -d \"${kernel_dir}/.git\" ] ; then\n> >>> +\techo \"Directory ${kernel_dir} doesn't contain a git tree\"\n> >>> +\texit 1\n> >>> +fi\n> >>> +\n> >>> +# Install the headers to a temporary directory\n> >>> +install_dir=$(mktemp -d)\n> >>> +if [ ! -d \"${install_dir}\" ] ; then\n> >>> +\techo \"Failed to create temporary directory\"\n> >>> +\texit 1\n> >>> +fi\n> >>> +\n> >>> +trap \"rm -rf ${install_dir}\" EXIT\n> >>> +\n> >>> +set -e\n> >>> +make -C \"${kernel_dir}\" O=\"${install_dir}\" headers_install\n> >>> +set +e\n> >>> +\n> >>> +# Copy the headers\n> >>> +headers=\"\n> >>> +\tdrm/drm_fourcc.h\n> >>> +\tlinux/dma-buf.h\n> >>> +\tlinux/dma-heap.h\n> >>> +\tlinux/media-bus-format.h\n> >>> +\tlinux/media.h\n> >>> +\tlinux/rkisp1-config.h\n> >>> +\tlinux/v4l2-common.h\n> >>> +\tlinux/v4l2-controls.h\n> >>> +\tlinux/v4l2-mediabus.h\n> >>> +\tlinux/v4l2-subdev.h\n> >>> +\tlinux/videodev2.h\n> >>> +\"\n> >>> +\n> >>> +for header in $headers ; do\n> >>> +\tname=$(basename \"${header}\")\n> >>> +\tcp \"${install_dir}/usr/include/${header}\" \"${header_dir}/${name}\"\n> >>> +done\n> >>> +\n> >>> +# The IPU3 header is a special case, as it's stored in staging. Handle it\n> >>> +# manually.\n> >>> +(cd \"${install_dir}\" ; \"${kernel_dir}scripts/headers_install.sh\" \\\n> >>> +\t\"${kernel_dir}/drivers/staging/media/ipu3/include/intel-ipu3.h\" \\\n> >>> +\t\"${header_dir}/intel-ipu3.h\")\n> >>> +\n> >>> +# Update the README file\n> >>> +version=$(git --git-dir=\"${kernel_dir}/.git\" describe)\n> >>\n> >> Should this have any other parameters?\n> >>\n> >>  --always --tags --dirty ?\n> > \n> > We're expected to run this on a kernel git tree, if it doesn't have any\n> > tag, there's something clearly wrong :-) --always shouldn't be needed.\n> > Similarly, for --tags, as we're tracking mainline tags are annotated.\n> > If there are local tags in a kernel tree on top a mailine tag, ignoring\n> > them would be less confusing I think.\n> \n> Are we always guaranteed to have pull tags locally?\n> \n> Aren't there conditions where the local git tree might not have the\n> tags? (Perhaps not, but that's why I suggested the always).\n\nIt's technically possible, but then I think it makes it a fairly bad\ncandidate as a source of upstream kernel headers. It's important to\nrecord the exact version where the headers come from, and most of the\ntime that should be an upstream tag.\n\n> > --dirty sounds good, and we should actually error out in that case. I'll\n> > submit a v2.\n> \n> Erroring out in that case sounds best indeed.\n> \n> >>> +\n> >>> +cat <<EOF > \"${header_dir}/README\"\n> >>> +# SPDX-License-Identifier: CC0-1.0\n> >>> +\n> >>> +Files in this directory are imported from ${version} of the Linux kernel. Do not\n> >>> +modify them manually.\n> >>> +EOF\n> >>> +\n> >>> +# Cleanup\n> >>> +rm -rf \"${install_dir}\"\n> >>> +\n> >>> +echo \"Kernel headers updated\"\n> >>\n> >> Are there any other manual steps required which should be mentioned at\n> >> the end of the script so they do not get missed by someone running it?\n> > \n> > How about this ?\n> > \n> > diff --git a/utils/update-kernel-headers.sh b/utils/update-kernel-headers.sh\n> > index f5d91c8a8c08..bb045d395359 100755\n> > --- a/utils/update-kernel-headers.sh\n> > +++ b/utils/update-kernel-headers.sh\n> > @@ -75,4 +75,9 @@ EOF\n> >  # Cleanup\n> >  rm -rf \"${install_dir}\"\n> > \n> > -echo \"Kernel headers updated\"\n> > +cat <<EOF\n> > +----------------------------------------------------------------------\n> > +Kernel headers updated. Please review and up-port local changes before\n> > +committing.\n> > +----------------------------------------------------------------------\n> > +EOF\n> > \n> >> Otherwise\n> >>\n> >> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 1EF43BD80C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon,  8 Mar 2021 14:51:15 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 940EA68AA4;\n\tMon,  8 Mar 2021 15:51:14 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1A60660520\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon,  8 Mar 2021 15:51:13 +0100 (CET)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7CBD8AC1;\n\tMon,  8 Mar 2021 15:51:12 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"FliUomtF\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1615215072;\n\tbh=hOCvKUj/PjPRTeLLldxwB+pj8S6rWFj5JOHWocAIpOg=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=FliUomtFwmjG49JWKA9n7CMTkEt6ztAxAB7zOWFPZZ8gbik04tN02h2WicHJW/KsW\n\tkon86Ag6rc23teUrmXof/j2XXuwPskywjhsSDn29IyY9Xg7CxcrpMP1x6kbTr/cUEo\n\tHmRMZzn+TCdhUIKOQ5DV3eLeQfOI3SYsrsSvOI3Y=","Date":"Mon, 8 Mar 2021 16:50:41 +0200","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Message-ID":"<YEY5wQ1kDHBbe8vq@pendragon.ideasonboard.com>","References":"<20210303173921.8801-1-laurent.pinchart@ideasonboard.com>\n\t<6b7e93c0-35dd-389b-4d55-55be7c547217@ideasonboard.com>\n\t<YEYhOWMh64t2eko/@pendragon.ideasonboard.com>\n\t<77f165a2-f42a-0a5a-cd3b-69e736cbfa6d@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<77f165a2-f42a-0a5a-cd3b-69e736cbfa6d@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH] utils: Add kernel headers update\n\tscript","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]