[oe] [meta-initramfs][PATCH] kexec-tools-klibc: update to fix build issues after core changes.

[Manjukumar Harthikote Matha]

> -----Original Message-----
> From: openembedded-devel-bounces at lists.openembedded.org
> [mailto:openembedded-devel-bounces at lists.openembedded.org] On Behalf Of
> Armin Kuster
> Sent: Thursday, January 04, 2018 9:32 AM
> To: akuster at mvista.com; openembedded-devel at lists.openembedded.org
> Subject: [oe] [meta-initramfs][PATCH] kexec-tools-klibc: update to fix build issues
> after core changes.
> 
> Parsing recipes...ERROR: ParseError at ../meta-initramfs/recipes-
> kernel/kexec/kexec-tools-klibc_2.0.2.bb:2: Could not include required file recipes-
> kernel/kexec/kexec-tools.inc
> 
> This was introduced by:
> http://cgit.openembedded.org/openembedded-
> core/commit/?id=491f6d523b72b91dc7b186a6f273756435804581
> 
> removed the kexec-tools.inc so place those changes into the recipe.
> 
> Signed-off-by: Armin Kuster <akuster808 at gmail.com>

Tested-by: Jaewon Lee <jaewon.lee at xilinx.com>
Acked-by: Manjukumar Matha <manjukumar.harthikote-matha at xilinx.com>

Thanks,
Manju


> ---
>  .../kexec/kexec-tools-klibc_2.0.2.bb               | 33 +++++++++++++++++++---
>  1 file changed, 29 insertions(+), 4 deletions(-)
> 
> diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb b/meta-
> initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb
> index 49c53a3..1c37531 100644
> --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb
> +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb
> @@ -1,10 +1,16 @@
>  # the binaries are statically linked against klibc -require recipes-kernel/kexec/kexec-
> tools.inc
>  SUMMARY = "Kexec tools, statically compiled against klibc"
> -SRC_URI[md5sum] = "92eff93b097475b7767f8c98df84408a"
> -SRC_URI[sha256sum] =
> "09e180ff36dee087182cdc939ba6c6917b6adbb5fc12d589f31fd3659b6471f2"
> +AUTHOR = "Eric Biederman"
> +HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/kexec/"
> +SECTION = "kernel/userland"
> +LICENSE = "GPLv2"
> +LIC_FILES_CHKSUM =
> "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a \
> +
> file://kexec/kexec.c;beginline=1;endline=20;md5=af10f6ae4a8715965e648aa687a
> d3e09"
> +DEPENDS = "zlib xz"
> 
> -inherit klibc
> +PR = "r1"
> +
> +inherit klibc autotools
> 
>  FILESPATH =. "${FILE_DIRNAME}/kexec-tools-${PV}:"
> 
> @@ -35,7 +41,26 @@ EXTRA_OECONF += "--without-zlib --without-lzma --
> without-xen"
>  CFLAGS += "-I${STAGING_DIR_HOST}${libdir}/klibc/include -
> I${STAGING_DIR_HOST}${libdir}/klibc/include/bits32"
>  CFLAGS_x86-64 += "-I${STAGING_DIR_HOST}${libdir}/klibc/include -
> I${STAGING_DIR_HOST}${libdir}/klibc/include/bits64"
> 
> +do_compile_prepend() {
> +    # Remove the prepackaged config.h from the source tree as it overrides
> +    # the same file generated by configure and placed in the build tree
> +    rm -f ${S}/include/config.h
> +
> +    # Remove the '*.d' file to make sure the recompile is OK
> +    for dep in `find ${B} -type f -name '*.d'`; do
> +        dep_no_d="`echo $dep | sed 's#.d$##'`"
> +        # Remove file.d when there is a file.o
> +        if [ -f "$dep_no_d.o" ]; then
> +            rm -f $dep
> +        fi
> +    done
> +}
> +
>  PACKAGES =+ "kexec-klibc kdump-klibc"
> 
>  FILES_kexec-klibc = "${sbindir}/kexec"
>  FILES_kdump-klibc = "${sbindir}/kdump"
> +
> +INSANE_SKIP_${PN} = "arch"
> +
> +COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*|powerpc.*|mips.*)-
> (linux|freebsd.*)'
> --
> 2.7.4
> 
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel