package/eudev: fix compile-time issue with very old kernel headers
PATCH v2 1/1 package/eudev: fix compile-time issue with very old kernel headers
Kernel versions prior to 3.4 did not have V4L2_CAP_DEVICE_CAPS and compiling against such a kernel will fail.
This patch introduces a version check and makes eudev fall back to v2cap.capabilities on these kernels.
Upstream: https://github.com/eudev-project/eudev/pull/247
---
Changes v1 -> v2 (suggested by Arnout Vandecappelle):
- Clarified description to talk about kernel *headers*
- Use a git-formatted patch instead
- Added a Signed-off-by line
- Added upstream reference
...mpile-time-issue-on-very-old-kernels.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/eudev/0002-Fix-compile-time-issue-on-very-old-kernels.patch
package/eudev/0002-Fix-compile-time-issue-on-very-old-kernels.patch new file +43 -0
@@ -0,0 +1,43 @@ +From 09b536e0b9d0964674936901ab9d2954f935c8b4 Mon Sep 17 00:00:00 2001 +From: Stefan Ott <[email protected]> +Date: Wed, 5 Apr 2023 18:20:37 +0200 +Subject: [PATCH] Fix compile-time issue on very old kernels + +Kernel versions prior to 3.4 did not have V4L2_CAP_DEVICE_CAPS and +compiling against such a kernel will fail. + +This patch introduces a version check and makes eudev fall back to +v2cap.capabilities on these kernels. + +Signed-off-by: Stefan Ott <[email protected]> +--- + src/v4l_id/v4l_id.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/v4l_id/v4l_id.c b/src/v4l_id/v4l_id.c +index 6bf45effe..702d5b687 100644 +--- a/src/v4l_id/v4l_id.c ++++ b/src/v4l_id/v4l_id.c +@@ -28,6 +28,7 @@ + #include <sys/types.h> + #include <sys/time.h> + #include <sys/ioctl.h> ++#include <linux/version.h> + #include <linux/videodev2.h> + + #include "util.h" +@@ -71,9 +72,11 @@ int main(int argc, char *argv[]) { + printf("ID_V4L_VERSION=2\n"); + printf("ID_V4L_PRODUCT=%s\n", v2cap.card); + printf("ID_V4L_CAPABILITIES=:"); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0) + if (v2cap.capabilities & V4L2_CAP_DEVICE_CAPS) + capabilities = v2cap.device_caps; + else ++#endif + capabilities = v2cap.capabilities; + if ((capabilities & V4L2_CAP_VIDEO_CAPTURE) > 0 || + (capabilities & V4L2_CAP_VIDEO_CAPTURE_MPLANE) > 0) +-- +2.40.0 +
Signature · 6 lines
2.40.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Yann E. MORIN
AppliedStefan, All,
On 2023-04-13 00:40 +0200, Stefan Ott via buildroot spake thusly:
Quoted 7 lines
Kernel versions prior to 3.4 did not have
V4L2_CAP_DEVICE_CAPSand compiling against such a kernel will fail.This patch introduces a version check and makes eudev fall back to v2cap.capabilities on these kernels.
I've moved the upstream reference into the patch itself, since that's where it'll be easier to find when we need to asses the patch status next time we bump the package.
And since the PR was accepted and merged, I've changed the reference to the commit URL.
Applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 68 lines
Signed-off-by Stefan Ott <[email protected]>---
Changes v1 -> v2 (suggested by Arnout Vandecappelle):
- Clarified description to talk about kernel *headers*
- Use a git-formatted patch instead
- Added a Signed-off-by line
- Added upstream reference...mpile-time-issue-on-very-old-kernels.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/eudev/0002-Fix-compile-time-issue-on-very-old-kernels.patchpackage/eudev/0002-Fix-compile-time-issue-on-very-old-kernels.patch new file +43
-0@@ -0,0 +1,43 @@ +From 09b536e0b9d0964674936901ab9d2954f935c8b4 Mon Sep 17 00:00:00 2001 +From: Stefan Ott <[email protected]> +Date: Wed, 5 Apr 2023 18:20:37 +0200 +Subject: [PATCH] Fix compile-time issue on very old kernels + +Kernel versions prior to 3.4 did not have V4L2_CAP_DEVICE_CAPS and +compiling against such a kernel will fail. + +This patch introduces a version check and makes eudev fall back to +v2cap.capabilities on these kernels. + +Signed-off-by: Stefan Ott <[email protected]> +--- + src/v4l_id/v4l_id.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/v4l_id/v4l_id.c b/src/v4l_id/v4l_id.c +index 6bf45effe..702d5b687 100644 +--- a/src/v4l_id/v4l_id.c ++++ b/src/v4l_id/v4l_id.c +@@ -28,6 +28,7 @@ + #include <sys/types.h> + #include <sys/time.h> + #include <sys/ioctl.h> ++#include <linux/version.h> + #include <linux/videodev2.h> + + #include "util.h" +@@ -71,9 +72,11 @@ int main(int argc, char *argv[]) { + printf("ID_V4L_VERSION=2\n"); + printf("ID_V4L_PRODUCT=%s\n", v2cap.card); + printf("ID_V4L_CAPABILITIES=:"); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0) + if (v2cap.capabilities & V4L2_CAP_DEVICE_CAPS) + capabilities = v2cap.device_caps; + else ++#endif + capabilities = v2cap.capabilities; + if ((capabilities & V4L2_CAP_VIDEO_CAPTURE) > 0 || + (capabilities & V4L2_CAP_VIDEO_CAPTURE_MPLANE) > 0) +-- +2.40.0 +Signature · 6 lines
2.40.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Stefan" == Stefan Ott via buildroot <[email protected]> writes:
Kernel versions prior to 3.4 did not have
V4L2_CAP_DEVICE_CAPSand compiling against such a kernel will fail.This patch introduces a version check and makes eudev fall back to v2cap.capabilities on these kernels.
Quoted 8 lines
Upstream: https://github.com/eudev-project/eudev/pull/247
Signed-off-by Stefan Ott <[email protected]>---
Changes v1 -> v2 (suggested by Arnout Vandecappelle):
- Clarified description to talk about kernel *headers*
- Use a git-formatted patch instead
- Added a Signed-off-by line
- Added upstream reference
Committed to 2023.02.x and 2022.02.x, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot