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-package.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-package.inc')
-rw-r--r-- | meta/recipes-core/glibc/glibc-package.inc | 134 |
1 files changed, 67 insertions, 67 deletions
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 92e5dbac61..4bf5038fc0 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc | |||
@@ -3,67 +3,67 @@ INHIBIT_SYSROOT_STRIP = "1" | |||
3 | PACKAGES = "${PN}-dbg catchsegv sln nscd ldconfig ldd tzcode glibc-thread-db ${PN}-pic libcidn libmemusage libnss-db libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}-src" | 3 | PACKAGES = "${PN}-dbg catchsegv sln nscd ldconfig ldd tzcode glibc-thread-db ${PN}-pic libcidn libmemusage libnss-db libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}-src" |
4 | 4 | ||
5 | # The ld.so in this glibc supports the GNU_HASH | 5 | # The ld.so in this glibc supports the GNU_HASH |
6 | RPROVIDES_${PN} = "eglibc rtld(GNU_HASH)" | 6 | RPROVIDES:${PN} = "eglibc rtld(GNU_HASH)" |
7 | RPROVIDES_${PN}-utils = "eglibc-utils" | 7 | RPROVIDES:${PN}-utils = "eglibc-utils" |
8 | RPROVIDES_${PN}-mtrace = "eglibc-mtrace libc-mtrace" | 8 | RPROVIDES:${PN}-mtrace = "eglibc-mtrace libc-mtrace" |
9 | RPROVIDES_${PN}-pic = "eglibc-pic" | 9 | RPROVIDES:${PN}-pic = "eglibc-pic" |
10 | RPROVIDES_${PN}-dev = "eglibc-dev libc6-dev virtual-libc-dev" | 10 | RPROVIDES:${PN}-dev = "eglibc-dev libc6-dev virtual-libc-dev" |
11 | RPROVIDES_${PN}-staticdev = "eglibc-staticdev" | 11 | RPROVIDES:${PN}-staticdev = "eglibc-staticdev" |
12 | RPROVIDES_${PN}-doc = "eglibc-doc" | 12 | RPROVIDES:${PN}-doc = "eglibc-doc" |
13 | RPROVIDES_glibc-extra-nss = "eglibc-extra-nss" | 13 | RPROVIDES:glibc-extra-nss = "eglibc-extra-nss" |
14 | RPROVIDES_glibc-thread-db = "eglibc-thread-db" | 14 | RPROVIDES:glibc-thread-db = "eglibc-thread-db" |
15 | RPROVIDES_${PN}-pcprofile = "eglibc-pcprofile" | 15 | RPROVIDES:${PN}-pcprofile = "eglibc-pcprofile" |
16 | RPROVIDES_${PN}-dbg = "eglibc-dbg" | 16 | RPROVIDES:${PN}-dbg = "eglibc-dbg" |
17 | libc_baselibs = "${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/libmvec-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so" | 17 | libc_baselibs = "${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/libmvec-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so" |
18 | ARCH_DYNAMIC_LOADER = "" | 18 | ARCH_DYNAMIC_LOADER = "" |
19 | # The aarch64 ABI says the dynamic linker -must- be | 19 | # The aarch64 ABI says the dynamic linker -must- be |
20 | # /lib/ld-linux-aarch64{,_be}.so.1. With usrmerge, that may mean that | 20 | # /lib/ld-linux-aarch64{,_be}.so.1. With usrmerge, that may mean that |
21 | # we need to install it in /usr/lib. | 21 | # we need to install it in /usr/lib. |
22 | ARCH_DYNAMIC_LOADER_aarch64 = "ld-linux-${TARGET_ARCH}.so.1" | 22 | ARCH_DYNAMIC_LOADER:aarch64 = "ld-linux-${TARGET_ARCH}.so.1" |
23 | libc_baselibs_append = " ${@oe.utils.conditional('ARCH_DYNAMIC_LOADER', '', '', '${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}', d)}" | 23 | libc_baselibs:append = " ${@oe.utils.conditional('ARCH_DYNAMIC_LOADER', '', '', '${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}', d)}" |
24 | INSANE_SKIP_${PN}_append_aarch64 = " libdir" | 24 | INSANE_SKIP:${PN}:append:aarch64 = " libdir" |
25 | 25 | ||
26 | FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${sysconfdir}/ld.so.conf" | 26 | FILES:${PN} = "${libc_baselibs} ${libexecdir}/* ${sysconfdir}/ld.so.conf" |
27 | RRECOMMENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', '${MLPREFIX}ldconfig', '', d)}" | 27 | RRECOMMENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', '${MLPREFIX}ldconfig', '', d)}" |
28 | FILES_ldconfig = "${base_sbindir}/ldconfig" | 28 | FILES:ldconfig = "${base_sbindir}/ldconfig" |
29 | FILES_ldd = "${bindir}/ldd" | 29 | FILES:ldd = "${bindir}/ldd" |
30 | FILES_libsegfault = "${base_libdir}/libSegFault*" | 30 | FILES:libsegfault = "${base_libdir}/libSegFault*" |
31 | FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" | 31 | FILES:libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" |
32 | FILES_libmemusage = "${base_libdir}/libmemusage.so" | 32 | FILES:libmemusage = "${base_libdir}/libmemusage.so" |
33 | FILES_libnss-db = "${base_libdir}/libnss_db.so.* ${base_libdir}/libnss_db-*.so ${localstatedir}/db/Makefile ${localstatedir}/db/makedbs.sh" | 33 | FILES:libnss-db = "${base_libdir}/libnss_db.so.* ${base_libdir}/libnss_db-*.so ${localstatedir}/db/Makefile ${localstatedir}/db/makedbs.sh" |
34 | RDEPENDS_libnss-db = "${PN}-utils" | 34 | RDEPENDS:libnss-db = "${PN}-utils" |
35 | FILES_glibc-extra-nss = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*" | 35 | FILES:glibc-extra-nss = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*" |
36 | FILES_sln = "${base_sbindir}/sln" | 36 | FILES:sln = "${base_sbindir}/sln" |
37 | FILES_${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o" | 37 | FILES:${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o" |
38 | FILES_libsotruss = "${libdir}/audit/sotruss-lib.so" | 38 | FILES:libsotruss = "${libdir}/audit/sotruss-lib.so" |
39 | FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}" | 39 | FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}" |
40 | FILES_${PN}-dev += "${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" | 40 | FILES:${PN}-dev += "${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" |
41 | RDEPENDS_${PN}-dev = "linux-libc-headers-dev" | 41 | RDEPENDS:${PN}-dev = "linux-libc-headers-dev" |
42 | FILES_${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a" | 42 | FILES:${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a" |
43 | FILES_nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_unitdir}/system/nscd* ${sysconfdir}/tmpfiles.d/nscd.conf \ | 43 | FILES:nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_unitdir}/system/nscd* ${sysconfdir}/tmpfiles.d/nscd.conf \ |
44 | ${sysconfdir}/nscd.conf ${sysconfdir}/default/volatiles/98_nscd ${localstatedir}/db/nscd" | 44 | ${sysconfdir}/nscd.conf ${sysconfdir}/default/volatiles/98_nscd ${localstatedir}/db/nscd" |
45 | FILES_${PN}-mtrace = "${bindir}/mtrace" | 45 | FILES:${PN}-mtrace = "${bindir}/mtrace" |
46 | FILES_tzcode = "${bindir}/tzselect ${sbindir}/zic ${bindir}/zdump" | 46 | FILES:tzcode = "${bindir}/tzselect ${sbindir}/zic ${bindir}/zdump" |
47 | FILES_${PN}-utils = "${bindir}/* ${sbindir}/*" | 47 | FILES:${PN}-utils = "${bindir}/* ${sbindir}/*" |
48 | FILES_catchsegv = "${bindir}/catchsegv" | 48 | FILES:catchsegv = "${bindir}/catchsegv" |
49 | RDEPENDS_catchsegv = "libsegfault" | 49 | RDEPENDS:catchsegv = "libsegfault" |
50 | FILES_${PN}-pcprofile = "${base_libdir}/libpcprofile.so" | 50 | FILES:${PN}-pcprofile = "${base_libdir}/libpcprofile.so" |
51 | FILES_glibc-thread-db = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so" | 51 | FILES:glibc-thread-db = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so" |
52 | RPROVIDES_${PN}-dev += "libc-dev" | 52 | RPROVIDES:${PN}-dev += "libc-dev" |
53 | RPROVIDES_${PN}-staticdev += "libc-staticdev" | 53 | RPROVIDES:${PN}-staticdev += "libc-staticdev" |
54 | 54 | ||
55 | SUMMARY_sln = "The static ln" | 55 | SUMMARY:sln = "The static ln" |
56 | DESCRIPTION_sln = "Similar to the 'ln' utility, but statically linked. sln is useful to make symbolic links to dynamic libraries if the dynamic linking system, for some reason, is not functional." | 56 | DESCRIPTION:sln = "Similar to the 'ln' utility, but statically linked. sln is useful to make symbolic links to dynamic libraries if the dynamic linking system, for some reason, is not functional." |
57 | SUMMARY_nscd = "Name service cache daemon" | 57 | SUMMARY:nscd = "Name service cache daemon" |
58 | DESCRIPTION_nscd = "nscd, name service cache daemon, caches name service lookups for the passwd, group and hosts information. It can damatically improvide performance with remote, such as NIS or NIS+, name services." | 58 | DESCRIPTION:nscd = "nscd, name service cache daemon, caches name service lookups for the passwd, group and hosts information. It can damatically improvide performance with remote, such as NIS or NIS+, name services." |
59 | SUMMARY_glibc-extra-nss = "hesiod, NIS and NIS+ nss libraries" | 59 | SUMMARY:glibc-extra-nss = "hesiod, NIS and NIS+ nss libraries" |
60 | DESCRIPTION_glibc-extra-nss = "glibc: nis, nisplus and hesiod search services." | 60 | DESCRIPTION:glibc-extra-nss = "glibc: nis, nisplus and hesiod search services." |
61 | SUMMARY_ldd = "print shared library dependencies" | 61 | SUMMARY:ldd = "print shared library dependencies" |
62 | DESCRIPTION_ldd = "${bindir}/ldd prints shared library dependencies for each program or shared library specified on the command line." | 62 | DESCRIPTION:ldd = "${bindir}/ldd prints shared library dependencies for each program or shared library specified on the command line." |
63 | SUMMARY_${PN}-utils = "Miscellaneous utilities provided by glibc" | 63 | SUMMARY:${PN}-utils = "Miscellaneous utilities provided by glibc" |
64 | DESCRIPTION_${PN}-utils = "Miscellaneous utilities including getconf, iconv, locale, gencat, ..." | 64 | DESCRIPTION:${PN}-utils = "Miscellaneous utilities including getconf, iconv, locale, gencat, ..." |
65 | DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs" | 65 | DESCRIPTION:libsotruss = "Library to support sotruss which traces calls through PLTs" |
66 | DESCRIPTION_tzcode = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" | 66 | DESCRIPTION:tzcode = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" |
67 | 67 | ||
68 | inherit multilib_header | 68 | inherit multilib_header |
69 | 69 | ||
@@ -125,7 +125,7 @@ def get_libc_fpu_setting(bb, d): | |||
125 | return "--without-fp" | 125 | return "--without-fp" |
126 | return "" | 126 | return "" |
127 | 127 | ||
128 | do_install_append_class-target() { | 128 | do_install:append:class-target() { |
129 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 129 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
130 | install -d ${D}${sysconfdir}/tmpfiles.d | 130 | install -d ${D}${sysconfdir}/tmpfiles.d |
131 | echo "d /run/nscd 755 root root -" \ | 131 | echo "d /run/nscd 755 root root -" \ |
@@ -139,15 +139,15 @@ do_install_append_class-target() { | |||
139 | fi | 139 | fi |
140 | 140 | ||
141 | } | 141 | } |
142 | do_install_append_aarch64 () { | 142 | do_install:append:aarch64 () { |
143 | do_install_armmultilib | 143 | do_install_armmultilib |
144 | } | 144 | } |
145 | 145 | ||
146 | do_install_append_arm () { | 146 | do_install:append:arm () { |
147 | do_install_armmultilib | 147 | do_install_armmultilib |
148 | } | 148 | } |
149 | 149 | ||
150 | do_install_append_armeb () { | 150 | do_install:append:armeb () { |
151 | do_install_armmultilib | 151 | do_install_armmultilib |
152 | } | 152 | } |
153 | 153 | ||
@@ -252,26 +252,26 @@ stash_locale_package_cleanup() { | |||
252 | stash_locale_cleanup ${PKGD} | 252 | stash_locale_cleanup ${PKGD} |
253 | } | 253 | } |
254 | 254 | ||
255 | python populate_packages_prepend () { | 255 | python populate_packages:prepend () { |
256 | if d.getVar('DEBIAN_NAMES'): | 256 | if d.getVar('DEBIAN_NAMES'): |
257 | pkgs = d.getVar('PACKAGES').split() | 257 | pkgs = d.getVar('PACKAGES').split() |
258 | bpn = d.getVar('BPN') | 258 | bpn = d.getVar('BPN') |
259 | prefix = d.getVar('MLPREFIX') or "" | 259 | prefix = d.getVar('MLPREFIX') or "" |
260 | # Set the base package... | 260 | # Set the base package... |
261 | d.setVar('PKG_' + prefix + bpn, prefix + 'libc6') | 261 | d.setVar('PKG:' + prefix + bpn, prefix + 'libc6') |
262 | libcprefix = prefix + bpn + '-' | 262 | libcprefix = prefix + bpn + '-' |
263 | for p in pkgs: | 263 | for p in pkgs: |
264 | # And all the subpackages. | 264 | # And all the subpackages. |
265 | if p.startswith(libcprefix): | 265 | if p.startswith(libcprefix): |
266 | renamed = p.replace(bpn, 'libc6', 1) | 266 | renamed = p.replace(bpn, 'libc6', 1) |
267 | d.setVar('PKG_' + p, renamed) | 267 | d.setVar('PKG:' + p, renamed) |
268 | # For backward compatibility with old -dbg package | 268 | # For backward compatibility with old -dbg package |
269 | d.appendVar('RPROVIDES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') | 269 | d.appendVar('RPROVIDES:' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') |
270 | d.appendVar('RCONFLICTS_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') | 270 | d.appendVar('RCONFLICTS:' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') |
271 | d.appendVar('RREPLACES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') | 271 | d.appendVar('RREPLACES:' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') |
272 | } | 272 | } |
273 | 273 | ||
274 | pkg_postinst_nscd () { | 274 | pkg_postinst:nscd () { |
275 | if [ -z "$D" ]; then | 275 | if [ -z "$D" ]; then |
276 | if command -v systemd-tmpfiles >/dev/null; then | 276 | if command -v systemd-tmpfiles >/dev/null; then |
277 | systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/nscd.conf | 277 | systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/nscd.conf |
@@ -280,7 +280,7 @@ pkg_postinst_nscd () { | |||
280 | fi | 280 | fi |
281 | fi | 281 | fi |
282 | } | 282 | } |
283 | CONFFILES_nscd="${sysconfdir}/nscd.conf" | 283 | CONFFILES:nscd="${sysconfdir}/nscd.conf" |
284 | 284 | ||
285 | SYSTEMD_PACKAGES = "nscd" | 285 | SYSTEMD_PACKAGES = "nscd" |
286 | SYSTEMD_SERVICE_nscd = "nscd.service" | 286 | SYSTEMD_SERVICE:nscd = "nscd.service" |