On 01/12/2023 18:13, Deborah Brouwer wrote:
> After v4l-utils is synced with the latest kernel headers, generate and
> apply patches for the changes that need to be made to the v4l2-tracer.
> This makes it easier to see how the kernel headers are changing the
> v4l2-tracer and also to revert those changes if necessary.
>
> Signed-off-by: Deborah Brouwer <deborah.brouwer@xxxxxxxxxxxxx>
> ---
> sync-with-kernel.sh | 27 +++++++++++++++++++++++++++
> 1 file changed, 27 insertions(+)
>
> diff --git a/sync-with-kernel.sh b/sync-with-kernel.sh
> index ad5681c6..8c9106aa 100755
> --- a/sync-with-kernel.sh
> +++ b/sync-with-kernel.sh
> @@ -115,8 +115,35 @@ function freebsd {
> quilt push -a
> }
>
> +function v4l2-tracer {
> + V4L2TRACERDIR="${TOPSRCDIR}/utils/v4l2-tracer"
> + V4L2TRACERSOURCES="${TOPSRCDIR}/include/linux/v4l2-controls.h "
> + V4L2TRACERSOURCES+="${TOPSRCDIR}/include/linux/videodev2.h "
> + V4L2TRACERSOURCES+="${TOPSRCDIR}/include/linux/media.h "
> + V4L2TRACERSOURCES+="${TOPSRCDIR}/include/linux/v4l2-common.h "
> +
> + V4L2TRACERTMPDIR=$(mktemp -d "${V4L2TRACERDIR}/v4l2-tracer-gen.XXXXXXXXXX")
That still doesn't work. This will now create a temp dir in V4L2TRACERDIR:
utils/v4l2-tracer/v4l2-tracer-gen.Jci48B9lCw/
That's not what you want either. If e.g. one of the patch commands fails, you'll
end up with an extra directory in utils/v4l2-tracer.
I've changed the line above to:
V4L2TRACERTMPDIR=$(mktemp --tmpdir -d "v4l2-tracer-gen.XXXXXXXXXX")
That creates a temp dir in /tmp, which is what you want.
I'll take this, with the above change as it is not worth the effort doing a v4.
Note that you can even install a trap handler in this script that will delete the
directory in case of Ctrl-C, but that's overkill in this case. Besides, if something
goes wrong you might want to be able to look at the contents of V4L2TRACERTMPDIR.
Regards,
Hans
> +
> + perl "${V4L2TRACERDIR}/v4l2-tracer-gen.pl" -o $V4L2TRACERTMPDIR $V4L2TRACERSOURCES
> +
> + diff -Naur "${V4L2TRACERDIR}/trace-gen.cpp" "${V4L2TRACERTMPDIR}/trace-gen.cpp" > "${V4L2TRACERTMPDIR}/trace-gen.patch"
> + diff -Naur "${V4L2TRACERDIR}/trace-gen.h" "${V4L2TRACERTMPDIR}/trace-gen.h" > "${V4L2TRACERTMPDIR}/trace-gen-h.patch"
> + diff -Naur "${V4L2TRACERDIR}/retrace-gen.cpp" "${V4L2TRACERTMPDIR}/retrace-gen.cpp" > "${V4L2TRACERTMPDIR}/retrace-gen.patch"
> + diff -Naur "${V4L2TRACERDIR}/retrace-gen.h" "${V4L2TRACERTMPDIR}/retrace-gen.h" > "${V4L2TRACERTMPDIR}/retrace-gen-h.patch"
> + diff -Naur "${V4L2TRACERDIR}/v4l2-tracer-info-gen.h" "${V4L2TRACERTMPDIR}/v4l2-tracer-info-gen.h" > "${V4L2TRACERTMPDIR}/v4l2-tracer-info-gen-h.patch"
> +
> + patch -d ${V4L2TRACERDIR} --no-backup-if-mismatch <${V4L2TRACERTMPDIR}/trace-gen.patch
> + patch -d ${V4L2TRACERDIR} --no-backup-if-mismatch <${V4L2TRACERTMPDIR}/trace-gen-h.patch
> + patch -d ${V4L2TRACERDIR} --no-backup-if-mismatch <${V4L2TRACERTMPDIR}/retrace-gen.patch
> + patch -d ${V4L2TRACERDIR} --no-backup-if-mismatch <${V4L2TRACERTMPDIR}/retrace-gen-h.patch
> + patch -d ${V4L2TRACERDIR} --no-backup-if-mismatch <${V4L2TRACERTMPDIR}/v4l2-tracer-info-gen-h.patch
> +
> + rm -r "$V4L2TRACERTMPDIR"
> +}
> +
> keytable
> libdvbv5
> freebsd
> ioctl-test
> xc3028-firmware
> +v4l2-tracer
