diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-core/glibc/glibc-locale.inc | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glibc/glibc-locale.inc')
-rw-r--r-- | meta/recipes-core/glibc/glibc-locale.inc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/meta/recipes-core/glibc/glibc-locale.inc b/meta/recipes-core/glibc/glibc-locale.inc index ef06389ff9..b8de7d3192 100644 --- a/meta/recipes-core/glibc/glibc-locale.inc +++ b/meta/recipes-core/glibc/glibc-locale.inc | |||
@@ -9,7 +9,7 @@ LOCALEBASEPN = "${MLPREFIX}glibc" | |||
9 | # ERROR: objcopy failed with exit code 127 (cmd was 'i586-webos-linux-objcopy' --only-keep-debug 'glibc-locale/2.17-r0/package/usr/lib/gconv/IBM1166.so' 'glibc-locale/2.17-r0/package/usr/lib/gconv/.debug/IBM1166.so') | 9 | # ERROR: objcopy failed with exit code 127 (cmd was 'i586-webos-linux-objcopy' --only-keep-debug 'glibc-locale/2.17-r0/package/usr/lib/gconv/IBM1166.so' 'glibc-locale/2.17-r0/package/usr/lib/gconv/.debug/IBM1166.so') |
10 | # ERROR: Function failed: split_and_strip_files | 10 | # ERROR: Function failed: split_and_strip_files |
11 | BINUTILSDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot" | 11 | BINUTILSDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot" |
12 | BINUTILSDEP_class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot" | 12 | BINUTILSDEP:class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot" |
13 | do_package[depends] += "${BINUTILSDEP}" | 13 | do_package[depends] += "${BINUTILSDEP}" |
14 | 14 | ||
15 | DEPENDS += "virtual/libc" | 15 | DEPENDS += "virtual/libc" |
@@ -21,7 +21,7 @@ DEPENDS += "virtual/libc" | |||
21 | 21 | ||
22 | # default to disabled | 22 | # default to disabled |
23 | ENABLE_BINARY_LOCALE_GENERATION ?= "0" | 23 | ENABLE_BINARY_LOCALE_GENERATION ?= "0" |
24 | ENABLE_BINARY_LOCALE_GENERATION_pn-nativesdk-glibc-locale = "1" | 24 | ENABLE_BINARY_LOCALE_GENERATION:pn-nativesdk-glibc-locale = "1" |
25 | 25 | ||
26 | #enable locale generation on these arches | 26 | #enable locale generation on these arches |
27 | # BINARY_LOCALE_ARCHES is a space separated list of regular expressions | 27 | # BINARY_LOCALE_ARCHES is a space separated list of regular expressions |
@@ -40,32 +40,32 @@ PACKAGES_DYNAMIC = "^locale-base-.* \ | |||
40 | ^${MLPREFIX}glibc-gconv$" | 40 | ^${MLPREFIX}glibc-gconv$" |
41 | 41 | ||
42 | # Create a glibc-binaries package | 42 | # Create a glibc-binaries package |
43 | ALLOW_EMPTY_${BPN}-binaries = "1" | 43 | ALLOW_EMPTY:${BPN}-binaries = "1" |
44 | PACKAGES += "${BPN}-binaries" | 44 | PACKAGES += "${BPN}-binaries" |
45 | RRECOMMENDS_${BPN}-binaries = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-binary") != -1])}" | 45 | RRECOMMENDS:${BPN}-binaries = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-binary") != -1])}" |
46 | 46 | ||
47 | # Create a glibc-charmaps package | 47 | # Create a glibc-charmaps package |
48 | ALLOW_EMPTY_${BPN}-charmaps = "1" | 48 | ALLOW_EMPTY:${BPN}-charmaps = "1" |
49 | PACKAGES += "${BPN}-charmaps" | 49 | PACKAGES += "${BPN}-charmaps" |
50 | RRECOMMENDS_${BPN}-charmaps = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-charmap") != -1])}" | 50 | RRECOMMENDS:${BPN}-charmaps = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-charmap") != -1])}" |
51 | 51 | ||
52 | # Create a glibc-gconvs package | 52 | # Create a glibc-gconvs package |
53 | ALLOW_EMPTY_${BPN}-gconvs = "1" | 53 | ALLOW_EMPTY:${BPN}-gconvs = "1" |
54 | PACKAGES += "${BPN}-gconvs" | 54 | PACKAGES += "${BPN}-gconvs" |
55 | RRECOMMENDS_${BPN}-gconvs = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-gconv") != -1])}" | 55 | RRECOMMENDS:${BPN}-gconvs = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-gconv") != -1])}" |
56 | 56 | ||
57 | # Create a glibc-localedatas package | 57 | # Create a glibc-localedatas package |
58 | ALLOW_EMPTY_${BPN}-localedatas = "1" | 58 | ALLOW_EMPTY:${BPN}-localedatas = "1" |
59 | PACKAGES += "${BPN}-localedatas" | 59 | PACKAGES += "${BPN}-localedatas" |
60 | RRECOMMENDS_${BPN}-localedatas = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-localedata") != -1])}" | 60 | RRECOMMENDS:${BPN}-localedatas = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-localedata") != -1])}" |
61 | 61 | ||
62 | DESCRIPTION_localedef = "glibc: compile locale definition files" | 62 | DESCRIPTION:localedef = "glibc: compile locale definition files" |
63 | 63 | ||
64 | # glibc-gconv is dynamically added into PACKAGES, thus | 64 | # glibc-gconv is dynamically added into PACKAGES, thus |
65 | # FILES_glibc-gconv will not be automatically extended in multilib. | 65 | # FILES:glibc-gconv will not be automatically extended in multilib. |
66 | # Explicitly add ${MLPREFIX} for FILES_glibc-gconv. | 66 | # Explicitly add ${MLPREFIX} for FILES:glibc-gconv. |
67 | FILES_${MLPREFIX}glibc-gconv = "${libdir}/gconv/*" | 67 | FILES:${MLPREFIX}glibc-gconv = "${libdir}/gconv/*" |
68 | FILES_localedef = "${bindir}/localedef" | 68 | FILES:localedef = "${bindir}/localedef" |
69 | 69 | ||
70 | LOCALETREESRC = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale" | 70 | LOCALETREESRC = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale" |
71 | 71 | ||