From b85968fed9abad9eda8388b4f70e175d33ba8cc6d66634c67eb98172f7e1f726 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Wed, 7 Nov 2018 08:19:17 +0000 Subject: [PATCH] osc copypac from project:devel:tools package:strace revision:96 OBS-URL: https://build.opensuse.org/package/show/devel:tools/strace?expand=0&rev=98 --- ...V4L2_CID_USER_IMX_BASE-Linux-kernel-.patch | 97 ------------ ...pdate-V4L2_CID_USER_-_BASE-constants.patch | 148 ------------------ strace.changes | 7 - strace.spec | 3 - 4 files changed, 255 deletions(-) delete mode 100644 0001-xlat-workaround-V4L2_CID_USER_IMX_BASE-Linux-kernel-.patch delete mode 100644 0002-xlat-update-V4L2_CID_USER_-_BASE-constants.patch diff --git a/0001-xlat-workaround-V4L2_CID_USER_IMX_BASE-Linux-kernel-.patch b/0001-xlat-workaround-V4L2_CID_USER_IMX_BASE-Linux-kernel-.patch deleted file mode 100644 index d7d380b..0000000 --- a/0001-xlat-workaround-V4L2_CID_USER_IMX_BASE-Linux-kernel-.patch +++ /dev/null @@ -1,97 +0,0 @@ -From: "Dmitry V. Levin" -Date: Sat, 18 Aug 2018 07:22:47 +0000 -Subject: xlat: workaround V4L2_CID_USER_IMX_BASE Linux kernel ABI breakage -Patch-mainline: yes -Git-commit: b89a69dec27cf638df0e17db80ed937c3e1abf77 - -Linux kernel commit v4.18-rc2-106-g421860b9d47053badce4b247576fa48df9ab4c48 -has changed the value of V4L2_CID_USER_IMX_BASE constant introduced -by commit v4.13-rc1~141^2~121 because the old value was already used -by V4L2_CID_USER_MAX217X_BASE. - -This is of course an ABI breakage that affects Linux kernels starting -with 4.13 and up to 4.18, as well as their LTS derivatives. - -Since the imx driver didn't provide any public control ID definitions, -it looks like the best way to handle this situation is to pretend that -the old value of V4L2_CID_USER_IMX_BASE didn't exist. - -* xlat/v4l2_control_id_bases.in (V4L2_CID_USER_IMX_BASE): Redefine. - -Co-Authored-by: Eugene Syromyatnikov -Signed-off-by: Jiri Slaby ---- - xlat/v4l2_control_id_bases.in | 17 ++++++++++++++++- - 1 file changed, 16 insertions(+), 1 deletion(-) - -diff --git a/xlat/v4l2_control_id_bases.in b/xlat/v4l2_control_id_bases.in -index a0359be9..f3fd9255 100644 ---- a/xlat/v4l2_control_id_bases.in -+++ b/xlat/v4l2_control_id_bases.in -@@ -2,7 +2,22 @@ V4L2_CID_BASE (V4L2_CTRL_CLASS_USER | 0x900) - V4L2_CID_USER_MEYE_BASE (V4L2_CID_BASE + 0x1000) - V4L2_CID_USER_BTTV_BASE (V4L2_CID_BASE + 0x1010) - V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE + 0x1050) --V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE + 0x1090) -+#ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE -+# define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE -+/* -+ * Linux kernel commit v4.18-rc2-106-g421860b9d47053badce4b247576fa48df9ab4c48 -+ * has changed the value of V4L2_CID_USER_IMX_BASE constant introduced -+ * by commit v4.13-rc1~141^2~121 because the old value was already used -+ * by V4L2_CID_USER_MAX217X_BASE. -+ * This is of course an ABI breakage that affects Linux kernels starting -+ * with 4.13 and up to 4.18, as well as their LTS derivatives. -+ * Since the imx driver didn't provide any public control ID definitions, -+ * it looks like the best way to handle this situation is to pretend that -+ * the old value of V4L2_CID_USER_IMX_BASE didn't exist. -+ */ -+# undef V4L2_CID_USER_IMX_BASE -+#endif -+V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE + 0x10b0) - V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900) - V4L2_CID_MPEG_CX2341X_BASE (V4L2_CTRL_CLASS_MPEG | 0x1000) - V4L2_CID_MPEG_MFC51_BASE (V4L2_CTRL_CLASS_MPEG | 0x1100) ---- a/xlat/v4l2_control_id_bases.h.old 2018-08-14 02:44:25.000000000 +0200 -+++ b/xlat/v4l2_control_id_bases.h 2018-10-24 16:36:26.090699789 +0200 -@@ -31,12 +31,16 @@ - #else - # define V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE + 0x1050) - #endif -+#ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE -+# define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE -+# undef V4L2_CID_USER_IMX_BASE -+#endif - #if defined(V4L2_CID_USER_IMX_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_IMX_BASE) && HAVE_DECL_V4L2_CID_USER_IMX_BASE) - DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE --static_assert((V4L2_CID_USER_IMX_BASE) == ((V4L2_CID_BASE + 0x1090)), "V4L2_CID_USER_IMX_BASE != (V4L2_CID_BASE + 0x1090)"); -+static_assert((V4L2_CID_USER_IMX_BASE) == ((V4L2_CID_BASE + 0x10b0)), "V4L2_CID_USER_IMX_BASE != (V4L2_CID_BASE + 0x10b0)"); - DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE - #else --# define V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE + 0x1090) -+# define V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE + 0x10b0) - #endif - #if defined(V4L2_CID_MPEG_BASE) || (defined(HAVE_DECL_V4L2_CID_MPEG_BASE) && HAVE_DECL_V4L2_CID_MPEG_BASE) - DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE -@@ -146,6 +150,21 @@ - XLAT(V4L2_CID_USER_MEYE_BASE), - XLAT(V4L2_CID_USER_BTTV_BASE), - XLAT(V4L2_CID_USER_TI_VPE_BASE), -+#ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE -+# define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE -+/* -+* Linux kernel commit v4.18-rc2-106-g421860b9d47053badce4b247576fa48df9ab4c48 -+* has changed the value of V4L2_CID_USER_IMX_BASE constant introduced -+* by commit v4.13-rc1~141^2~121 because the old value was already used -+* by V4L2_CID_USER_MAX217X_BASE. -+* This is of course an ABI breakage that affects Linux kernels starting -+* with 4.13 and up to 4.18, as well as their LTS derivatives. -+* Since the imx driver didn't provide any public control ID definitions, -+* it looks like the best way to handle this situation is to pretend that -+* the old value of V4L2_CID_USER_IMX_BASE didn't exist. -+*/ -+# undef V4L2_CID_USER_IMX_BASE -+#endif - XLAT(V4L2_CID_USER_IMX_BASE), - XLAT(V4L2_CID_MPEG_BASE), - XLAT(V4L2_CID_MPEG_CX2341X_BASE), diff --git a/0002-xlat-update-V4L2_CID_USER_-_BASE-constants.patch b/0002-xlat-update-V4L2_CID_USER_-_BASE-constants.patch deleted file mode 100644 index 7c288fc..0000000 --- a/0002-xlat-update-V4L2_CID_USER_-_BASE-constants.patch +++ /dev/null @@ -1,148 +0,0 @@ -From: "Dmitry V. Levin" -Date: Sat, 18 Aug 2018 07:22:47 +0000 -Subject: xlat: update V4L2_CID_USER_*_BASE constants -Patch-mainline: yes -Git-commit: 0f09267db00468b9204395c6990fc8816fd3c0e5 - -* xlat/v4l2_control_id_bases.in (V4L2_CID_USER_S2255_BASE, -V4L2_CID_USER_SI476X_BASE, V4L2_CID_USER_SAA7134_BASE, -V4L2_CID_USER_ADV7180_BASE, V4L2_CID_USER_TC358743_BASE, -V4L2_CID_USER_MAX217X_BASE): New constants. - -Signed-off-by: Jiri Slaby ---- - xlat/v4l2_control_id_bases.in | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/xlat/v4l2_control_id_bases.in b/xlat/v4l2_control_id_bases.in -index f3fd9255..a0f9ccae 100644 ---- a/xlat/v4l2_control_id_bases.in -+++ b/xlat/v4l2_control_id_bases.in -@@ -1,7 +1,13 @@ - V4L2_CID_BASE (V4L2_CTRL_CLASS_USER | 0x900) --V4L2_CID_USER_MEYE_BASE (V4L2_CID_BASE + 0x1000) --V4L2_CID_USER_BTTV_BASE (V4L2_CID_BASE + 0x1010) --V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE + 0x1050) -+V4L2_CID_USER_MEYE_BASE (V4L2_CID_BASE | 0x1000) -+V4L2_CID_USER_BTTV_BASE (V4L2_CID_BASE | 0x1010) -+V4L2_CID_USER_S2255_BASE (V4L2_CID_BASE | 0x1030) -+V4L2_CID_USER_SI476X_BASE (V4L2_CID_BASE | 0x1040) -+V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE | 0x1050) -+V4L2_CID_USER_SAA7134_BASE (V4L2_CID_BASE | 0x1060) -+V4L2_CID_USER_ADV7180_BASE (V4L2_CID_BASE | 0x1070) -+V4L2_CID_USER_TC358743_BASE (V4L2_CID_BASE | 0x1080) -+V4L2_CID_USER_MAX217X_BASE (V4L2_CID_BASE | 0x1090) - #ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE - # define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE - /* -@@ -17,7 +23,7 @@ V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE + 0x1050) - */ - # undef V4L2_CID_USER_IMX_BASE - #endif --V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE + 0x10b0) -+V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE | 0x10b0) - V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900) - V4L2_CID_MPEG_CX2341X_BASE (V4L2_CTRL_CLASS_MPEG | 0x1000) - V4L2_CID_MPEG_MFC51_BASE (V4L2_CTRL_CLASS_MPEG | 0x1100) ---- a/xlat/v4l2_control_id_bases.h 2018-10-24 16:38:06.020604843 +0200 -+++ b/xlat/v4l2_control_id_bases.h 2018-10-24 16:38:21.752904814 +0200 -@@ -12,24 +12,66 @@ - #endif - #if defined(V4L2_CID_USER_MEYE_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_MEYE_BASE) && HAVE_DECL_V4L2_CID_USER_MEYE_BASE) - DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE --static_assert((V4L2_CID_USER_MEYE_BASE) == ((V4L2_CID_BASE + 0x1000)), "V4L2_CID_USER_MEYE_BASE != (V4L2_CID_BASE + 0x1000)"); -+static_assert((V4L2_CID_USER_MEYE_BASE) == ((V4L2_CID_BASE | 0x1000)), "V4L2_CID_USER_MEYE_BASE != (V4L2_CID_BASE | 0x1000)"); - DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE - #else --# define V4L2_CID_USER_MEYE_BASE (V4L2_CID_BASE + 0x1000) -+# define V4L2_CID_USER_MEYE_BASE (V4L2_CID_BASE | 0x1000) - #endif - #if defined(V4L2_CID_USER_BTTV_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_BTTV_BASE) && HAVE_DECL_V4L2_CID_USER_BTTV_BASE) - DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE --static_assert((V4L2_CID_USER_BTTV_BASE) == ((V4L2_CID_BASE + 0x1010)), "V4L2_CID_USER_BTTV_BASE != (V4L2_CID_BASE + 0x1010)"); -+static_assert((V4L2_CID_USER_BTTV_BASE) == ((V4L2_CID_BASE | 0x1010)), "V4L2_CID_USER_BTTV_BASE != (V4L2_CID_BASE | 0x1010)"); - DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE - #else --# define V4L2_CID_USER_BTTV_BASE (V4L2_CID_BASE + 0x1010) -+# define V4L2_CID_USER_BTTV_BASE (V4L2_CID_BASE | 0x1010) -+#endif -+#if defined(V4L2_CID_USER_S2255_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_S2255_BASE) && HAVE_DECL_V4L2_CID_USER_S2255_BASE) -+DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE -+static_assert((V4L2_CID_USER_S2255_BASE) == ((V4L2_CID_BASE | 0x1030)), "V4L2_CID_USER_S2255_BASE != (V4L2_CID_BASE | 0x1030)"); -+DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE -+#else -+# define V4L2_CID_USER_S2255_BASE (V4L2_CID_BASE | 0x1030) -+#endif -+#if defined(V4L2_CID_USER_SI476X_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_SI476X_BASE) && HAVE_DECL_V4L2_CID_USER_SI476X_BASE) -+DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE -+static_assert((V4L2_CID_USER_SI476X_BASE) == ((V4L2_CID_BASE | 0x1040)), "V4L2_CID_USER_SI476X_BASE != (V4L2_CID_BASE | 0x1040)"); -+DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE -+#else -+# define V4L2_CID_USER_SI476X_BASE (V4L2_CID_BASE | 0x1040) - #endif - #if defined(V4L2_CID_USER_TI_VPE_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_TI_VPE_BASE) && HAVE_DECL_V4L2_CID_USER_TI_VPE_BASE) - DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE --static_assert((V4L2_CID_USER_TI_VPE_BASE) == ((V4L2_CID_BASE + 0x1050)), "V4L2_CID_USER_TI_VPE_BASE != (V4L2_CID_BASE + 0x1050)"); -+static_assert((V4L2_CID_USER_TI_VPE_BASE) == ((V4L2_CID_BASE | 0x1050)), "V4L2_CID_USER_TI_VPE_BASE != (V4L2_CID_BASE | 0x1050)"); -+DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE -+#else -+# define V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE | 0x1050) -+#endif -+#if defined(V4L2_CID_USER_SAA7134_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_SAA7134_BASE) && HAVE_DECL_V4L2_CID_USER_SAA7134_BASE) -+DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE -+static_assert((V4L2_CID_USER_SAA7134_BASE) == ((V4L2_CID_BASE | 0x1060)), "V4L2_CID_USER_SAA7134_BASE != (V4L2_CID_BASE | 0x1060)"); -+DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE -+#else -+# define V4L2_CID_USER_SAA7134_BASE (V4L2_CID_BASE | 0x1060) -+#endif -+#if defined(V4L2_CID_USER_ADV7180_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_ADV7180_BASE) && HAVE_DECL_V4L2_CID_USER_ADV7180_BASE) -+DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE -+static_assert((V4L2_CID_USER_ADV7180_BASE) == ((V4L2_CID_BASE | 0x1070)), "V4L2_CID_USER_ADV7180_BASE != (V4L2_CID_BASE | 0x1070)"); -+DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE -+#else -+# define V4L2_CID_USER_ADV7180_BASE (V4L2_CID_BASE | 0x1070) -+#endif -+#if defined(V4L2_CID_USER_TC358743_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_TC358743_BASE) && HAVE_DECL_V4L2_CID_USER_TC358743_BASE) -+DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE -+static_assert((V4L2_CID_USER_TC358743_BASE) == ((V4L2_CID_BASE | 0x1080)), "V4L2_CID_USER_TC358743_BASE != (V4L2_CID_BASE | 0x1080)"); -+DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE -+#else -+# define V4L2_CID_USER_TC358743_BASE (V4L2_CID_BASE | 0x1080) -+#endif -+#if defined(V4L2_CID_USER_MAX217X_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_MAX217X_BASE) && HAVE_DECL_V4L2_CID_USER_MAX217X_BASE) -+DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE -+static_assert((V4L2_CID_USER_MAX217X_BASE) == ((V4L2_CID_BASE | 0x1090)), "V4L2_CID_USER_MAX217X_BASE != (V4L2_CID_BASE | 0x1090)"); - DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE - #else --# define V4L2_CID_USER_TI_VPE_BASE (V4L2_CID_BASE + 0x1050) -+# define V4L2_CID_USER_MAX217X_BASE (V4L2_CID_BASE | 0x1090) - #endif - #ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE - # define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE -@@ -37,10 +79,10 @@ - #endif - #if defined(V4L2_CID_USER_IMX_BASE) || (defined(HAVE_DECL_V4L2_CID_USER_IMX_BASE) && HAVE_DECL_V4L2_CID_USER_IMX_BASE) - DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE --static_assert((V4L2_CID_USER_IMX_BASE) == ((V4L2_CID_BASE + 0x10b0)), "V4L2_CID_USER_IMX_BASE != (V4L2_CID_BASE + 0x10b0)"); -+static_assert((V4L2_CID_USER_IMX_BASE) == ((V4L2_CID_BASE | 0x10b0)), "V4L2_CID_USER_IMX_BASE != (V4L2_CID_BASE | 0x10b0)"); - DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE - #else --# define V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE + 0x10b0) -+# define V4L2_CID_USER_IMX_BASE (V4L2_CID_BASE | 0x10b0) - #endif - #if defined(V4L2_CID_MPEG_BASE) || (defined(HAVE_DECL_V4L2_CID_MPEG_BASE) && HAVE_DECL_V4L2_CID_MPEG_BASE) - DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE -@@ -149,7 +191,13 @@ - XLAT(V4L2_CID_BASE), - XLAT(V4L2_CID_USER_MEYE_BASE), - XLAT(V4L2_CID_USER_BTTV_BASE), -+ XLAT(V4L2_CID_USER_S2255_BASE), -+ XLAT(V4L2_CID_USER_SI476X_BASE), - XLAT(V4L2_CID_USER_TI_VPE_BASE), -+ XLAT(V4L2_CID_USER_SAA7134_BASE), -+ XLAT(V4L2_CID_USER_ADV7180_BASE), -+ XLAT(V4L2_CID_USER_TC358743_BASE), -+ XLAT(V4L2_CID_USER_MAX217X_BASE), - #ifndef STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE - # define STRACE_WORKAROUND_FOR_V4L2_CID_USER_IMX_BASE - /* diff --git a/strace.changes b/strace.changes index 6580f2f..8cb5217 100644 --- a/strace.changes +++ b/strace.changes @@ -21,13 +21,6 @@ Tue Oct 30 18:56:17 UTC 2018 - schwab@linux-m68k.org * Fixed test suite for the case when mlockall and unimplemented syscalls are explicitly disabled by a seccomp filter. -------------------------------------------------------------------- -Wed Oct 24 14:41:50 UTC 2018 - Jiri Slaby - -- fix build with kernel 4.19 - * add 0001-xlat-workaround-V4L2_CID_USER_IMX_BASE-Linux-kernel-.patch - * add 0002-xlat-update-V4L2_CID_USER_-_BASE-constants.patch - ------------------------------------------------------------------- Tue Aug 14 06:49:56 UTC 2018 - jslaby@suse.com diff --git a/strace.spec b/strace.spec index 595f376..2bd654c 100644 --- a/strace.spec +++ b/strace.spec @@ -29,8 +29,6 @@ Source: https://github.com/strace/strace/releases/download/v%{version}/% Source2: https://github.com/strace/strace/releases/download/v%{version}/%{name}-%{version}.tar.xz.asc Source3: %{name}.keyring Source4: baselibs.conf -Patch0: 0001-xlat-workaround-V4L2_CID_USER_IMX_BASE-Linux-kernel-.patch -Patch1: 0002-xlat-update-V4L2_CID_USER_-_BASE-constants.patch BuildRequires: haveged BuildRequires: libacl-devel BuildRequires: libaio-devel @@ -60,7 +58,6 @@ and processes can be seen. Child processes can also be tracked. %prep %setup -q -%autopatch -p1 %build %configure \