Skip to contentSkip to conversation

turbostat: copy bits.h from kernel to turbostat

PATCH New Martin Jansa 1 participant 1 message Jul 8, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 turbostat: copy bits.h from kernel to turbostat

From: Liwei Song <[email protected]>

because bits.h was included in msr-index.h, so we also need copy bits.h from kernel to tubostat to aviod compile error.

---
 meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb | 2 ++
 1 file changed, 2 insertions(+)
meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb +2 -0
index dc3e78febb..3f25e6f004 100644
@@ -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
Signature · 1 line
2.17.1