From 0b7ad6f7f061e0cd7a3f267b23d411cc2bd44e00 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Wed, 5 Feb 2020 19:48:27 +0000 Subject: [PATCH] kernel: 5.4 fix build on darwin Fix typedef clash on darwin. HOSTCC scripts/mod/file2alias.o scripts/mod/file2alias.c:47:3: error: typedef redefinition with different types ('struct uuid_t' vs '__darwin_uuid_t' (aka 'unsigned char [16]')) } uuid_t; ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/sys/_types/_uuid_t.h:31:25: note: previous definition is here typedef __darwin_uuid_t uuid_t; ^ scripts/mod/file2alias.c:1305:42: error: array initializer must be an initializer list or string literal DEF_FIELD(symval, tee_client_device_id, uuid); ^ 2 errors generated. Signed-off-by: Kevin Darbyshire-Bryant --- .../211-darwin-uuid-typedef-clash.patch | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 target/linux/generic/hack-5.4/211-darwin-uuid-typedef-clash.patch diff --git a/target/linux/generic/hack-5.4/211-darwin-uuid-typedef-clash.patch b/target/linux/generic/hack-5.4/211-darwin-uuid-typedef-clash.patch new file mode 100644 index 00000000000..4a424c99c18 --- /dev/null +++ b/target/linux/generic/hack-5.4/211-darwin-uuid-typedef-clash.patch @@ -0,0 +1,27 @@ +From e44fc2af1ddc452b6659d08c16973d65c73b7d0a Mon Sep 17 00:00:00 2001 +From: Kevin Darbyshire-Bryant +Date: Wed, 5 Feb 2020 18:36:43 +0000 +Subject: [PATCH] file2alias: build on macos + +Signed-off-by: Kevin Darbyshire-Bryant +--- + scripts/mod/file2alias.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c +index c91eba751804..e756fd80b721 100644 +--- a/scripts/mod/file2alias.c ++++ b/scripts/mod/file2alias.c +@@ -38,6 +38,9 @@ typedef struct { + __u8 b[16]; + } guid_t; + ++#ifdef __APPLE__ ++#define uuid_t compat_uuid_t ++#endif + /* backwards compatibility, don't use in new code */ + typedef struct { + __u8 b[16]; +-- +2.21.1 (Apple Git-122.3) +