diff options
author | Hongzhi.Song <hongzhi.song@windriver.com> | 2018-08-13 18:46:10 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-08-19 16:09:28 -0700 |
commit | 86860bd860ac38a2afd35f939fdf4391c6f6fdc3 (patch) | |
tree | 377f3ff1b02082c5b4596a0ce87e75e00d4b5d0f /meta-oe | |
parent | a7792bd5f7fd9fb7e0c65a307edfa14477b2bedc (diff) | |
download | meta-openembedded-contrib-86860bd860ac38a2afd35f939fdf4391c6f6fdc3.tar.gz |
kernel-selftest: compatible with latest kernel
There are some new program added for bpf. So we make corresponding
modifications.
Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-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 34a869d1fe..e3514c81f3 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() { : } -do_patch[prefuncs] += "copy_kselftest_source_from_kernel remove_clang_related" +do_patch[prefuncs] += "copy_kselftest_source_from_kernel remove_unrelated" python copy_kselftest_source_from_kernel() { sources = (d.getVar("KERNEL_SELFTEST_SRC") or "").split() src_dir = d.getVar("STAGING_KERNEL_DIR") @@ -94,10 +94,10 @@ python copy_kselftest_source_from_kernel() { bb.utils.copyfile(src, dest) } -remove_clang_related() { +remove_unrelated() { if ${@bb.utils.contains('PACKAGECONFIG','bpf','true','false',d)} ; then test -f ${S}/tools/testing/selftests/bpf/Makefile && \ - sed -i -e '/test_pkt_access/d' -e '/test_pkt_md_access/d' ${S}/tools/testing/selftests/bpf/Makefile || \ + sed -i -e '/test_pkt_access/d' -e '/test_pkt_md_access/d' -e '/sockmap_verdict_prog/d' ${S}/tools/testing/selftests/bpf/Makefile || \ 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" fi } |