diff options
Diffstat (limited to 'meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb')
-rw-r--r-- | meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb index 34a869d1f..e3514c81f 100644 --- a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +++ b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb | |||
@@ -79,7 +79,7 @@ do_configure() { | |||
79 | : | 79 | : |
80 | } | 80 | } |
81 | 81 | ||
82 | do_patch[prefuncs] += "copy_kselftest_source_from_kernel remove_clang_related" | 82 | do_patch[prefuncs] += "copy_kselftest_source_from_kernel remove_unrelated" |
83 | python copy_kselftest_source_from_kernel() { | 83 | python copy_kselftest_source_from_kernel() { |
84 | sources = (d.getVar("KERNEL_SELFTEST_SRC") or "").split() | 84 | sources = (d.getVar("KERNEL_SELFTEST_SRC") or "").split() |
85 | src_dir = d.getVar("STAGING_KERNEL_DIR") | 85 | src_dir = d.getVar("STAGING_KERNEL_DIR") |
@@ -94,10 +94,10 @@ python copy_kselftest_source_from_kernel() { | |||
94 | bb.utils.copyfile(src, dest) | 94 | bb.utils.copyfile(src, dest) |
95 | } | 95 | } |
96 | 96 | ||
97 | remove_clang_related() { | 97 | remove_unrelated() { |
98 | if ${@bb.utils.contains('PACKAGECONFIG','bpf','true','false',d)} ; then | 98 | if ${@bb.utils.contains('PACKAGECONFIG','bpf','true','false',d)} ; then |
99 | test -f ${S}/tools/testing/selftests/bpf/Makefile && \ | 99 | test -f ${S}/tools/testing/selftests/bpf/Makefile && \ |
100 | sed -i -e '/test_pkt_access/d' -e '/test_pkt_md_access/d' ${S}/tools/testing/selftests/bpf/Makefile || \ | 100 | sed -i -e '/test_pkt_access/d' -e '/test_pkt_md_access/d' -e '/sockmap_verdict_prog/d' ${S}/tools/testing/selftests/bpf/Makefile || \ |
101 | bberror "Your kernel is probably older than 4.10 and doesn't have tools/testing/selftests/bpf/Makefile file from https://github.com/torvalds/linux/commit/5aa5bd14c5f8660c64ceedf14a549781be47e53d, disable bpf PACKAGECONFIG" | 101 | bberror "Your kernel is probably older than 4.10 and doesn't have tools/testing/selftests/bpf/Makefile file from https://github.com/torvalds/linux/commit/5aa5bd14c5f8660c64ceedf14a549781be47e53d, disable bpf PACKAGECONFIG" |
102 | fi | 102 | fi |
103 | } | 103 | } |