[PATCH 1/2] maint: update for linux v6.8-rc6

Gleb Fotengauer-Malinovskiy glebfm at altlinux.org
Sat Mar 2 13:19:59 UTC 2024


* maint/ioctls_sym.sh: Update a workaround for binder.h.
---
 maint/ioctls_sym.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/maint/ioctls_sym.sh b/maint/ioctls_sym.sh
index ffb731027..7d7bf7dd0 100755
--- a/maint/ioctls_sym.sh
+++ b/maint/ioctls_sym.sh
@@ -346,12 +346,12 @@ process_file()
 			;;
 		binder.h|*/binder.h)
 			# Convert enums to macros.
-			sed '/^enum binder/,/^};/d' < "$s" > "$tmpdir/$f"
-			sed -n '/^enum binder/,/^};/ s/^[[:space:]].*/&/p' < "$s" |
-			sed -e 's/^[[:space:]]*\([A-Z][A-Z_0-9]*\)[[:space:]]*=[[:space:]]*_\(IO\|IOW\|IOR\|IOWR\|IOC\)[[:space:]]*(/#define \1 _\2(/
-				s/^\(#define .*)\),$/\1/
-				s/^\(#define .*,\)$/\1 \\/
-				s/^\([[:space:]]\+[^),]\+)\),$/\1/' >> "$tmpdir/$f"
+			sed -E '/^enum (binder|\{)/,/^};/d' < "$s" > "$tmpdir/$f"
+			sed -En '/^enum (binder|\{)/,/^};/ s/^[[:space:]].*/&/p' < "$s" |
+			sed -n 's/^[[:space:]]*\([A-Z][A-Z_0-9]*\)[[:space:]]*=[[:space:]]*_\(IO\|IOW\|IOR\|IOWR\|IOC\)[[:space:]]*(/#define \1 _\2(/
+				s/^\(#define .*)\),$/\1/p
+				s/^\(#define .*,\)$/\1 \\/p
+				s/^\([[:space:]]\+[^),]\+)\),$/\1/p' >> "$tmpdir/$f"
 			;;
 		*drm/r128_drm.h)
 			# Filter out the code that references unknown types.
-- 
glebfm



More information about the Strace-devel mailing list