From e47efc9b90e8ecfe5b0b21f967001748fc111fbc Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Apr 2022 19:21:29 +0200 Subject: [PATCH] package/ltp-testsuite: fix static build Fix the following static build failure: /nvmedata/autobuild/instance-15/output-1/per-package/ltp-testsuite/host/bin/../lib/gcc/mipsel-buildroot-linux-uclibc/10.3.0/../../../../mipsel-buildroot-linux-uclibc/bin/ld: /nvmedata/autobuild/instance-15/output-1/per-package/ltp-testsuite/host/bin/../mipsel-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(syslog.os): in function `openlog': syslog.c:(.text+0x6b8): multiple definition of `openlog'; /tmp/ccvRnqfT.o:/nvmedata/autobuild/instance-15/output-1/build/ltp-testsuite-20220121/testcases/kernel/fs/fs-bench/random-access.c:14: first defined here Fixes: - http://autobuild.buildroot.org/results/bfd0d906a05564a4f323db604f3b908abf552b20 Signed-off-by: Fabrice Fontaine Reviewed-by: Petr Vorel Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...nel-fs-declare-int-openlog-as-static.patch | 77 +++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 package/ltp-testsuite/0002-testcases-kernel-fs-declare-int-openlog-as-static.patch diff --git a/package/ltp-testsuite/0002-testcases-kernel-fs-declare-int-openlog-as-static.patch b/package/ltp-testsuite/0002-testcases-kernel-fs-declare-int-openlog-as-static.patch new file mode 100644 index 0000000000..ae10bfcfdd --- /dev/null +++ b/package/ltp-testsuite/0002-testcases-kernel-fs-declare-int-openlog-as-static.patch @@ -0,0 +1,77 @@ +From 002ca0320cd2c5e1515bf202f470d4becdf01532 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 24 Apr 2022 21:56:36 +0200 +Subject: [PATCH] testcases/kernel/fs: declare int openlog as static + +Declare int openlog as static to avoid the following build failure when +building statically (e.g. on buildroot): + +/nvmedata/autobuild/instance-15/output-1/per-package/ltp-testsuite/host/bin/../lib/gcc/mipsel-buildroot-linux-uclibc/10.3.0/../../../../mipsel-buildroot-linux-uclibc/bin/ld: /nvmedata/autobuild/instance-15/output-1/per-package/ltp-testsuite/host/bin/../mipsel-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(syslog.os): in function `openlog': +syslog.c:(.text+0x6b8): multiple definition of `openlog'; /tmp/ccvRnqfT.o:/nvmedata/autobuild/instance-15/output-1/build/ltp-testsuite-20220121/testcases/kernel/fs/fs-bench/random-access.c:14: first defined here + +Fixes: + - http://autobuild.buildroot.org/results/bfd0d906a05564a4f323db604f3b908abf552b20 + +Signed-off-by: Fabrice Fontaine +Reviewed-by: Cyril Hrubis +[Retrieved from: +https://github.com/linux-test-project/ltp/commit/002ca0320cd2c5e1515bf202f470d4becdf01532] +--- + testcases/kernel/fs/fs-bench/random-access-del-create.c | 2 -- + testcases/kernel/fs/fs-bench/random-access.c | 2 +- + testcases/kernel/fs/fs-bench/random-del-create.c | 2 +- + testcases/kernel/fs/scsi/ltpfs/main.c | 2 +- + 4 files changed, 3 insertions(+), 5 deletions(-) + +diff --git a/testcases/kernel/fs/fs-bench/random-access-del-create.c b/testcases/kernel/fs/fs-bench/random-access-del-create.c +index 1f62a76b5e..1878fd78b5 100644 +--- a/testcases/kernel/fs/fs-bench/random-access-del-create.c ++++ b/testcases/kernel/fs/fs-bench/random-access-del-create.c +@@ -11,8 +11,6 @@ + #define FAIL 0 + #define SUCCESS 1 + +-int openlog[2] = { 0, 0 }; +- + #define MAXNUM 0x100000 + + #define MAXERROR 1024 +diff --git a/testcases/kernel/fs/fs-bench/random-access.c b/testcases/kernel/fs/fs-bench/random-access.c +index cf41d6e81c..c2f32b86e7 100644 +--- a/testcases/kernel/fs/fs-bench/random-access.c ++++ b/testcases/kernel/fs/fs-bench/random-access.c +@@ -11,7 +11,7 @@ + #define FAIL 0 + #define SUCCESS 1 + +-int openlog[2] = { 0, 0 }; ++static int openlog[2] = { 0, 0 }; + + #define MAXNUM 0x100000 + +diff --git a/testcases/kernel/fs/fs-bench/random-del-create.c b/testcases/kernel/fs/fs-bench/random-del-create.c +index 0a86f976f3..345031f283 100644 +--- a/testcases/kernel/fs/fs-bench/random-del-create.c ++++ b/testcases/kernel/fs/fs-bench/random-del-create.c +@@ -11,7 +11,7 @@ + #define FAIL 0 + #define SUCCESS 1 + +-int openlog[2] = { 0, 0 }; ++static int openlog[2] = { 0, 0 }; + + #define MAXNUM 0x100000 + +diff --git a/testcases/kernel/fs/scsi/ltpfs/main.c b/testcases/kernel/fs/scsi/ltpfs/main.c +index 2c67c7a478..90a5531ac3 100644 +--- a/testcases/kernel/fs/scsi/ltpfs/main.c ++++ b/testcases/kernel/fs/scsi/ltpfs/main.c +@@ -38,7 +38,7 @@ int startc = 0; + int showchar[] = { 124, 47, 45, 92, 124, 47, 45, 92 }; + + int nullFileHandle; +-int openlog[2] = { 0, 0 }; ++static int openlog[2] = { 0, 0 }; + + int cFileCount, dFileCount, errorCount; + static int disk_space_pool = 0;