From 6cc88c4e9bd0179e9358339ce6d964a111694ead Mon Sep 17 00:00:00 2001 From: Nylon Chen Date: Tue, 30 Sep 2025 22:18:31 +1300 Subject: [PATCH] kernel-selftest: handle missing -64.h headers Some toolchains ship only bits/*.h without the -64.h suffix, causing the recipe to fail. Add a fallback to use *.h if *-64.h is not found, and warn if neither exists. Signed-off-by: Nylon Chen Signed-off-by: Joao Marcos Costa Signed-off-by: Khem Raj (cherry picked from commit 9472f4a728b4ec228605e387de32697312e8e549) Signed-off-by: Ankur Tyagi Signed-off-by: Gyorgy Sarvari --- .../recipes-kernel/kernel-selftest/kernel-selftest.bb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb index fed3fa81ad..432ca5c383 100644 --- a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +++ b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb @@ -89,7 +89,16 @@ either install it and add it to HOSTTOOLS, or add clang-native from meta-clang t install -Dm 0644 ${STAGING_KERNEL_BUILDDIR}/.config ${S}/include/config/auto.conf if [ "${SITEINFO_BITS}" != "32" ]; then for f in long-double endianness floatn struct_rwlock; do - cp ${RECIPE_SYSROOT}${includedir}/bits/$f-64.h ${S}/bits/$f-32.h + src_base="${RECIPE_SYSROOT}${includedir}/bits/${f}" + if [ -f "${src_base}-64.h" ]; then + src="${src_base}-64.h" + elif [ -f "${src_base}.h" ]; then + src="${src_base}.h" + else + bbwarn "Missing header for bits/${f}{-64,.h} under ${RECIPE_SYSROOT}${includedir}/bits skipped" + continue + fi + install -m 0644 "${src}" "${S}/bits/${f}-32.h" done fi oe_runmake -C ${S} headers