[libcamera-devel] utils: update-kernel-headers: Update path to intel-ipu3.h

15233 diff mbox series

The intel-ipu3.h header has moved in the v5.14 kernel. Update the kernel
headers update script accordingly.

While at it, add a missing directory separator to fix a failure when the
path to the kernel tree doesn't end with a /.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 utils/update-kernel-headers.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


base-commit: 030e6f389e2d0fa3f10a47634f3609378ccaf70e
prerequisite-patch-id: 2c7bab8c8f15090cf10a19aaed62e33de1264351
prerequisite-patch-id: 10478d16a049f895236c9b7bafcbe6d3a9b69ef9
prerequisite-patch-id: f6f3784841cc8648c6b6cfdd12b7903751856f75
prerequisite-patch-id: 41c39d0df627b7c1856cc8bc4d099f408983d6cd
prerequisite-patch-id: 80397d3462f248e4ca0e9f3bcb2d793178b03142
prerequisite-patch-id: 490c8f45203ef4d2281bddf2b36855ed99e1b2a4
prerequisite-patch-id: 06537d8dd2471934bca5772ddb6556a85a32ee9c
prerequisite-patch-id: e1c7842e5c488f6d3790a9c45b69974d8624dce4
prerequisite-patch-id: 55a68f42975a115ab642766965a5e6c8f2c07026
prerequisite-patch-id: 8601bcfa3c7da8d9984ac08e182610b5b52cbba9
prerequisite-patch-id: 8bb54baf7b5a46c0d14606c2f1020e943633954e
prerequisite-patch-id: f9b1926bdaa91bb4879b8e28f6849df8d6a9ae64
prerequisite-patch-id: 2c928f3693350ad60bff02897240e379ab8fab1a
prerequisite-patch-id: 651a51e9b14eb8ea497db106f3f9bf0be5a395fe

Hi Laurent,

Thank you for the patch

On 12/30/21 9:36 PM, Laurent Pinchart wrote:
> The intel-ipu3.h header has moved in the v5.14 kernel. Update the kernel
> headers update script accordingly.
>
> While at it, add a missing directory separator to fix a failure when the
> path to the kernel tree doesn't end with a /.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>


Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>

> ---
>   utils/update-kernel-headers.sh | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/utils/update-kernel-headers.sh b/utils/update-kernel-headers.sh
> index 3c3f34c77ad7..a006452e6836 100755
> --- a/utils/update-kernel-headers.sh
> +++ b/utils/update-kernel-headers.sh
> @@ -66,8 +66,8 @@ done
>   
>   # The IPU3 header is a special case, as it's stored in staging. Handle it
>   # manually.
> -(cd "${install_dir}" ; "${kernel_dir}scripts/headers_install.sh" \
> -	"${kernel_dir}/drivers/staging/media/ipu3/include/intel-ipu3.h" \
> +(cd "${install_dir}" ; "${kernel_dir}/scripts/headers_install.sh" \
> +	"${kernel_dir}/drivers/staging/media/ipu3/include/uapi/intel-ipu3.h" \
>   	"${header_dir}/intel-ipu3.h")
>   
>   # Update the README file
>
> base-commit: 030e6f389e2d0fa3f10a47634f3609378ccaf70e
> prerequisite-patch-id: 2c7bab8c8f15090cf10a19aaed62e33de1264351
> prerequisite-patch-id: 10478d16a049f895236c9b7bafcbe6d3a9b69ef9
> prerequisite-patch-id: f6f3784841cc8648c6b6cfdd12b7903751856f75
> prerequisite-patch-id: 41c39d0df627b7c1856cc8bc4d099f408983d6cd
> prerequisite-patch-id: 80397d3462f248e4ca0e9f3bcb2d793178b03142
> prerequisite-patch-id: 490c8f45203ef4d2281bddf2b36855ed99e1b2a4
> prerequisite-patch-id: 06537d8dd2471934bca5772ddb6556a85a32ee9c
> prerequisite-patch-id: e1c7842e5c488f6d3790a9c45b69974d8624dce4
> prerequisite-patch-id: 55a68f42975a115ab642766965a5e6c8f2c07026
> prerequisite-patch-id: 8601bcfa3c7da8d9984ac08e182610b5b52cbba9
> prerequisite-patch-id: 8bb54baf7b5a46c0d14606c2f1020e943633954e
> prerequisite-patch-id: f9b1926bdaa91bb4879b8e28f6849df8d6a9ae64
> prerequisite-patch-id: 2c928f3693350ad60bff02897240e379ab8fab1a
> prerequisite-patch-id: 651a51e9b14eb8ea497db106f3f9bf0be5a395fe

Quoting Laurent Pinchart (2021-12-30 16:06:11)
> The intel-ipu3.h header has moved in the v5.14 kernel. Update the kernel
> headers update script accordingly.
> 
> While at it, add a missing directory separator to fix a failure when the
> path to the kernel tree doesn't end with a /.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>  utils/update-kernel-headers.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/utils/update-kernel-headers.sh b/utils/update-kernel-headers.sh
> index 3c3f34c77ad7..a006452e6836 100755
> --- a/utils/update-kernel-headers.sh
> +++ b/utils/update-kernel-headers.sh
> @@ -66,8 +66,8 @@ done
>  
>  # The IPU3 header is a special case, as it's stored in staging. Handle it
>  # manually.
> -(cd "${install_dir}" ; "${kernel_dir}scripts/headers_install.sh" \
> -       "${kernel_dir}/drivers/staging/media/ipu3/include/intel-ipu3.h" \
> +(cd "${install_dir}" ; "${kernel_dir}/scripts/headers_install.sh" \
> +       "${kernel_dir}/drivers/staging/media/ipu3/include/uapi/intel-ipu3.h" \
>         "${header_dir}/intel-ipu3.h")
>  
>  # Update the README file
> 
> base-commit: 030e6f389e2d0fa3f10a47634f3609378ccaf70e
> prerequisite-patch-id: 2c7bab8c8f15090cf10a19aaed62e33de1264351
> prerequisite-patch-id: 10478d16a049f895236c9b7bafcbe6d3a9b69ef9
> prerequisite-patch-id: f6f3784841cc8648c6b6cfdd12b7903751856f75
> prerequisite-patch-id: 41c39d0df627b7c1856cc8bc4d099f408983d6cd
> prerequisite-patch-id: 80397d3462f248e4ca0e9f3bcb2d793178b03142
> prerequisite-patch-id: 490c8f45203ef4d2281bddf2b36855ed99e1b2a4
> prerequisite-patch-id: 06537d8dd2471934bca5772ddb6556a85a32ee9c
> prerequisite-patch-id: e1c7842e5c488f6d3790a9c45b69974d8624dce4
> prerequisite-patch-id: 55a68f42975a115ab642766965a5e6c8f2c07026
> prerequisite-patch-id: 8601bcfa3c7da8d9984ac08e182610b5b52cbba9
> prerequisite-patch-id: 8bb54baf7b5a46c0d14606c2f1020e943633954e
> prerequisite-patch-id: f9b1926bdaa91bb4879b8e28f6849df8d6a9ae64
> prerequisite-patch-id: 2c928f3693350ad60bff02897240e379ab8fab1a
> prerequisite-patch-id: 651a51e9b14eb8ea497db106f3f9bf0be5a395fe

Does it really require all those prerequisites ;-)

But the file is indeed there at the new location:

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> -- 
> Regards,
> 
> Laurent Pinchart
>