From 8d5dcd6522e9d15e68637b6d7dda0401f9bb91d0 Mon Sep 17 00:00:00 2001 From: Liwei Song Date: Fri, 24 May 2019 01:52:17 -0400 Subject: turbostat: copy bits.h from kernel to turbostat because bits.h was included in msr-index.h, so we also need copy bits.h from kernel to tubostat to aviod compile error. Signed-off-by: Liwei Song Signed-off-by: Khem Raj Signed-off-by: Armin Kuster --- meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb b/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb index dc3e78feb..3f25e6f00 100644 --- a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb +++ b/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb @@ -41,11 +41,13 @@ 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}/tools/power/x86/turbostat/* ${S} cp -r ${WORKDIR}/COPYING ${S} } do_compile() { + sed -i 's##"bits.h"#' msr-index.h 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