summaryrefslogtreecommitdiffstats
path: root/meta-initramfs/recipes-devtools/klibc
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2021-07-29 17:04:53 +0200
committerKhem Raj <raj.khem@gmail.com>2021-08-03 10:21:25 -0700
commitc61dc077bbd81260e4f167fa2251643ba0ba6974 (patch)
tree66c3243f8f64ae60f66f70a16e8128c247254a65 /meta-initramfs/recipes-devtools/klibc
parentc5f7cfb8db54cfa4257797db5bd87828dea43296 (diff)
downloadmeta-openembedded-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')
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.8.bb2
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-utils.inc2
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.8.bb2
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc.inc30
-rw-r--r--meta-initramfs/recipes-devtools/klibc/klibc_2.0.8.bb6
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"
3FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" 3FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:"
4 4
5PACKAGES = "${PN}" 5PACKAGES = "${PN}"
6FILES_${PN} = "" 6FILES:${PN} = ""
7 7
8KLIBC_UTILS_VARIANT = "static" 8KLIBC_UTILS_VARIANT = "static"
9KLIBC_UTILS_PKGNAME = "klibc-static-utils" 9KLIBC_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', '${
50 50
51PACKAGES_DYNAMIC += "^${KLIBC_UTILS_PKGNAME}-.*" 51PACKAGES_DYNAMIC += "^${KLIBC_UTILS_PKGNAME}-.*"
52 52
53python populate_packages_prepend () { 53python populate_packages:prepend () {
54 base_bin_dir = d.expand('${base_bindir}') 54 base_bin_dir = d.expand('${base_bindir}')
55 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) 55 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)
56 base_sbin_dir = d.expand('${base_sbindir}') 56 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"
3FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" 3FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:"
4 4
5PACKAGES = "${PN}" 5PACKAGES = "${PN}"
6FILES_${PN} = "" 6FILES:${PN} = ""
7 7
8KLIBC_UTILS_VARIANT = "shared" 8KLIBC_UTILS_VARIANT = "shared"
9KLIBC_UTILS_PKGNAME = "klibc-utils" 9KLIBC_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 \
25 25
26ARMPATCHES ?= "" 26ARMPATCHES ?= ""
27 27
28ARMPATCHES_arm = " \ 28ARMPATCHES:arm = " \
29 file://armv4-fix-v4bx.patch \ 29 file://armv4-fix-v4bx.patch \
30 " 30 "
31SRC_URI[sha256sum] = "4e48f1398cfe3ce0b6df55ce6e70acf54fc8488e3aea3fb3610ee1622d9cb436" 31SRC_URI[sha256sum] = "4e48f1398cfe3ce0b6df55ce6e70acf54fc8488e3aea3fb3610ee1622d9cb436"
@@ -33,8 +33,8 @@ SRC_URI[sha256sum] = "4e48f1398cfe3ce0b6df55ce6e70acf54fc8488e3aea3fb3610ee1622d
33S = "${WORKDIR}/klibc-${PV}" 33S = "${WORKDIR}/klibc-${PV}"
34 34
35OPTFLAGS = "${TUNE_CCARGS} -Os -fcommon" 35OPTFLAGS = "${TUNE_CCARGS} -Os -fcommon"
36OPTFLAGS_append_toolchain-clang = " -fno-builtin-bcmp" 36OPTFLAGS:append:toolchain-clang = " -fno-builtin-bcmp"
37OPTFLAGS_append_toolchain-clang_mipsarch = " -no-integrated-as" 37OPTFLAGS:append:toolchain-clang:mipsarch = " -no-integrated-as"
38 38
39PARALLEL_MAKE = "" 39PARALLEL_MAKE = ""
40EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ 40EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \
@@ -57,22 +57,22 @@ do_configure () {
57 ln -sf "${STAGING_DIR_TARGET}${exec_prefix}" linux 57 ln -sf "${STAGING_DIR_TARGET}${exec_prefix}" linux
58} 58}
59 59
60do_compile_prepend_toolchain-clang() { 60do_compile:prepend:toolchain-clang() {
61 sed -i -e 's#$(KLIBCROSS)gcc#$(KLIBCROSS)clang#g' ${S}/Makefile 61 sed -i -e 's#$(KLIBCROSS)gcc#$(KLIBCROSS)clang#g' ${S}/Makefile
62} 62}
63 63
64INHIBIT_PACKAGE_STRIP = "1" 64INHIBIT_PACKAGE_STRIP = "1"
65INHIBIT_PACKAGE_DEBUG_SPLIT = "1" 65INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
66INSANE_SKIP_${PN} = "already-stripped" 66INSANE_SKIP:${PN} = "already-stripped"
67INSANE_SKIP_libklibc-dev = "dev-elf" 67INSANE_SKIP:libklibc-dev = "dev-elf"
68KLIBC_ARCH = "${TARGET_ARCH}" 68KLIBC_ARCH = "${TARGET_ARCH}"
69KLIBC_ARCH_aarch64 = "arm64" 69KLIBC_ARCH:aarch64 = "arm64"
70KLIBC_ARCH_armeb = "arm" 70KLIBC_ARCH:armeb = "arm"
71KLIBC_ARCH_mipsel = "mips" 71KLIBC_ARCH:mipsel = "mips"
72KLIBC_ARCH_mips64el = "mips64" 72KLIBC_ARCH:mips64el = "mips64"
73KLIBC_ARCH_x86 = "i386" 73KLIBC_ARCH:x86 = "i386"
74KLIBC_ARCH_x86-64 = "x86_64" 74KLIBC_ARCH:x86-64 = "x86_64"
75KLIBC_ARCH_powerpc = "ppc" 75KLIBC_ARCH:powerpc = "ppc"
76KLIBC_ARCH_powerpc64 = "ppc64" 76KLIBC_ARCH:powerpc64 = "ppc64"
77KLIBC_ARCH_powerpc64le = "ppc64" 77KLIBC_ARCH:powerpc64le = "ppc64"
78THIS_LIBKLIBC = "libklibc (= ${PV}-${PR})" 78THIS_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() {
16 16
17PACKAGES = "libklibc libklibc-staticdev libklibc-dev" 17PACKAGES = "libklibc libklibc-staticdev libklibc-dev"
18 18
19FILES_libklibc = "${libdir}/klibc-*.so" 19FILES:libklibc = "${libdir}/klibc-*.so"
20FILES_libklibc-staticdev = "${libdir}/klibc/lib/libc.a" 20FILES:libklibc-staticdev = "${libdir}/klibc/lib/libc.a"
21FILES_libklibc-dev = "${libdir}/klibc.so \ 21FILES:libklibc-dev = "${libdir}/klibc.so \
22 ${libdir}/klibc/lib/* \ 22 ${libdir}/klibc/lib/* \
23 ${libdir}/klibc/include/* \ 23 ${libdir}/klibc/include/* \
24 " 24 "