From 000a3b5a0b2fd886d000bded2145d8628cc73401 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Thu, 16 Apr 2020 11:19:27 +0300 Subject: xorg-xserver: remove duplicated patch The patch 0003-Remove-check-for-useSIGIO-option.patch has been added to xorg-server recipe on meta-freescale layer [1]. Reapplying this patch causes the build error [2]. Remove this patch from the meta-toradex-nxp layer. [1] 07d4a6baa23ec3a1f013f8a070130598b56aec7c xserver-xorg: Backport to fix X server 1.20.1 crash [YOCIMX-3280] [2] ------------------------ ERROR: xserver-xorg-2_1.20.1-r0 do_patch: Command Error: 'quilt --quiltrc /oe-core/build/tmp/work/armv7at2hf-neon-mx6qdl-tdx-linux-gnueabi/ xserver-xorg/2_1.20.1-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output: Patch 0003-Remove-check-for-useSIGIO-option.patch is already applied; check your series file ------------------------ Signed-off-by: Oleksandr Suvorov --- .../0003-Remove-check-for-useSIGIO-option.patch | 47 ---------------------- .../xorg-xserver/xserver-xorg_1.20.%.bbappend | 3 -- 2 files changed, 50 deletions(-) delete mode 100644 recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch delete mode 100644 recipes-graphics/xorg-xserver/xserver-xorg_1.20.%.bbappend diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch deleted file mode 100644 index beed6cb..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch +++ /dev/null @@ -1,47 +0,0 @@ -From cf407b16cd65ad6e26a9c8e5984e163409a5c0f7 Mon Sep 17 00:00:00 2001 -From: Prabhu Sundararaj -Date: Mon, 30 Jan 2017 16:32:06 -0600 -Subject: [PATCH] Remove check for useSIGIO option - -Commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 removes the configure of useSIGIO -option. - -As the xfree86 SIGIO support is reworked to use internal versions of OsBlockSIGIO -and OsReleaseSIGIO. - -No longer the check for useSIGIO is needed - -Upstream-Status: Pending - -Signed-off-by: Prabhu Sundararaj ---- - hw/xfree86/os-support/shared/sigio.c | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c -index 884a71c..be76498 100644 ---- a/hw/xfree86/os-support/shared/sigio.c -+++ b/hw/xfree86/os-support/shared/sigio.c -@@ -185,9 +185,6 @@ xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), void *closure) - int i; - int installed = FALSE; - -- if (!xf86Info.useSIGIO) -- return 0; -- - for (i = 0; i < MAX_FUNCS; i++) { - if (!xf86SigIOFuncs[i].f) { - if (xf86IsPipe(fd)) -@@ -256,9 +253,6 @@ xf86RemoveSIGIOHandler(int fd) - int max; - int ret; - -- if (!xf86Info.useSIGIO) -- return 0; -- - max = 0; - ret = 0; - for (i = 0; i < MAX_FUNCS; i++) { --- -2.7.4 - diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.20.%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_1.20.%.bbappend deleted file mode 100644 index fd0d723..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg_1.20.%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI_append_mx6 = " file://0003-Remove-check-for-useSIGIO-option.patch" -- cgit v1.2.3