aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiwei Song <liwei.song@windriver.com>2019-05-24 01:52:17 -0400
committerArmin Kuster <akuster808@gmail.com>2019-06-15 07:15:39 -0700
commit7c6e1c674a2ce9cca8129c2dbf1d031be4e22f5e (patch)
tree006ee41797d1255d0cc7bffe87e922f0cb3f3d72
parent9814a993ba65cfd84a8707a22dc02a85082de513 (diff)
downloadmeta-openembedded-contrib-stable/warrior-nmut.tar.gz
meta-openembedded-contrib-stable/warrior-nmut.tar.bz2
meta-openembedded-contrib-stable/warrior-nmut.zip
turbostat: copy bits.h from kernel to turbostatstable/warrior-nmut
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 <liwei.song@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb b/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb
index dc3e78febb..3f25e6f004 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#<linux/bits.h>#"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