diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-07-29 17:04:53 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-08-03 10:21:25 -0700 |
commit | c61dc077bbd81260e4f167fa2251643ba0ba6974 (patch) | |
tree | 66c3243f8f64ae60f66f70a16e8128c247254a65 /meta-initramfs/recipes-devtools/klibc | |
parent | c5f7cfb8db54cfa4257797db5bd87828dea43296 (diff) | |
download | meta-openembedded-contrib-c61dc077bbd81260e4f167fa2251643ba0ba6974.tar.gz |
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 <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-initramfs/recipes-devtools/klibc')
5 files changed, 21 insertions, 21 deletions
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/* \ " |