diff options
Diffstat (limited to 'meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb')
| -rw-r--r-- | meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb | 54 |
1 files changed, 24 insertions, 30 deletions
diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb index 7ad55d8b8c..363cdb9adf 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb @@ -1,22 +1,23 @@ # the binaries are statically linked against klibc SUMMARY = "Kexec tools, statically compiled against klibc" -AUTHOR = "Eric Biederman" HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/kexec/" SECTION = "kernel/userland" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a \ file://kexec/kexec.c;beginline=1;endline=20;md5=af10f6ae4a8715965e648aa687ad3e09" -PV = "2.0.18+git${SRCPV}" +PV = "2.0.18+git" DEPENDS = "zlib xz" -inherit klibc autotools +inherit klibc autotools siteinfo -SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git" +SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;branch=master" SRCREV = "5750980cdbbc33ef75bfba6660295b932376ce15" BUILD_PATCHES = "file://0001-force-static-build.patch \ - file://0002-Adjust-the-order-of-headers-to-fix-build-for-musl.patch" + file://0002-Adjust-the-order-of-headers-to-fix-build-for-musl.patch \ + file://Fix-building-on-x86_64-with-binutils-2.41.patch \ + " KLIBC_PATCHES += " \ file://0003-kexec-elf-rel-use-our-elf.h.patch \ @@ -32,7 +33,9 @@ KLIBC_PATCHES += " \ file://0013-sha256.h-avoid-inclusion-of-sys-types.h.patch \ file://0014-add-if_nameindex-from-musl.patch \ file://0015-vmcore-dmesg-fix-warning.patch \ - file://klibc-reboot.patch" + file://klibc-reboot.patch \ + file://include_next.patch \ + " WARNING_FIXES = "" FROM_OE_CORE = "file://arm_crashdump-fix-buffer-align.patch \ @@ -41,22 +44,22 @@ FROM_OE_CORE = "file://arm_crashdump-fix-buffer-align.patch \ SRC_URI += "${BUILD_PATCHES} ${KLIBC_PATCHES} ${WARNING_FIXES} ${FROM_OE_CORE}" -SRC_URI_append_arm = " file://arm_crashdump.patch" +SRC_URI:append:arm = " file://arm_crashdump.patch" -SRC_URI_append_mips = " file://140-mips_disable_devicetree_support.patch" -SRC_URI_append_mipsel = " file://140-mips_disable_devicetree_support.patch" +SRC_URI:append:mips = " file://140-mips_disable_devicetree_support.patch" +SRC_URI:append:mipsel = " file://140-mips_disable_devicetree_support.patch" -SRC_URI_append_x86 = " file://x86_sys_io.patch file://x86_basename.patch \ +SRC_URI:append:x86 = " file://x86_sys_io.patch file://x86_basename.patch \ file://x86_vfscanf.patch file://x86_kexec_test.patch" -SRC_URI_append_x86-64 = " file://x86_sys_io.patch file://x86_basename.patch \ +SRC_URI:append:x86-64 = " file://x86_sys_io.patch file://x86_basename.patch \ file://x86_vfscanf.patch file://x86_kexec_test.patch" -SRC_URI_append_aarch64 = " file://arm64_kexec-image-header.h-add-missing-le64toh.patch \ +SRC_URI:append:aarch64 = " file://arm64_kexec-image-header.h-add-missing-le64toh.patch \ file://arm64-crashdump-arm64.c-fix-warning.patch \ file://arm64_kexec-arm64.c-workaround-for-getrandom-syscall.patch" -SRC_URI_append_powerpc = " file://powerpc-purgatory-Makefile-remove-unknown-flags.patch" +SRC_URI:append:powerpc = " file://powerpc-purgatory-Makefile-remove-unknown-flags.patch" S = "${WORKDIR}/git" @@ -64,19 +67,10 @@ EXTRA_OECONF += "--without-zlib --without-lzma --without-xen" # fix purgatory/printf.c:2:10: fatal error: limits.h: No such file or directory # fix include/limits.h:42:10: fatal error: bitsize/limits.h: No such file or directory -COMMON_CFLAGS += "-O2 -I${STAGING_DIR_HOST}${libdir}/klibc/include -I${S}/purgatory/include" -CFLAGS_x86_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits32" -CFLAGS_x86-64_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits64" -CFLAGS_arm_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits32" -CFLAGS_aarch64_append = "${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits64" -CFLAGS_mips_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits32" -CFLAGS_mipsel_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits32" -CFLAGS_mips64_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits64" -CFLAGS_mips64el_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits64" -CFLAGS_powerpc_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits32" - - -do_compile_prepend() { +CFLAGS += "-O2 -I${STAGING_DIR_HOST}${libdir}/klibc/include -I${S}/purgatory/include \ + -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits${SITEINFO_BITS}" + +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 @@ -93,9 +87,9 @@ do_compile_prepend() { PACKAGES =+ "kexec-klibc vmcore-dmesg-klibc" -FILES_kexec-klibc = "${sbindir}/kexec" -FILES_vmcore-dmesg-klibc = "${sbindir}/vmcore-dmesg" +FILES:kexec-klibc = "${sbindir}/kexec" +FILES:vmcore-dmesg-klibc = "${sbindir}/vmcore-dmesg" -INSANE_SKIP_${PN} = "arch" +INSANE_SKIP:${PN} = "arch" COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*|powerpc.*|mips.*)-(linux|freebsd.*)' |