diff mbox series

[meta-oe,21/22] syzkaller: Fix build with musl + gcc14

Message ID 20240521181024.426176-21-raj.khem@gmail.com
State New
Headers show
Series [meta-oe,01/22] libsdl: Fix build with musl | expand

Commit Message

Khem Raj May 21, 2024, 6:10 p.m. UTC 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...ve-including-error.h-in-test_linux.h.patch | 29 +++++++++++++++++++
 .../recipes-test/syzkaller/syzkaller_git.bb   |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 meta-oe/recipes-test/syzkaller/syzkaller/0001-executor-Remove-including-error.h-in-test_linux.h.patch
diff mbox series

Patch

diff --git a/meta-oe/recipes-test/syzkaller/syzkaller/0001-executor-Remove-including-error.h-in-test_linux.h.patch b/meta-oe/recipes-test/syzkaller/syzkaller/0001-executor-Remove-including-error.h-in-test_linux.h.patch
new file mode 100644
index 0000000000..8bb19fb72b
--- /dev/null
+++ b/meta-oe/recipes-test/syzkaller/syzkaller/0001-executor-Remove-including-error.h-in-test_linux.h.patch
@@ -0,0 +1,29 @@ 
+From 648868595cf290e77aab1f271db2a57e1f791301 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 20 May 2024 20:37:07 -0700
+Subject: [PATCH] executor: Remove including <error.h> in test_linux.h
+
+it seems to be redundant and moreover it lets us compile on musl which
+does not provide this system header
+
+Upstream-Status: Submitted [https://github.com/google/syzkaller/pull/4822]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ executor/test_linux.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/executor/test_linux.h b/executor/test_linux.h
+index 7cf459569..8c9493539 100644
+--- a/executor/test_linux.h
++++ b/executor/test_linux.h
+@@ -1,7 +1,6 @@
+ // Copyright 2017 syzkaller project authors. All rights reserved.
+ // Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
+ 
+-#include <error.h>
+ #include <stdint.h>
+ #include <sys/utsname.h>
+ 
+-- 
+2.45.1
+
diff --git a/meta-oe/recipes-test/syzkaller/syzkaller_git.bb b/meta-oe/recipes-test/syzkaller/syzkaller_git.bb
index b43207f2a7..639f55de2f 100644
--- a/meta-oe/recipes-test/syzkaller/syzkaller_git.bb
+++ b/meta-oe/recipes-test/syzkaller/syzkaller_git.bb
@@ -9,6 +9,7 @@  GO_IMPORT = "github.com/google/syzkaller"
 SRC_URI = "git://${GO_IMPORT};protocol=https;destsuffix=${BPN}-${PV}/src/${GO_IMPORT};branch=master \
            file://0001-sys-targets-targets.go-allow-users-to-override-hardc.patch;patchdir=src/${GO_IMPORT} \
            file://0001-executor-Include-missing-linux-falloc.h.patch;patchdir=src/${GO_IMPORT} \
+           file://0001-executor-Remove-including-error.h-in-test_linux.h.patch;patchdir=src/${GO_IMPORT} \
            "
 SRCREV = "25905f5d0a2a7883bd33491997556193582c6059"