summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2020-01-29 21:13:46 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-02 16:57:21 +0000
commitad0b7366785e2b9d8edaa3496364a8c32f8c27b3 (patch)
tree66e3a8cbde822f6c606dadc7c24a31d3aa94bd14 /meta
parent1c28cf571af169942c423e967b51913c5244d6c3 (diff)
downloadpoky-ad0b7366785e2b9d8edaa3496364a8c32f8c27b3.tar.gz
glibc: merge libc-common.bbclass into glibc.bb
There's only one user of libc-common now that we don't ship both glibc and eglibc, so copy the contents directly into the recipe. [ YOCTO #12135 ] (From OE-Core rev: a0bff0db1eeb128776757d5f3d0bc1ebdc135498) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/libc-common.bbclass37
-rw-r--r--meta/recipes-core/glibc/glibc-package.inc40
2 files changed, 38 insertions, 39 deletions
diff --git a/meta/classes/libc-common.bbclass b/meta/classes/libc-common.bbclass
deleted file mode 100644
index 0e351b6746..0000000000
--- a/meta/classes/libc-common.bbclass
+++ /dev/null
@@ -1,37 +0,0 @@
1do_install() {
2 oe_runmake install_root=${D} install
3 install -Dm 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ld.so.conf
4 install -d ${D}${localedir}
5 make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED"
6 # get rid of some broken files...
7 for i in ${GLIBC_BROKEN_LOCALES}; do
8 sed -i "/$i/d" ${WORKDIR}/SUPPORTED
9 done
10 rm -f ${D}${sysconfdir}/rpc
11 rm -rf ${D}${datadir}/zoneinfo
12 rm -rf ${D}${libexecdir}/getconf
13}
14
15def get_libc_fpu_setting(bb, d):
16 if d.getVar('TARGET_FPU') in [ 'soft', 'ppc-efd' ]:
17 return "--without-fp"
18 return ""
19
20python populate_packages_prepend () {
21 if d.getVar('DEBIAN_NAMES'):
22 pkgs = d.getVar('PACKAGES').split()
23 bpn = d.getVar('BPN')
24 prefix = d.getVar('MLPREFIX') or ""
25 # Set the base package...
26 d.setVar('PKG_' + prefix + bpn, prefix + 'libc6')
27 libcprefix = prefix + bpn + '-'
28 for p in pkgs:
29 # And all the subpackages.
30 if p.startswith(libcprefix):
31 renamed = p.replace(bpn, 'libc6', 1)
32 d.setVar('PKG_' + p, renamed)
33 # For backward compatibility with old -dbg package
34 d.appendVar('RPROVIDES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg')
35 d.appendVar('RCONFLICTS_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg')
36 d.appendVar('RREPLACES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg')
37}
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index d2667f54a1..3aed7be4f8 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -65,9 +65,21 @@ DESCRIPTION_${PN}-utils = "Miscellaneous utilities including getconf, iconv, loc
65DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs" 65DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs"
66DESCRIPTION_tzcode = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" 66DESCRIPTION_tzcode = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect"
67 67
68inherit libc-common multilib_header 68inherit multilib_header
69
70do_install() {
71 oe_runmake install_root=${D} install
72 install -Dm 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ld.so.conf
73 install -d ${D}${localedir}
74 make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED"
75 # get rid of some broken files...
76 for i in ${GLIBC_BROKEN_LOCALES}; do
77 sed -i "/$i/d" ${WORKDIR}/SUPPORTED
78 done
79 rm -f ${D}${sysconfdir}/rpc
80 rm -rf ${D}${datadir}/zoneinfo
81 rm -rf ${D}${libexecdir}/getconf
69 82
70do_install_append () {
71 rm -f ${D}${sysconfdir}/localtime 83 rm -f ${D}${sysconfdir}/localtime
72 84
73 # remove empty glibc dir 85 # remove empty glibc dir
@@ -108,6 +120,11 @@ do_install_append () {
108 fi 120 fi
109} 121}
110 122
123def get_libc_fpu_setting(bb, d):
124 if d.getVar('TARGET_FPU') in [ 'soft', 'ppc-efd' ]:
125 return "--without-fp"
126 return ""
127
111do_install_append_class-target() { 128do_install_append_class-target() {
112 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 129 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
113 install -d ${D}${sysconfdir}/tmpfiles.d 130 install -d ${D}${sysconfdir}/tmpfiles.d
@@ -235,6 +252,25 @@ stash_locale_package_cleanup() {
235 stash_locale_cleanup ${PKGD} 252 stash_locale_cleanup ${PKGD}
236} 253}
237 254
255python populate_packages_prepend () {
256 if d.getVar('DEBIAN_NAMES'):
257 pkgs = d.getVar('PACKAGES').split()
258 bpn = d.getVar('BPN')
259 prefix = d.getVar('MLPREFIX') or ""
260 # Set the base package...
261 d.setVar('PKG_' + prefix + bpn, prefix + 'libc6')
262 libcprefix = prefix + bpn + '-'
263 for p in pkgs:
264 # And all the subpackages.
265 if p.startswith(libcprefix):
266 renamed = p.replace(bpn, 'libc6', 1)
267 d.setVar('PKG_' + p, renamed)
268 # For backward compatibility with old -dbg package
269 d.appendVar('RPROVIDES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg')
270 d.appendVar('RCONFLICTS_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg')
271 d.appendVar('RREPLACES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg')
272}
273
238pkg_postinst_nscd () { 274pkg_postinst_nscd () {
239 if [ -z "$D" ]; then 275 if [ -z "$D" ]; then
240 if command -v systemd-tmpfiles >/dev/null; then 276 if command -v systemd-tmpfiles >/dev/null; then