diff --git a/recipes-multimedia/libv4l2/libv4l2-minimal/0002-Replace-stat-fstat-calls-with-__xstat-__fxstat.patch b/recipes-multimedia/libv4l2/libv4l2-minimal/0002-Replace-stat-fstat-calls-with-__xstat-__fxstat.patch deleted file mode 100644 index c92589a5..00000000 --- a/recipes-multimedia/libv4l2/libv4l2-minimal/0002-Replace-stat-fstat-calls-with-__xstat-__fxstat.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 3c9366b04a0c1767ab40aef4abcf63208d146506 Mon Sep 17 00:00:00 2001 -From: Matt Madison -Date: Sun, 11 Apr 2021 06:48:54 -0700 -Subject: [PATCH 2/3] Replace stat/fstat calls with __xstat/__fxstat - -The stat-family syscalls were reworked in -glibc 2.33, so make the libv4lconvert plugin -compatible with the older glibc used in L4T -containers. - -Upstream-Status: Inappropriate [tegra platform-specific] - -Signed-off-by: Matt Madison ---- - lib/libv4lconvert/control/libv4lcontrol.c | 4 ++-- - utils/media-ctl/libmediactl.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/libv4lconvert/control/libv4lcontrol.c b/lib/libv4lconvert/control/libv4lcontrol.c -index 67671937..9de715b1 100644 ---- a/lib/libv4lconvert/control/libv4lcontrol.c -+++ b/lib/libv4lconvert/control/libv4lcontrol.c -@@ -370,10 +370,10 @@ static int v4lcontrol_get_usb_info(struct v4lcontrol_data *data, - "%s/sys/class/video4linux", sysfs_prefix); - - /* Check for sysfs mounted before trying to search */ -- if (stat(sysfs_name, &st) != 0) -+ if (__xstat(0, sysfs_name, &st) != 0) - return 0; /* Not found, sysfs not mounted? */ - -- if (fstat(data->fd, &st) || !S_ISCHR(st.st_mode)) -+ if (__fxstat(0, data->fd, &st) || !S_ISCHR(st.st_mode)) - return 0; /* Should never happen */ - - /* find ourselve in sysfs */ -diff --git a/utils/media-ctl/libmediactl.c b/utils/media-ctl/libmediactl.c -index 64ac8cf1..c702da98 100644 ---- a/utils/media-ctl/libmediactl.c -+++ b/utils/media-ctl/libmediactl.c -@@ -484,7 +484,7 @@ static int media_get_devname_sysfs(struct media_entity *entity) - } else { - sprintf(devname, "/dev/%s", p + 1); - } -- ret = stat(devname, &devstat); -+ ret = __xstat(0, devname, &devstat); - if (ret < 0) - return -errno; - --- -2.34.1 - diff --git a/recipes-multimedia/libv4l2/libv4l2-minimal_1.26.1.bb b/recipes-multimedia/libv4l2/libv4l2-minimal_1.26.1.bb index 20deb0e1..9f9ea4a6 100644 --- a/recipes-multimedia/libv4l2/libv4l2-minimal_1.26.1.bb +++ b/recipes-multimedia/libv4l2/libv4l2-minimal_1.26.1.bb @@ -13,7 +13,6 @@ GLIBC_64BIT_TIME_FLAGS = "" SRC_URI ="git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.26 \ file://0001-Make-plugin-directory-relative-to-ORIGIN.patch \ - file://0002-Replace-stat-fstat-calls-with-__xstat-__fxstat.patch \ file://0003-Update-conversion-defaults-to-match-NVIDIA-sources.patch \ " SRCREV = "4aee01a027923cab1e40969f56f8ba58d3e6c0d1"