diff options
Diffstat (limited to 'meta-oe/recipes-test')
13 files changed, 192 insertions, 107 deletions
diff --git a/meta-oe/recipes-test/catch2/catch2_3.8.1.bb b/meta-oe/recipes-test/catch2/catch2_3.15.0.bb index 48ed26708c..e68fe9c885 100644 --- a/meta-oe/recipes-test/catch2/catch2_3.8.1.bb +++ b/meta-oe/recipes-test/catch2/catch2_3.15.0.bb | |||
| @@ -4,8 +4,8 @@ HOMEPAGE = "https://github.com/catchorg/Catch2" | |||
| 4 | LICENSE = "BSL-1.0" | 4 | LICENSE = "BSL-1.0" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" |
| 6 | 6 | ||
| 7 | SRC_URI = "git://github.com/catchorg/Catch2.git;branch=devel;protocol=https" | 7 | SRC_URI = "git://github.com/catchorg/Catch2.git;branch=devel;protocol=https;tag=v${PV}" |
| 8 | SRCREV = "2b60af89e23d28eefc081bc930831ee9d45ea58b" | 8 | SRCREV = "6ee0826dcae55ed1e06b2c5701981221e979e1e6" |
| 9 | 9 | ||
| 10 | 10 | ||
| 11 | inherit cmake python3native | 11 | inherit cmake python3native |
diff --git a/meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb b/meta-oe/recipes-test/cmocka/cmocka_2.0.2.bb index 09afe36666..11e8db87d8 100644 --- a/meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb +++ b/meta-oe/recipes-test/cmocka/cmocka_2.0.2.bb | |||
| @@ -4,12 +4,10 @@ platforms (including embedded) and with different compilers." | |||
| 4 | HOMEPAGE = "https://cmocka.org/" | 4 | HOMEPAGE = "https://cmocka.org/" |
| 5 | 5 | ||
| 6 | LICENSE = "Apache-2.0" | 6 | LICENSE = "Apache-2.0" |
| 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
| 8 | 8 | ||
| 9 | SRCREV = "a01cc69ee9536f90e57c61a198f2d1944d3d4313" | 9 | SRCREV = "fefa2b8a023121f7235e18ed17249e4012dd144f" |
| 10 | PV .= "+git" | 10 | SRC_URI = "git://git.cryptomilk.org/projects/cmocka.git;protocol=https;branch=stable-2.0;tag=cmocka-${PV} \ |
| 11 | SRC_URI = "git://git.cryptomilk.org/projects/cmocka.git;protocol=https;branch=stable-1.1 \ | ||
| 12 | file://0001-include-Check-for-previous-declaration-of-uintptr_t.patch \ | ||
| 13 | file://run-ptest \ | 11 | file://run-ptest \ |
| 14 | " | 12 | " |
| 15 | 13 | ||
diff --git a/meta-oe/recipes-test/cmocka/files/0001-include-Check-for-previous-declaration-of-uintptr_t.patch b/meta-oe/recipes-test/cmocka/files/0001-include-Check-for-previous-declaration-of-uintptr_t.patch deleted file mode 100644 index 65d30ea993..0000000000 --- a/meta-oe/recipes-test/cmocka/files/0001-include-Check-for-previous-declaration-of-uintptr_t.patch +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | From a54e035f802e79e3292d8ad39a14bd7c060eb7b1 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Breno Leitao <breno.leitao@gmail.com> | ||
| 3 | Date: Tue, 21 Mar 2023 21:58:28 -0700 | ||
| 4 | Subject: [PATCH] include: Check for previous declaration of uintptr_t | ||
| 5 | |||
| 6 | Adding a extra check before declaring uintptr_t. Currently musl uses | ||
| 7 | macro __DEFINED_uintptr_t once it defines uintptr_t type. Checking | ||
| 8 | this macro before defining it, and, defining it when uintptr_t is | ||
| 9 | defined. | ||
| 10 | |||
| 11 | Taken from Alpine | ||
| 12 | |||
| 13 | Upstream-Status: Pending | ||
| 14 | Signed-off-by: Breno Leitao <breno.leitao@gmail.com> | ||
| 15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 16 | --- | ||
| 17 | include/cmocka.h | 3 ++- | ||
| 18 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
| 19 | |||
| 20 | diff --git a/include/cmocka.h b/include/cmocka.h | ||
| 21 | index a21d965..f540793 100644 | ||
| 22 | --- a/include/cmocka.h | ||
| 23 | +++ b/include/cmocka.h | ||
| 24 | @@ -121,7 +121,7 @@ typedef uintmax_t LargestIntegralType; | ||
| 25 | ((LargestIntegralType)(value)) | ||
| 26 | |||
| 27 | /* Smallest integral type capable of holding a pointer. */ | ||
| 28 | -#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) && !defined(HAVE_UINTPTR_T) | ||
| 29 | +#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) && !defined(HAVE_UINTPTR_T) && !defined(__DEFINED_uintptr_t) | ||
| 30 | # if defined(_WIN32) | ||
| 31 | /* WIN32 is an ILP32 platform */ | ||
| 32 | typedef unsigned int uintptr_t; | ||
| 33 | @@ -147,6 +147,7 @@ typedef uintmax_t LargestIntegralType; | ||
| 34 | |||
| 35 | # define _UINTPTR_T | ||
| 36 | # define _UINTPTR_T_DEFINED | ||
| 37 | +# define __DEFINED_uintptr_t | ||
| 38 | #endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */ | ||
| 39 | |||
| 40 | /* Perform an unsigned cast to uintptr_t. */ | ||
| 41 | -- | ||
| 42 | 2.40.0 | ||
| 43 | |||
diff --git a/meta-oe/recipes-test/cunit/cunit_2.1-3.bb b/meta-oe/recipes-test/cunit/cunit_2.1-3.bb index 75ba477757..fd51e024bb 100644 --- a/meta-oe/recipes-test/cunit/cunit_2.1-3.bb +++ b/meta-oe/recipes-test/cunit/cunit_2.1-3.bb | |||
| @@ -34,3 +34,8 @@ FILES:${PN}-dev += "${datadir}/CUnit" | |||
| 34 | FILES:${PN}-doc += "${docdir}" | 34 | FILES:${PN}-doc += "${docdir}" |
| 35 | 35 | ||
| 36 | BBCLASSEXTEND = "native" | 36 | BBCLASSEXTEND = "native" |
| 37 | |||
| 38 | # NOTE: make clean | ||
| 39 | # CDPATH="${ZSH_VERSION+.}:" && cd . && /bin/sh /Users/aks/code/os/cunit/cunit/missing autoconf | ||
| 40 | # /bin/sh: 0: cannot open /Users/aks/code/os/cunit/cunit/missing: No such file | ||
| 41 | CLEANBROKEN = "1" | ||
diff --git a/meta-oe/recipes-test/googletest/files/run-ptest b/meta-oe/recipes-test/googletest/files/run-ptest new file mode 100644 index 0000000000..da46c68550 --- /dev/null +++ b/meta-oe/recipes-test/googletest/files/run-ptest | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | |||
| 3 | ctest | sed -u 's/\*\*\*/ /g' | awk '/Test +#/{gsub(/Passed/,"PASS"); gsub(/Failed/,"FAIL"); gsub(/Skipped/,"SKIP"); print $6": "$4; fflush();}' | ||
diff --git a/meta-oe/recipes-test/googletest/googletest_1.17.0.bb b/meta-oe/recipes-test/googletest/googletest_1.17.0.bb index c8ed80053d..4d5340b994 100644 --- a/meta-oe/recipes-test/googletest/googletest_1.17.0.bb +++ b/meta-oe/recipes-test/googletest/googletest_1.17.0.bb | |||
| @@ -7,15 +7,20 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a" | |||
| 7 | PROVIDES += "gmock gtest" | 7 | PROVIDES += "gmock gtest" |
| 8 | 8 | ||
| 9 | SRC_URI = "git://github.com/google/googletest.git;branch=v1.17.x;protocol=https \ | 9 | SRC_URI = "git://github.com/google/googletest.git;branch=v1.17.x;protocol=https \ |
| 10 | file://run-ptest \ | ||
| 10 | " | 11 | " |
| 11 | SRCREV = "52eb8108c5bdec04579160ae17225d66034bd723" | 12 | SRCREV = "52eb8108c5bdec04579160ae17225d66034bd723" |
| 12 | 13 | ||
| 13 | inherit cmake pkgconfig | 14 | inherit cmake pkgconfig ptest |
| 14 | 15 | ||
| 15 | # allow for shared libraries, but do not default to them | 16 | # allow for shared libraries, but do not default to them |
| 16 | # | 17 | # |
| 17 | PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,," | 18 | PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,," |
| 18 | 19 | ||
| 20 | EXTRA_OECMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', '-Dgtest_build_tests=ON -Dgmock_build_tests=ON', '', d)}" | ||
| 21 | |||
| 22 | DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'rsync-native', '', d)}" | ||
| 23 | |||
| 19 | CXXFLAGS:append = " -fPIC" | 24 | CXXFLAGS:append = " -fPIC" |
| 20 | 25 | ||
| 21 | ALLOW_EMPTY:${PN} = "1" | 26 | ALLOW_EMPTY:${PN} = "1" |
| @@ -35,3 +40,40 @@ do_configure:prepend() { | |||
| 35 | # there isn't python in HOSTTOOLS so "env python" fails | 40 | # there isn't python in HOSTTOOLS so "env python" fails |
| 36 | sed -i 's@^#!/usr/bin/env python$@#!/usr/bin/env python3@g' ${S}/googlemock/test/*py ${S}/googletest/test/*py | 41 | sed -i 's@^#!/usr/bin/env python$@#!/usr/bin/env python3@g' ${S}/googlemock/test/*py ${S}/googletest/test/*py |
| 37 | } | 42 | } |
| 43 | |||
| 44 | do_install_ptest() { | ||
| 45 | install -d ${D}${PTEST_PATH}/lib | ||
| 46 | |||
| 47 | ptest_libs="libshared_gmock_main.so \ | ||
| 48 | libgtest_dll.so \ | ||
| 49 | libgmock_main_no_exception.so \ | ||
| 50 | libgtest_main_no_exception.so \ | ||
| 51 | libgtest_no_exception.so \ | ||
| 52 | libgtest_main_no_rtti.so \ | ||
| 53 | " | ||
| 54 | for i in ${ptest_libs}; do | ||
| 55 | [ -f ${B}/lib/${i} ] && install -m 0755 ${B}/lib/${i} ${D}${PTEST_PATH}/lib | ||
| 56 | done | ||
| 57 | |||
| 58 | rsync -a ${B}/googletest ${D}${PTEST_PATH} \ | ||
| 59 | --exclude CMakeFiles \ | ||
| 60 | --exclude cmake_install.cmake \ | ||
| 61 | --exclude Makefile \ | ||
| 62 | --exclude generated | ||
| 63 | install -d ${D}${PTEST_PATH}/googletest/test | ||
| 64 | cp ${S}/googletest/test/*.py ${D}${PTEST_PATH}/googletest/test | ||
| 65 | cp ${S}/googletest/test/*.txt ${D}${PTEST_PATH}/googletest/test | ||
| 66 | rsync -a ${B}/googlemock ${D}${PTEST_PATH} \ | ||
| 67 | --exclude CMakeFiles \ | ||
| 68 | --exclude cmake_install.cmake \ | ||
| 69 | --exclude Makefile \ | ||
| 70 | --exclude generated | ||
| 71 | cp ${B}/CTestTestfile.cmake ${D}${PTEST_PATH} | ||
| 72 | sed -i -e 's#${B}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` | ||
| 73 | sed -i -e 's#${S}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` | ||
| 74 | sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` | ||
| 75 | sed -i -e 's#${PYTHON}#/usr/bin/python3#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` | ||
| 76 | sed -i -e 's#${WORKDIR}##g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` | ||
| 77 | } | ||
| 78 | |||
| 79 | RDEPENDS:${PN}-ptest += "cmake sed python3-datetime python3-difflib python3-json python3-xml python3-misc python3-unittest" | ||
diff --git a/meta-oe/recipes-test/libfaketime/libfaketime/0001-Add-const-qualifiers-to-fix-build-with-ISO-C23.patch b/meta-oe/recipes-test/libfaketime/libfaketime/0001-Add-const-qualifiers-to-fix-build-with-ISO-C23.patch new file mode 100644 index 0000000000..1696e7146e --- /dev/null +++ b/meta-oe/recipes-test/libfaketime/libfaketime/0001-Add-const-qualifiers-to-fix-build-with-ISO-C23.patch | |||
| @@ -0,0 +1,34 @@ | |||
| 1 | From dbe865dfdba0145d993d70b7fd4ec88b2f47554b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Tomas Korbar <tkorbar@redhat.com> | ||
| 3 | Date: Mon, 15 Dec 2025 11:03:21 +0100 | ||
| 4 | Subject: [PATCH] Add const qualifiers to fix build with ISO C23 | ||
| 5 | |||
| 6 | Fix https://github.com/wolfcw/libfaketime/issues/524 | ||
| 7 | |||
| 8 | Upstream-Status: Backport [https://github.com/wolfcw/libfaketime/pull/525] | ||
| 9 | --- | ||
| 10 | src/libfaketime.c | 4 ++-- | ||
| 11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/src/libfaketime.c b/src/libfaketime.c | ||
| 14 | index ef1dca9..02839c8 100644 | ||
| 15 | --- a/src/libfaketime.c | ||
| 16 | +++ b/src/libfaketime.c | ||
| 17 | @@ -2666,7 +2666,7 @@ int timespec_get(struct timespec *ts, int base) | ||
| 18 | static void parse_ft_string(const char *user_faked_time) | ||
| 19 | { | ||
| 20 | struct tm user_faked_time_tm; | ||
| 21 | - char * tmp_time_fmt; | ||
| 22 | + const char * tmp_time_fmt; | ||
| 23 | char * nstime_str; | ||
| 24 | |||
| 25 | if (!strncmp(user_faked_time, user_faked_time_saved, BUFFERLEN)) | ||
| 26 | @@ -3338,7 +3338,7 @@ static void prepare_config_contents(char *contents) | ||
| 27 | bool str_array_contains(const char *haystack, const char *needle) | ||
| 28 | { | ||
| 29 | size_t needle_len = strlen(needle); | ||
| 30 | - char *pos = strstr(haystack, needle); | ||
| 31 | + const char *pos = strstr(haystack, needle); | ||
| 32 | while (pos) { | ||
| 33 | if (pos == haystack || *(pos - 1) == ',') { | ||
| 34 | char nextc = *(pos + needle_len); | ||
diff --git a/meta-oe/recipes-test/libfaketime/libfaketime/0001-Makefile-Detect-compiler-in-makefile.patch b/meta-oe/recipes-test/libfaketime/libfaketime/0001-Makefile-Detect-compiler-in-makefile.patch deleted file mode 100644 index ff04837652..0000000000 --- a/meta-oe/recipes-test/libfaketime/libfaketime/0001-Makefile-Detect-compiler-in-makefile.patch +++ /dev/null | |||
| @@ -1,45 +0,0 @@ | |||
| 1 | From 735bb5d053efad274aa4ea5a6682e656ff792909 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Thu, 24 Aug 2023 01:49:48 -0700 | ||
| 4 | Subject: [PATCH] Makefile: Detect compiler in makefile | ||
| 5 | |||
| 6 | Add compiler specific options based on detected compiler gcc/clang | ||
| 7 | |||
| 8 | Upstream-Status: Pending | ||
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 10 | --- | ||
| 11 | src/Makefile | 18 +++++++++++++++++- | ||
| 12 | 1 file changed, 17 insertions(+), 1 deletion(-) | ||
| 13 | |||
| 14 | diff --git a/src/Makefile b/src/Makefile | ||
| 15 | index 62e924c..c15eb33 100644 | ||
| 16 | --- a/src/Makefile | ||
| 17 | +++ b/src/Makefile | ||
| 18 | @@ -110,7 +110,23 @@ PREFIX ?= /usr/local | ||
| 19 | LIBDIRNAME ?= /lib/faketime | ||
| 20 | PLATFORM ?=$(shell uname) | ||
| 21 | |||
| 22 | -CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_UTIME -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS) | ||
| 23 | +ifeq ($(shell $(CC) -v 2>&1 | grep -c "clang version"), 1) | ||
| 24 | +COMPILER := clang | ||
| 25 | +else | ||
| 26 | +COMPILER := gcc | ||
| 27 | +endif | ||
| 28 | +export COMPILER | ||
| 29 | + | ||
| 30 | +CFLAGS += -std=gnu99 -Wall -Wextra -Werror -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_UTIME -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS) | ||
| 31 | + | ||
| 32 | +ifeq ($(COMPILER),clang) | ||
| 33 | +CFLAGS += -Wno-tautological-pointer-compare | ||
| 34 | +endif | ||
| 35 | + | ||
| 36 | +ifeq ($(COMPILER),gcc) | ||
| 37 | +CFLAGS += -Wno-nonnull-compare | ||
| 38 | +endif | ||
| 39 | + | ||
| 40 | ifeq ($(PLATFORM),SunOS) | ||
| 41 | CFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 | ||
| 42 | endif | ||
| 43 | -- | ||
| 44 | 2.42.0 | ||
| 45 | |||
diff --git a/meta-oe/recipes-test/libfaketime/libfaketime_0.9.10.bb b/meta-oe/recipes-test/libfaketime/libfaketime_0.9.12.bb index 3588e96847..ea922309c3 100644 --- a/meta-oe/recipes-test/libfaketime/libfaketime_0.9.10.bb +++ b/meta-oe/recipes-test/libfaketime/libfaketime_0.9.12.bb | |||
| @@ -3,19 +3,20 @@ SECTION = "libs" | |||
| 3 | LICENSE = "GPL-2.0-only" | 3 | LICENSE = "GPL-2.0-only" |
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
| 5 | 5 | ||
| 6 | SRCREV = "d475b925943ad404c6c728ac868dc73949e7281c" | 6 | SRCREV = "3ccdd344aadf1e317156fa5fb7c881f2c4404778" |
| 7 | |||
| 8 | SRC_URI = "git://github.com/wolfcw/libfaketime.git;branch=master;protocol=https \ | ||
| 9 | file://0001-Makefile-Detect-compiler-in-makefile.patch \ | ||
| 10 | " | ||
| 11 | 7 | ||
| 8 | SRC_URI = "git://github.com/wolfcw/libfaketime.git;branch=master;tag=v${PV};protocol=https \ | ||
| 9 | file://0001-Add-const-qualifiers-to-fix-build-with-ISO-C23.patch \ | ||
| 10 | " | ||
| 12 | 11 | ||
| 13 | CFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE" | 12 | CFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE" |
| 14 | 13 | ||
| 15 | do_configure[noexec] = "1" | 14 | do_configure[noexec] = "1" |
| 15 | |||
| 16 | do_compile () { | 16 | do_compile () { |
| 17 | oe_runmake | 17 | oe_runmake |
| 18 | } | 18 | } |
| 19 | |||
| 19 | do_install () { | 20 | do_install () { |
| 20 | install -d ${D}${libdir}/faketime | 21 | install -d ${D}${libdir}/faketime |
| 21 | oe_libinstall -C src libfaketime ${D}${libdir}/faketime | 22 | oe_libinstall -C src libfaketime ${D}${libdir}/faketime |
diff --git a/meta-oe/recipes-test/rtc-testbench/files/0001-CMakeLists.txt-make-BPF-clang-and-include-paths-conf.patch b/meta-oe/recipes-test/rtc-testbench/files/0001-CMakeLists.txt-make-BPF-clang-and-include-paths-conf.patch new file mode 100644 index 0000000000..da1ea3bb33 --- /dev/null +++ b/meta-oe/recipes-test/rtc-testbench/files/0001-CMakeLists.txt-make-BPF-clang-and-include-paths-conf.patch | |||
| @@ -0,0 +1,54 @@ | |||
| 1 | From 53c57b337a51a47b0edca64d88ef9aaacce90044 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Rajkumar Patel <patel.rajkumar@oss.qualcomm.com> | ||
| 3 | Date: Wed, 10 Jun 2026 11:39:40 +0530 | ||
| 4 | Subject: [PATCH] CMakeLists.txt: make BPF clang and include paths configurable | ||
| 5 | for cross-builds | ||
| 6 | |||
| 7 | The upstream CMakeLists.txt hardcodes the clang binary name and | ||
| 8 | derives the BPF include path from CMAKE_C_LIBRARY_ARCHITECTURE, | ||
| 9 | which is empty in a cross-compilation environment. This causes | ||
| 10 | the BPF kernel programs to be compiled with the host clang and | ||
| 11 | -I /usr/include/ (the build host include path), which fails with: | ||
| 12 | |||
| 13 | fatal error: 'asm/types.h' file not found | ||
| 14 | |||
| 15 | Fix by converting the hardcoded values to CMake CACHE variables | ||
| 16 | so they can be overridden from the recipe via -DCLANG=, | ||
| 17 | -DBPF_INCLUDE_DIRS=, and -DBPF_EXTRA_FLAGS=. | ||
| 18 | |||
| 19 | Upstream-Status: Inappropriate [OE cross-compilation specific] | ||
| 20 | |||
| 21 | Signed-off-by: Rajkumar Patel <patel.rajkumar@oss.qualcomm.com> | ||
| 22 | --- | ||
| 23 | CMakeLists.txt | 12 +++++++++--- | ||
| 24 | 1 file changed, 9 insertions(+), 3 deletions(-) | ||
| 25 | |||
| 26 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 27 | index f782304..7f284f9 100644 | ||
| 28 | --- a/CMakeLists.txt | ||
| 29 | +++ b/CMakeLists.txt | ||
| 30 | @@ -174,15 +174,21 @@ include_directories("${PROJECT_BINARY_DIR}") | ||
| 31 | # | ||
| 32 | # Add code for compiling XDP eBPF programes. | ||
| 33 | # | ||
| 34 | -set(ASM_INCLUDE "/usr/include/${CMAKE_C_LIBRARY_ARCHITECTURE}") | ||
| 35 | +set(CLANG "clang" CACHE STRING "Clang binary used for BPF compilation") | ||
| 36 | +set(BPF_INCLUDE_DIRS "" CACHE STRING "Sysroot include path for BPF compilation") | ||
| 37 | +set(BPF_EXTRA_FLAGS "" CACHE STRING "Extra flags for BPF clang compilation (space-separated)") | ||
| 38 | + | ||
| 39 | +separate_arguments(BPF_EXTRA_FLAGS_LIST UNIX_COMMAND "${BPF_EXTRA_FLAGS}") | ||
| 40 | + | ||
| 41 | set(CLANG_FLAGS -Wall -O2 -fno-stack-protector | ||
| 42 | - -I ${ASM_INCLUDE} | ||
| 43 | + ${BPF_EXTRA_FLAGS_LIST} | ||
| 44 | + -I ${BPF_INCLUDE_DIRS} | ||
| 45 | -I ${PROJECT_BINARY_DIR} # required for app_config.h | ||
| 46 | ) | ||
| 47 | |||
| 48 | function(add_xdp_prog name) | ||
| 49 | add_custom_target(${name} ALL | ||
| 50 | - COMMAND clang ${CLANG_FLAGS} -target bpf -c -g -o ${CMAKE_BINARY_DIR}/${name}.o ${name}.c | ||
| 51 | + COMMAND ${CLANG} ${CLANG_FLAGS} -target bpf -c -g -o ${CMAKE_BINARY_DIR}/${name}.o ${name}.c | ||
| 52 | DEPENDS reference | ||
| 53 | WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src | ||
| 54 | SOURCES src/${name}.c | ||
diff --git a/meta-oe/recipes-test/rtc-testbench/rtc-testbench_5.4.bb b/meta-oe/recipes-test/rtc-testbench/rtc-testbench_5.4.bb new file mode 100644 index 0000000000..81a4d9d01b --- /dev/null +++ b/meta-oe/recipes-test/rtc-testbench/rtc-testbench_5.4.bb | |||
| @@ -0,0 +1,40 @@ | |||
| 1 | SUMMARY = "Real-time and non-real-time traffic validation tool for converged TSN networks" | ||
| 2 | |||
| 3 | DESCRIPTION = "The Linux RealTime Communication Testbench validates real-time \ | ||
| 4 | performance and robustness of hardware, drivers, and the Linux network stack on \ | ||
| 5 | TSN-enabled Ethernet networks. It generates and mirrors cyclic traffic using \ | ||
| 6 | AF_PACKET or AF_XDP with eBPF, supporting protocols like PROFINET and OPC UA PubSub." | ||
| 7 | |||
| 8 | HOMEPAGE = "https://github.com/Linutronix/RTC-Testbench" | ||
| 9 | LICENSE = "BSD-2-Clause & (GPL-2.0-only | BSD-2-Clause)" | ||
| 10 | LIC_FILES_CHKSUM = " \ | ||
| 11 | file://LICENSE;md5=f39e57686080f8752e19c4cd3e04e351 \ | ||
| 12 | file://LICENSES/BSD-2-Clause.txt;md5=9e16594a228301089d759b4f178db91f \ | ||
| 13 | file://LICENSES/GPL-2.0-only.txt;md5=3d26203303a722dedc6bf909d95ba815 \ | ||
| 14 | " | ||
| 15 | SRC_URI = " \ | ||
| 16 | git://github.com/Linutronix/RTC-Testbench.git;tag=v${PV};nobranch=1;protocol=https \ | ||
| 17 | file://0001-CMakeLists.txt-make-BPF-clang-and-include-paths-conf.patch \ | ||
| 18 | " | ||
| 19 | SRCREV = "bf016fdf422094f1ef65c0d88f148f46663ebbd8" | ||
| 20 | |||
| 21 | DEPENDS += " \ | ||
| 22 | libyaml \ | ||
| 23 | libbpf \ | ||
| 24 | xdp-tools \ | ||
| 25 | openssl \ | ||
| 26 | clang-native \ | ||
| 27 | " | ||
| 28 | |||
| 29 | inherit cmake pkgconfig | ||
| 30 | |||
| 31 | EXTRA_OECMAKE += " \ | ||
| 32 | -DRX_TIMESTAMP=ON \ | ||
| 33 | -DTX_TIMESTAMP=ON \ | ||
| 34 | -DCLANG=${STAGING_BINDIR_NATIVE}/clang \ | ||
| 35 | -DBPF_INCLUDE_DIRS=${STAGING_INCDIR} \ | ||
| 36 | -DBPF_EXTRA_FLAGS='-D__${TARGET_ARCH}__ -ffile-prefix-map=${S}=${TARGET_DBGSRC_DIR} -ffile-prefix-map=${STAGING_DIR_HOST}=' \ | ||
| 37 | " | ||
| 38 | |||
| 39 | # Require bash since installed scripts use /bin/bash shebang | ||
| 40 | RDEPENDS:${PN} += "bash" | ||
diff --git a/meta-oe/recipes-test/syzkaller/syzkaller-licenses.inc b/meta-oe/recipes-test/syzkaller/syzkaller-licenses.inc index af118a4dd4..65306a17d0 100644 --- a/meta-oe/recipes-test/syzkaller/syzkaller-licenses.inc +++ b/meta-oe/recipes-test/syzkaller/syzkaller-licenses.inc | |||
| @@ -79,5 +79,5 @@ LIC_FILES_CHKSUM_HOST = "\ | |||
| 79 | file://pkg/mod/google.golang.org/appengine/v2@v2.0.6/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ | 79 | file://pkg/mod/google.golang.org/appengine/v2@v2.0.6/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57;spdx=Apache-2.0 \ |
| 80 | " | 80 | " |
| 81 | 81 | ||
| 82 | LIC_FILES_CHKSUM:class-native += "${LIC_FILES_CHKSUM_HOST}" | 82 | LIC_FILES_CHKSUM:append:class-native = " ${LIC_FILES_CHKSUM_HOST}" |
| 83 | LIC_FILES_CHKSUM:class-nativesdk += "${LIC_FILES_CHKSUM_HOST}" | 83 | LIC_FILES_CHKSUM:append:class-nativesdk = " ${LIC_FILES_CHKSUM_HOST}" |
diff --git a/meta-oe/recipes-test/syzkaller/syzkaller_git.bb b/meta-oe/recipes-test/syzkaller/syzkaller_git.bb index e35a8a77be..bdd4cf6a40 100644 --- a/meta-oe/recipes-test/syzkaller/syzkaller_git.bb +++ b/meta-oe/recipes-test/syzkaller/syzkaller_git.bb | |||
| @@ -6,8 +6,6 @@ LICENSE = "Apache-2.0" | |||
| 6 | LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=5335066555b14d832335aa4660d6c376" | 6 | LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=5335066555b14d832335aa4660d6c376" |
| 7 | require ${BPN}-licenses.inc | 7 | require ${BPN}-licenses.inc |
| 8 | 8 | ||
| 9 | DEPENDS:class-native += "qemu-system-native" | ||
| 10 | |||
| 11 | SRC_URI = "git://${GO_IMPORT};protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX};branch=master" | 9 | SRC_URI = "git://${GO_IMPORT};protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX};branch=master" |
| 12 | SRCREV = "22ec1469fe8c0ba256de07e8f97fa7b375b522bd" | 10 | SRCREV = "22ec1469fe8c0ba256de07e8f97fa7b375b522bd" |
| 13 | require ${BPN}-go-mods.inc | 11 | require ${BPN}-go-mods.inc |
| @@ -39,8 +37,6 @@ GOBUILDFLAGS:remove = "-buildmode=pie" | |||
| 39 | 37 | ||
| 40 | LDFLAGS:append:class-target = "${@bb.utils.contains_any("TC_CXX_RUNTIME", "llvm android", " -lc++", " -lstdc++", d)}" | 38 | LDFLAGS:append:class-target = "${@bb.utils.contains_any("TC_CXX_RUNTIME", "llvm android", " -lc++", " -lstdc++", d)}" |
| 41 | 39 | ||
| 42 | DEPENDS:class-native += "qemu-system-native" | ||
| 43 | |||
| 44 | compile_native() { | 40 | compile_native() { |
| 45 | export HOSTOS="${GOHOSTOS}" | 41 | export HOSTOS="${GOHOSTOS}" |
| 46 | export HOSTARCH="${GOHOSTARCH}" | 42 | export HOSTARCH="${GOHOSTARCH}" |
