Re: [oe][meta-oe][PATCH] turbostat: Fix build failure for missing kernel internal heaers and clean up

["Khem Raj" <raj.khem@gmail.com>]

Fails build on qemux86

https://errors.yoctoproject.org/Errors/Details/398664/

On Wed, Mar 25, 2020 at 3:57 AM He Zhe <zhe.he@windriver.com> wrote:
>
> From: He Zhe <zhe.he@windriver.com>
>
> To fix the following build failures
> turbostat.c:(.text+0xc28a): undefined reference to `UL'
> turbostat.c:33:10: fatal error: sys/capability.h: No such file or directory (for kernel v5.6-rc7)
>
> - Add dependency on libcap for kernel v5.6-rc7 and later versions
> - Copy internal linux/const.h used by previously added internal linux/bits.h
> - Tweak linux/const.h to allow it to refer to uapi const.h, as
>   linux-libc-headers purposely removes _UAPI from the locker macros of the
>   headers
> - Remove -I for kernel-source in EXTRA_OEMAKE, as linux-kernel-headers has
>   provided enough and necessary headers
>
> Signed-off-by: He Zhe <zhe.he@windriver.com>
> ---
>  meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb b/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb
> index 5f6588d..d2694b8 100644
> --- a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb
> +++ b/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb
> @@ -21,7 +21,7 @@ SRC_URI += "\
>              "
>
>  PACKAGE_ARCH = "${MACHINE_ARCH}"
> -DEPENDS = "virtual/kernel"
> +DEPENDS = "virtual/kernel libcap"
>
>  # This looks in S, so we better make sure there's
>  # something in the directory.
> @@ -30,8 +30,7 @@ do_populate_lic[depends] = "${PN}:do_configure"
>
>
>  EXTRA_OEMAKE = '\
> -                CC="${CC}" \
> -               'CFLAGS=-Wall -I${STAGING_KERNEL_DIR}/arch/x86/include/uapi ${LDFLAGS}' \
> +                CC="${CC}" 'CFLAGS=-Wall ${LDFLAGS}' \
>                 '
>
>  # If we build under STAGING_KERNEL_DIR, source will not be put
> @@ -43,12 +42,15 @@ do_configure_prepend() {
>         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}
>         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#<linux/const.h>#"const.h"#' bits.h
> +       sed -i -e 's#<uapi/linux/const.h>#<linux/const.h>#' -e 's#_LINUX_CONST_H#_LINUX_CONST_H_KERNEL#' const.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
> --
> 2.7.4
>
>