From 90bcc2bd494c2c7a0a43e1d0c4943cdd061e929d Mon Sep 17 00:00:00 2001 From: Yanfei Xu Date: Fri, 22 May 2020 16:14:42 +0800 Subject: turbostat: fix the build failure for new v5.7-rc6 kernel Due to the new v5.7-rc6 kernel has some modify in header files, turbostat build failed. Now match the files. Signed-off-by: Yanfei Xu Signed-off-by: Khem Raj --- meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'meta-oe/recipes-kernel') diff --git a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb b/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb index 60040a47af..48c72140c8 100644 --- a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb +++ b/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb @@ -42,16 +42,28 @@ do_configure_prepend() { mkdir -p ${S} cp -r ${STAGING_KERNEL_DIR}/arch/x86/include/asm/msr-index.h ${S} cp -r ${STAGING_KERNEL_DIR}/arch/x86/include/asm/intel-family.h ${S} - cp -r ${STAGING_KERNEL_DIR}/include/linux/bits.h ${S} - cp -r ${STAGING_KERNEL_DIR}/include/linux/const.h ${S} + if [ -f "${STAGING_KERNEL_DIR}/include/vdso/bits.h" ]; then + cp -r ${STAGING_KERNEL_DIR}/include/vdso/bits.h ${S} + cp -r ${STAGING_KERNEL_DIR}/include/vdso/const.h ${S} + else + cp -r ${STAGING_KERNEL_DIR}/include/linux/bits.h ${S} + cp -r ${STAGING_KERNEL_DIR}/include/linux/const.h ${S} + fi cp -r ${STAGING_KERNEL_DIR}/tools/power/x86/turbostat/* ${S} cp -r ${WORKDIR}/COPYING ${S} } + do_compile() { sed -i 's##"bits.h"#' msr-index.h - sed -i 's##"const.h"#' bits.h - sed -i -e 's###' -e 's#_LINUX_CONST_H#_LINUX_CONST_H_KERNEL#' const.h + 'TMPCHECK='grep "" bits.h'' || true + if [ -n $TMPCHECK ]; then + sed -i 's##"const.h"#' bits.h + sed -i 's###' const.h + else + sed -i 's##"const.h"#' bits.h + sed -i -e 's###' -e 's#_LINUX_CONST_H#_LINUX_CONST_H_KERNEL#' const.h + fi sed -i 's#MSRHEADER#"msr-index.h"#' turbostat.c sed -i 's#INTEL_FAMILY_HEADER#"intel-family.h"#' turbostat.c sed -i 's#\$(CC) \$(CFLAGS) \$< -o \$(BUILD_OUTPUT)/\$@#\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< -o \$(BUILD_OUTPUT)/\$@#' Makefile -- cgit v1.2.3-54-g00ecf