From c61dc077bbd81260e4f167fa2251643ba0ba6974 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 29 Jul 2021 17:04:53 +0200 Subject: Convert to new override syntax This is the result of automated script (0.9.1) conversion: oe-core/scripts/contrib/convert-overrides.py . converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Martin Jansa --- meta-initramfs/classes/klibc.bbclass | 8 +++--- .../recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb | 4 +-- .../recipes-bsp/kexecboot/kexecboot_git.bb | 6 ++--- .../initrdscripts/initramfs-debug_1.0.bb | 2 +- .../packagegroups/packagegroup-meta-initramfs.bb | 4 +-- .../recipes-devtools/dracut/dracut_git.bb | 14 +++++----- .../recipes-devtools/grubby/grubby_8.40.bb | 10 ++++---- .../recipes-devtools/grubby/grubby_git.bb | 10 ++++---- .../klibc/klibc-static-utils_2.0.8.bb | 2 +- .../recipes-devtools/klibc/klibc-utils.inc | 2 +- .../recipes-devtools/klibc/klibc-utils_2.0.8.bb | 2 +- meta-initramfs/recipes-devtools/klibc/klibc.inc | 30 +++++++++++----------- .../recipes-devtools/klibc/klibc_2.0.8.bb | 6 ++--- .../recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb | 26 +++++++++---------- .../recipes-kernel/kexec/kexec-tools-klibc_git.bb | 22 ++++++++-------- 15 files changed, 74 insertions(+), 74 deletions(-) (limited to 'meta-initramfs') diff --git a/meta-initramfs/classes/klibc.bbclass b/meta-initramfs/classes/klibc.bbclass index bba10f1b61..83112c06fa 100644 --- a/meta-initramfs/classes/klibc.bbclass +++ b/meta-initramfs/classes/klibc.bbclass @@ -3,10 +3,10 @@ DEPENDS =+ "klcc-cross" # Default for klcc is to build static binaries. # Set CC = "${TARGET_PREFIX}klcc -shared" to build the dynamic version. -CC_forcevariable = "${TARGET_PREFIX}klcc ${TOOLCHAIN_OPTIONS}" -CC_forcevariable_armv4_linux-gnueabi = "${TARGET_PREFIX}klcc ${TOOLCHAIN_OPTIONS} -march=armv4 -mthumb-interwork" -CC_append_armv7ve = " ${@' -mfloat-abi=${TUNE_CCARGS_MFLOAT}' if (d.getVar('TUNE_CCARGS_MFLOAT') != '') else ''}" -CC_append_armv7a = " ${@' -mfloat-abi=${TUNE_CCARGS_MFLOAT}' if (d.getVar('TUNE_CCARGS_MFLOAT') != '') else ''}" +CC:forcevariable = "${TARGET_PREFIX}klcc ${TOOLCHAIN_OPTIONS}" +CC:forcevariable:armv4_linux-gnueabi = "${TARGET_PREFIX}klcc ${TOOLCHAIN_OPTIONS} -march=armv4 -mthumb-interwork" +CC:append:armv7ve = " ${@' -mfloat-abi=${TUNE_CCARGS_MFLOAT}' if (d.getVar('TUNE_CCARGS_MFLOAT') != '') else ''}" +CC:append:armv7a = " ${@' -mfloat-abi=${TUNE_CCARGS_MFLOAT}' if (d.getVar('TUNE_CCARGS_MFLOAT') != '') else ''}" # klcc uses own optimizations by default. See klcc(1) man file. export CFLAGS="${TUNE_CCARGS}" diff --git a/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb b/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb index f90e2344bb..2dce19c6be 100644 --- a/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb +++ b/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb @@ -8,7 +8,7 @@ SRC_URI = "file://icon.xpm" S = "${WORKDIR}" -do_install_prepend () { +do_install:prepend () { echo '# /boot/boot.cfg - KEXECBOOT configuration file. # # First kernel stanza. @@ -55,7 +55,7 @@ do_install () { PACKAGE_ARCH = "${MACHINE_ARCH}" -FILES_${PN} += "/boot/*" +FILES:${PN} += "/boot/*" CMDLINE ?= "" CMDLINE_DEBUG ?= "quiet" diff --git a/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb b/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb index ad9ccd02c6..0f77f65df3 100644 --- a/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb +++ b/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" PV = "0.6+git${SRCPV}" S = "${WORKDIR}/git" SRC_URI = "git://github.com/kexecboot/kexecboot.git" -SRC_URI_append_libc-klibc = "\ +SRC_URI:append_libc-klibc = "\ file://0001-kexecboot-Use-new-reboot-API-with-klibc.patch \ file://0001-make-Add-compiler-includes-in-cflags.patch \ " @@ -27,9 +27,9 @@ do_install () { PACKAGE_ARCH = "${MACHINE_ARCH}" -FILES_${PN} += " ${bindir}/kexecboot /init /proc /mnt /dev /sys" +FILES:${PN} += " ${bindir}/kexecboot /init /proc /mnt /dev /sys" -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { ln -sf ${bindir}/kexecboot $D/init } diff --git a/meta-initramfs/recipes-core/initrdscripts/initramfs-debug_1.0.bb b/meta-initramfs/recipes-core/initrdscripts/initramfs-debug_1.0.bb index 667690f888..4c06346570 100644 --- a/meta-initramfs/recipes-core/initrdscripts/initramfs-debug_1.0.bb +++ b/meta-initramfs/recipes-core/initrdscripts/initramfs-debug_1.0.bb @@ -11,4 +11,4 @@ do_install() { inherit allarch -FILES_${PN} += " /init " +FILES:${PN} += " /init " diff --git a/meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb b/meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb index 2955baea2b..4b76246a03 100644 --- a/meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb +++ b/meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb @@ -8,11 +8,11 @@ PACKAGES = ' \ packagegroup-meta-initramfs-devtools \ ' -RDEPENDS_packagegroup-meta-initramfs = "\ +RDEPENDS:packagegroup-meta-initramfs = "\ packagegroup-meta-initramfs-devtools \ " -RDEPENDS_packagegroup-meta-initramfs-devtools = "\ +RDEPENDS:packagegroup-meta-initramfs-devtools = "\ dracut \ ${@bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 x86-64", "grubby", "", d)} \ " diff --git a/meta-initramfs/recipes-devtools/dracut/dracut_git.bb b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb index 4d702dc56f..73c2e0915f 100644 --- a/meta-initramfs/recipes-devtools/dracut/dracut_git.bb +++ b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb @@ -14,7 +14,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git;protocol=http \ " DEPENDS += "kmod" -DEPENDS_append_libc-musl = " fts" +DEPENDS:append:libc-musl = " fts" inherit bash-completion pkgconfig @@ -37,7 +37,7 @@ PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/ EXTRA_OEMAKE += 'libdir=${prefix}/lib LDLIBS="${LDLIBS}"' -LDLIBS_append_libc-musl = " -lfts" +LDLIBS:append:libc-musl = " -lfts" do_configure() { ./configure ${EXTRA_OECONF} @@ -50,18 +50,18 @@ do_install() { chown -R root:root ${D}/${prefix}/lib/dracut/modules.d } -FILES_${PN} += "${prefix}/lib/kernel \ +FILES:${PN} += "${prefix}/lib/kernel \ ${prefix}/lib/dracut \ ${systemd_unitdir} \ " -FILES_${PN}-dbg += "${prefix}/lib/dracut/.debug" +FILES:${PN}-dbg += "${prefix}/lib/dracut/.debug" -CONFFILES_${PN} += "${sysconfdir}/dracut.conf" +CONFFILES:${PN} += "${sysconfdir}/dracut.conf" -RDEPENDS_${PN} = "findutils cpio util-linux-blkid util-linux-getopt util-linux bash ldd" +RDEPENDS:${PN} = "findutils cpio util-linux-blkid util-linux-getopt util-linux bash ldd" # This could be optimized a bit, but let's avoid non-booting systems :) -RRECOMMENDS_${PN} = " \ +RRECOMMENDS:${PN} = " \ kernel-modules \ busybox \ coreutils \ diff --git a/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb b/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb index 7403cf64f7..c4d74109cd 100644 --- a/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb +++ b/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb @@ -10,7 +10,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" DEPENDS = "popt util-linux" -DEPENDS_append_libc-musl = " libexecinfo" +DEPENDS:append:libc-musl = " libexecinfo" S = "${WORKDIR}/git" SRCREV = "79c5cfa02c567efdc5bb18cdd584789e2e35aa23" @@ -21,13 +21,13 @@ SRC_URI = "git://github.com/rhboot/grubby.git;protocol=https; \ file://0002-include-paths.h-for-_PATH_MOUNTED.patch \ " -RDEPENDS_${PN} += "dracut" +RDEPENDS:${PN} += "dracut" inherit autotools-brokensep ptest EXTRA_OEMAKE = "-e 'CC=${CC}' 'LDFLAGS=${LDFLAGS}' LIBS='${LIBS}'" -LIBS_libc-musl = "-lexecinfo" +LIBS:libc-musl = "-lexecinfo" LIBS ?= "" do_install_ptest() { install -d ${D}${PTEST_PATH} @@ -35,7 +35,7 @@ do_install_ptest() { sed -i 's|./grubby|grubby|' ${D}${PTEST_PATH}/test.sh } -RDEPENDS_${PN} += "bash" -RDEPENDS_${PN}-ptest = "util-linux-getopt bash" +RDEPENDS:${PN} += "bash" +RDEPENDS:${PN}-ptest = "util-linux-getopt bash" COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)' diff --git a/meta-initramfs/recipes-devtools/grubby/grubby_git.bb b/meta-initramfs/recipes-devtools/grubby/grubby_git.bb index 7248147a5c..38075e3907 100644 --- a/meta-initramfs/recipes-devtools/grubby/grubby_git.bb +++ b/meta-initramfs/recipes-devtools/grubby/grubby_git.bb @@ -10,7 +10,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" DEPENDS = "popt util-linux" -DEPENDS_append_libc-musl = " libexecinfo" +DEPENDS:append:libc-musl = " libexecinfo" S = "${WORKDIR}/git" SRCREV = "a1d2ae93408c3408e672d7eba4550fdf27fb0201" @@ -21,13 +21,13 @@ SRC_URI = "git://github.com/rhboot/grubby.git;protocol=https; \ file://0002-include-paths.h-for-_PATH_MOUNTED.patch \ " -RDEPENDS_${PN} += "dracut" +RDEPENDS:${PN} += "dracut" inherit autotools-brokensep ptest EXTRA_OEMAKE = "-e 'CC=${CC}' 'LDFLAGS=${LDFLAGS}' LIBS='${LIBS}' 'PREFIX'=${@bb.utils.contains('DISTRO_FEATURES','usrmerge','/usr','',d)}" -LIBS_libc-musl = "-lexecinfo" +LIBS:libc-musl = "-lexecinfo" LIBS ?= "" do_install_ptest() { install -d ${D}${PTEST_PATH} @@ -35,7 +35,7 @@ do_install_ptest() { sed -i 's|./grubby|grubby|' ${D}${PTEST_PATH}/test.sh } -RDEPENDS_${PN} += "bash" -RDEPENDS_${PN}-ptest = "util-linux-getopt bash" +RDEPENDS:${PN} += "bash" +RDEPENDS:${PN}-ptest = "util-linux-getopt bash" COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)' diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.8.bb b/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.8.bb index c835fd647a..0de580781b 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.8.bb +++ b/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.8.bb @@ -3,7 +3,7 @@ SUMMARY = "klibc utils for initramfs statically compiled" FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" PACKAGES = "${PN}" -FILES_${PN} = "" +FILES:${PN} = "" KLIBC_UTILS_VARIANT = "static" KLIBC_UTILS_PKGNAME = "klibc-static-utils" diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc b/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc index 00cb86d3e6..4e9fea88d1 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc +++ b/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc @@ -50,7 +50,7 @@ EXTRA_KLIBC_DEPS = "${@oe.utils.conditional('KLIBC_UTILS_VARIANT', 'shared', '${ PACKAGES_DYNAMIC += "^${KLIBC_UTILS_PKGNAME}-.*" -python populate_packages_prepend () { +python populate_packages:prepend () { base_bin_dir = d.expand('${base_bindir}') do_split_packages(d, base_bin_dir, '(.*)', '${KLIBC_UTILS_PKGNAME}-%s', 'Klibc util for %s', extra_depends='${EXTRA_KLIBC_DEPS}', allow_links=True, allow_dirs=True) base_sbin_dir = d.expand('${base_sbindir}') diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.8.bb b/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.8.bb index 06e71cb7b8..2f26093cbe 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.8.bb +++ b/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.8.bb @@ -3,7 +3,7 @@ SUMMARY = "klibc utils for initramfs" FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" PACKAGES = "${PN}" -FILES_${PN} = "" +FILES:${PN} = "" KLIBC_UTILS_VARIANT = "shared" KLIBC_UTILS_PKGNAME = "klibc-utils" diff --git a/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-initramfs/recipes-devtools/klibc/klibc.inc index 41147eb2da..1a188a6faf 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc.inc +++ b/meta-initramfs/recipes-devtools/klibc/klibc.inc @@ -25,7 +25,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/klibc/2.0/klibc-${PV}.tar.xz \ ARMPATCHES ?= "" -ARMPATCHES_arm = " \ +ARMPATCHES:arm = " \ file://armv4-fix-v4bx.patch \ " SRC_URI[sha256sum] = "4e48f1398cfe3ce0b6df55ce6e70acf54fc8488e3aea3fb3610ee1622d9cb436" @@ -33,8 +33,8 @@ SRC_URI[sha256sum] = "4e48f1398cfe3ce0b6df55ce6e70acf54fc8488e3aea3fb3610ee1622d S = "${WORKDIR}/klibc-${PV}" OPTFLAGS = "${TUNE_CCARGS} -Os -fcommon" -OPTFLAGS_append_toolchain-clang = " -fno-builtin-bcmp" -OPTFLAGS_append_toolchain-clang_mipsarch = " -no-integrated-as" +OPTFLAGS:append:toolchain-clang = " -fno-builtin-bcmp" +OPTFLAGS:append:toolchain-clang:mipsarch = " -no-integrated-as" PARALLEL_MAKE = "" EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ @@ -57,22 +57,22 @@ do_configure () { ln -sf "${STAGING_DIR_TARGET}${exec_prefix}" linux } -do_compile_prepend_toolchain-clang() { +do_compile:prepend:toolchain-clang() { sed -i -e 's#$(KLIBCROSS)gcc#$(KLIBCROSS)clang#g' ${S}/Makefile } INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -INSANE_SKIP_${PN} = "already-stripped" -INSANE_SKIP_libklibc-dev = "dev-elf" +INSANE_SKIP:${PN} = "already-stripped" +INSANE_SKIP:libklibc-dev = "dev-elf" KLIBC_ARCH = "${TARGET_ARCH}" -KLIBC_ARCH_aarch64 = "arm64" -KLIBC_ARCH_armeb = "arm" -KLIBC_ARCH_mipsel = "mips" -KLIBC_ARCH_mips64el = "mips64" -KLIBC_ARCH_x86 = "i386" -KLIBC_ARCH_x86-64 = "x86_64" -KLIBC_ARCH_powerpc = "ppc" -KLIBC_ARCH_powerpc64 = "ppc64" -KLIBC_ARCH_powerpc64le = "ppc64" +KLIBC_ARCH:aarch64 = "arm64" +KLIBC_ARCH:armeb = "arm" +KLIBC_ARCH:mipsel = "mips" +KLIBC_ARCH:mips64el = "mips64" +KLIBC_ARCH:x86 = "i386" +KLIBC_ARCH:x86-64 = "x86_64" +KLIBC_ARCH:powerpc = "ppc" +KLIBC_ARCH:powerpc64 = "ppc64" +KLIBC_ARCH:powerpc64le = "ppc64" THIS_LIBKLIBC = "libklibc (= ${PV}-${PR})" diff --git a/meta-initramfs/recipes-devtools/klibc/klibc_2.0.8.bb b/meta-initramfs/recipes-devtools/klibc/klibc_2.0.8.bb index 7df0b0a3d5..8dda9a8cdc 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc_2.0.8.bb +++ b/meta-initramfs/recipes-devtools/klibc/klibc_2.0.8.bb @@ -16,9 +16,9 @@ do_install() { PACKAGES = "libklibc libklibc-staticdev libklibc-dev" -FILES_libklibc = "${libdir}/klibc-*.so" -FILES_libklibc-staticdev = "${libdir}/klibc/lib/libc.a" -FILES_libklibc-dev = "${libdir}/klibc.so \ +FILES:libklibc = "${libdir}/klibc-*.so" +FILES:libklibc-staticdev = "${libdir}/klibc/lib/libc.a" +FILES:libklibc-dev = "${libdir}/klibc.so \ ${libdir}/klibc/lib/* \ ${libdir}/klibc/include/* \ " diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb index 5f43b0229a..4d944a1528 100644 --- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb +++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb @@ -38,16 +38,16 @@ PACKAGES =+ "mtdinfo-klibc ubiattach-klibc ubiblock-klibc ubicrc32-klibc ubideta ubiformat-klibc ubimkvol-klibc ubinfo-klibc ubinize-klibc ubirename-klibc \ ubirmvol-klibc ubirsvol-klibc ubiupdatevol-klibc" -FILES_mtdinfo-klibc = "${sbindir}/mtdinfo" -FILES_ubiattach-klibc = "${sbindir}/ubiattach" -FILES_ubiblock-klibc = "${sbindir}/ubiblock" -FILES_ubicrc32-klibc = "${sbindir}/ubicrc32" -FILES_ubidetach-klibc = "${sbindir}/ubidetach" -FILES_ubiformat-klibc = "${sbindir}/ubiformat" -FILES_ubimkvol-klibc = "${sbindir}/ubimkvol" -FILES_ubinfo-klibc = "${sbindir}/ubinfo" -FILES_ubinize-klibc = "${sbindir}/ubinize" -FILES_ubirename-klibc = "${sbindir}/ubirename" -FILES_ubirmvol-klibc = "${sbindir}/ubirmvol" -FILES_ubirsvol-klibc = "${sbindir}/ubirsvol" -FILES_ubiupdatevol-klibc = "${sbindir}/ubiupdatevol" +FILES:mtdinfo-klibc = "${sbindir}/mtdinfo" +FILES:ubiattach-klibc = "${sbindir}/ubiattach" +FILES:ubiblock-klibc = "${sbindir}/ubiblock" +FILES:ubicrc32-klibc = "${sbindir}/ubicrc32" +FILES:ubidetach-klibc = "${sbindir}/ubidetach" +FILES:ubiformat-klibc = "${sbindir}/ubiformat" +FILES:ubimkvol-klibc = "${sbindir}/ubimkvol" +FILES:ubinfo-klibc = "${sbindir}/ubinfo" +FILES:ubinize-klibc = "${sbindir}/ubinize" +FILES:ubirename-klibc = "${sbindir}/ubirename" +FILES:ubirmvol-klibc = "${sbindir}/ubirmvol" +FILES:ubirsvol-klibc = "${sbindir}/ubirsvol" +FILES:ubiupdatevol-klibc = "${sbindir}/ubiupdatevol" 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 656162fb1a..393f04fb31 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb @@ -43,22 +43,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" @@ -69,7 +69,7 @@ EXTRA_OECONF += "--without-zlib --without-lzma --without-xen" 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() { +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 @@ -86,9 +86,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.*)' -- cgit 1.2.3-korg