diff options
Diffstat (limited to 'meta/recipes-core/glibc/glibc-package.inc')
-rw-r--r-- | meta/recipes-core/glibc/glibc-package.inc | 162 |
1 files changed, 84 insertions, 78 deletions
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 8d0cc8047f..0c5e3b4c3d 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc | |||
@@ -1,77 +1,77 @@ | |||
1 | INHIBIT_SYSROOT_STRIP = "1" | 1 | INHIBIT_SYSROOT_STRIP = "1" |
2 | 2 | ||
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" | 3 | PACKAGES = "${PN}-dbg sln nscd ldconfig ldd ldso tzcode glibc-thread-db ${PN}-pic libmemusage malloc-debug libnss-db ${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 | INSANE_SKIP:${PN}-dev += "staticdev" | |
26 | FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${sysconfdir}/ld.so.conf" | 26 | INSANE_SKIP:${MLPREFIX}ldso:append = " dev-so libdir" |
27 | RRECOMMENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', '${MLPREFIX}ldconfig', '', d)}" | 27 | |
28 | FILES_ldconfig = "${base_sbindir}/ldconfig" | 28 | FILES:${PN} = "${libc_baselibs} ${libexecdir}/* ${sysconfdir}/ld.so.conf" |
29 | FILES_ldd = "${bindir}/ldd" | 29 | RRECOMMENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', '${MLPREFIX}ldconfig', '', d)}" |
30 | FILES_libsegfault = "${base_libdir}/libSegFault*" | 30 | FILES:ldconfig = "${base_sbindir}/ldconfig" |
31 | FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" | 31 | FILES:ldd = "${bindir}/ldd" |
32 | FILES_libmemusage = "${base_libdir}/libmemusage.so" | 32 | FILES:ldso = "${bindir}/${MLPREFIX}ld.so" |
33 | FILES_libnss-db = "${base_libdir}/libnss_db.so.* ${base_libdir}/libnss_db-*.so ${localstatedir}/db/Makefile ${localstatedir}/db/makedbs.sh" | 33 | FILES:libmemusage = "${base_libdir}/libmemusage.so" |
34 | RDEPENDS_libnss-db = "${PN}-utils" | 34 | FILES:malloc-debug = "${base_libdir}/libc_malloc_debug.so.0" |
35 | FILES_glibc-extra-nss = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*" | 35 | FILES:libnss-db = "${base_libdir}/libnss_db.so.* ${base_libdir}/libnss_db-*.so ${localstatedir}/db/Makefile ${localstatedir}/db/makedbs.sh" |
36 | FILES_sln = "${base_sbindir}/sln" | 36 | RDEPENDS:libnss-db = "${PN}-utils" |
37 | FILES_${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o" | 37 | FILES:glibc-extra-nss = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*" |
38 | FILES_libsotruss = "${libdir}/audit/sotruss-lib.so" | 38 | FILES:sln = "${base_sbindir}/sln" |
39 | FILES:${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o" | ||
40 | FILES:libsotruss = "${libdir}/audit/sotruss-lib.so" | ||
39 | FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}" | 41 | FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}" |
40 | FILES_${PN}-dev += "${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" | 42 | FILES:${PN}-dev += "${libdir}/libpthread.a ${libdir}/libdl.a ${libdir}/libutil.a ${libdir}/libanl.a ${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" |
41 | RDEPENDS_${PN}-dev = "linux-libc-headers-dev" | 43 | RDEPENDS:${PN}-dev = "linux-libc-headers-dev" |
42 | FILES_${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a" | 44 | 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 \ | 45 | FILES:nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_system_unitdir}/nscd* ${nonarch_libdir}/tmpfiles.d/nscd.conf \ |
44 | ${sysconfdir}/nscd.conf ${sysconfdir}/default/volatiles/98_nscd ${localstatedir}/db/nscd" | 46 | ${sysconfdir}/nscd.conf ${sysconfdir}/default/volatiles/98_nscd ${localstatedir}/db/nscd" |
45 | FILES_${PN}-mtrace = "${bindir}/mtrace" | 47 | FILES:${PN}-mtrace = "${bindir}/mtrace" |
46 | FILES_tzcode = "${bindir}/tzselect ${sbindir}/zic ${sbindir}/zdump" | 48 | FILES:tzcode = "${bindir}/tzselect ${sbindir}/zic ${bindir}/zdump" |
47 | FILES_${PN}-utils = "${bindir}/* ${sbindir}/*" | 49 | FILES:${PN}-utils = "${bindir}/* ${sbindir}/*" |
48 | FILES_catchsegv = "${bindir}/catchsegv" | 50 | FILES:${PN}-pcprofile = "${base_libdir}/libpcprofile.so" |
49 | RDEPENDS_catchsegv = "libsegfault" | 51 | FILES:glibc-thread-db = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so" |
50 | FILES_${PN}-pcprofile = "${base_libdir}/libpcprofile.so" | 52 | RPROVIDES:${PN}-dev += "libc-dev" |
51 | FILES_glibc-thread-db = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so" | 53 | RPROVIDES:${PN}-staticdev += "libc-staticdev" |
52 | RPROVIDES_${PN}-dev += "libc-dev" | 54 | |
53 | RPROVIDES_${PN}-staticdev += "libc-staticdev" | 55 | SUMMARY:sln = "The static ln" |
54 | 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." | |
55 | SUMMARY_sln = "The static ln" | 57 | SUMMARY:nscd = "Name service cache daemon" |
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." | 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." |
57 | SUMMARY_nscd = "Name service cache daemon" | 59 | SUMMARY:glibc-extra-nss = "hesiod, NIS and NIS+ nss libraries" |
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." | 60 | DESCRIPTION:glibc-extra-nss = "glibc: nis, nisplus and hesiod search services." |
59 | SUMMARY_glibc-extra-nss = "hesiod, NIS and NIS+ nss libraries" | 61 | SUMMARY:ldd = "print shared library dependencies" |
60 | DESCRIPTION_glibc-extra-nss = "glibc: nis, nisplus and hesiod search services." | 62 | DESCRIPTION:ldd = "${bindir}/ldd prints shared library dependencies for each program or shared library specified on the command line." |
61 | SUMMARY_ldd = "print shared library dependencies" | 63 | SUMMARY:${PN}-utils = "Miscellaneous utilities provided by glibc" |
62 | DESCRIPTION_ldd = "${bindir}/ldd prints shared library dependencies for each program or shared library specified on the command line." | 64 | DESCRIPTION:${PN}-utils = "Miscellaneous utilities including getconf, iconv, locale, gencat, ..." |
63 | SUMMARY_${PN}-utils = "Miscellaneous utilities provided by glibc" | 65 | DESCRIPTION:libsotruss = "Library to support sotruss which traces calls through PLTs" |
64 | DESCRIPTION_${PN}-utils = "Miscellaneous utilities including getconf, iconv, locale, gencat, ..." | 66 | DESCRIPTION:tzcode = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" |
65 | DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs" | ||
66 | DESCRIPTION_tzcode = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" | ||
67 | 67 | ||
68 | inherit multilib_header | 68 | inherit multilib_header |
69 | 69 | ||
70 | do_install() { | 70 | do_install() { |
71 | oe_runmake install_root=${D} install | 71 | oe_runmake install_root=${D} install |
72 | install -Dm 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ld.so.conf | 72 | install -Dm 0644 ${UNPACKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/ld.so.conf |
73 | install -d ${D}${localedir} | 73 | install -d ${D}${localedir} |
74 | make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED" | 74 | make -f ${UNPACKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED" |
75 | # get rid of some broken files... | 75 | # get rid of some broken files... |
76 | for i in ${GLIBC_BROKEN_LOCALES}; do | 76 | for i in ${GLIBC_BROKEN_LOCALES}; do |
77 | sed -i "/$i/d" ${WORKDIR}/SUPPORTED | 77 | sed -i "/$i/d" ${WORKDIR}/SUPPORTED |
@@ -87,7 +87,7 @@ do_install() { | |||
87 | rmdir --ignore-fail-on-non-empty ${D}${libexecdir} | 87 | rmdir --ignore-fail-on-non-empty ${D}${libexecdir} |
88 | fi | 88 | fi |
89 | 89 | ||
90 | oe_multilib_header bits/syscall.h bits/long-double.h bits/floatn.h bits/endianness.h bits/struct_rwlock.h | 90 | oe_multilib_header bits/syscall.h bits/long-double.h bits/floatn.h bits/endianness.h bits/struct_rwlock.h bits/math-vector.h |
91 | 91 | ||
92 | if [ -f ${D}${bindir}/mtrace ]; then | 92 | if [ -f ${D}${bindir}/mtrace ]; then |
93 | sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace | 93 | sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace |
@@ -101,12 +101,12 @@ do_install() { | |||
101 | install -d ${D}${localstatedir}/db/nscd | 101 | install -d ${D}${localstatedir}/db/nscd |
102 | install -m 0755 ${S}/nscd/nscd.init ${D}${sysconfdir}/init.d/nscd | 102 | install -m 0755 ${S}/nscd/nscd.init ${D}${sysconfdir}/init.d/nscd |
103 | install -m 0755 ${S}/nscd/nscd.conf ${D}${sysconfdir}/nscd.conf | 103 | install -m 0755 ${S}/nscd/nscd.conf ${D}${sysconfdir}/nscd.conf |
104 | install -m 0755 ${WORKDIR}/makedbs.sh ${D}${localstatedir}/db | 104 | install -m 0755 ${UNPACKDIR}/makedbs.sh ${D}${localstatedir}/db |
105 | sed -i "s%daemon%start-stop-daemon --start --exec%g" ${D}${sysconfdir}/init.d/nscd | 105 | sed -i "s%daemon%start-stop-daemon --start --exec%g" ${D}${sysconfdir}/init.d/nscd |
106 | sed -i "s|\(enable-cache\t\+netgroup\t\+\)yes|\1no|" ${D}${sysconfdir}/nscd.conf | 106 | sed -i "s|\(enable-cache\t\+netgroup\t\+\)yes|\1no|" ${D}${sysconfdir}/nscd.conf |
107 | 107 | ||
108 | install -d ${D}${systemd_unitdir}/system | 108 | install -d ${D}${systemd_system_unitdir} |
109 | install -m 0644 ${S}/nscd/nscd.service ${D}${systemd_unitdir}/system/ | 109 | install -m 0644 ${S}/nscd/nscd.service ${D}${systemd_system_unitdir}/ |
110 | 110 | ||
111 | # The dynamic loader will have been installed into | 111 | # The dynamic loader will have been installed into |
112 | # ${base_libdir}. However, if that isn't going to end up being | 112 | # ${base_libdir}. However, if that isn't going to end up being |
@@ -118,6 +118,11 @@ do_install() { | |||
118 | ln -s ${@oe.path.relative('${root_prefix}/lib', '${base_libdir}')}/${ARCH_DYNAMIC_LOADER} \ | 118 | ln -s ${@oe.path.relative('${root_prefix}/lib', '${base_libdir}')}/${ARCH_DYNAMIC_LOADER} \ |
119 | ${D}${root_prefix}/lib/${ARCH_DYNAMIC_LOADER} | 119 | ${D}${root_prefix}/lib/${ARCH_DYNAMIC_LOADER} |
120 | fi | 120 | fi |
121 | ln -rs ${D}${base_libdir}/libpthread.so.0 ${D}${libdir}/libpthread.so | ||
122 | ln -rs ${D}${base_libdir}/librt.so.1 ${D}${libdir}/librt.so | ||
123 | if [ -n "${MLPREFIX}" ]; then | ||
124 | mv ${D}${bindir}/ld.so ${D}${bindir}/${MLPREFIX}ld.so | ||
125 | fi | ||
121 | } | 126 | } |
122 | 127 | ||
123 | def get_libc_fpu_setting(bb, d): | 128 | def get_libc_fpu_setting(bb, d): |
@@ -125,11 +130,11 @@ def get_libc_fpu_setting(bb, d): | |||
125 | return "--without-fp" | 130 | return "--without-fp" |
126 | return "" | 131 | return "" |
127 | 132 | ||
128 | do_install_append_class-target() { | 133 | do_install:append:class-target() { |
129 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 134 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
130 | install -d ${D}${sysconfdir}/tmpfiles.d | 135 | install -d ${D}${nonarch_libdir}/tmpfiles.d |
131 | echo "d /run/nscd 755 root root -" \ | 136 | echo "d /run/nscd 755 root root -" \ |
132 | > ${D}${sysconfdir}/tmpfiles.d/nscd.conf | 137 | > ${D}${nonarch_libdir}/tmpfiles.d/nscd.conf |
133 | fi | 138 | fi |
134 | 139 | ||
135 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 140 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
@@ -139,15 +144,15 @@ do_install_append_class-target() { | |||
139 | fi | 144 | fi |
140 | 145 | ||
141 | } | 146 | } |
142 | do_install_append_aarch64 () { | 147 | do_install:append:aarch64 () { |
143 | do_install_armmultilib | 148 | do_install_armmultilib |
144 | } | 149 | } |
145 | 150 | ||
146 | do_install_append_arm () { | 151 | do_install:append:arm () { |
147 | do_install_armmultilib | 152 | do_install_armmultilib |
148 | } | 153 | } |
149 | 154 | ||
150 | do_install_append_armeb () { | 155 | do_install:append:armeb () { |
151 | do_install_armmultilib | 156 | do_install_armmultilib |
152 | } | 157 | } |
153 | 158 | ||
@@ -156,7 +161,8 @@ do_install_armmultilib () { | |||
156 | oe_multilib_header bits/local_lim.h bits/mman.h bits/msq.h bits/pthreadtypes.h bits/pthreadtypes-arch.h bits/sem.h bits/semaphore.h bits/setjmp.h | 161 | oe_multilib_header bits/local_lim.h bits/mman.h bits/msq.h bits/pthreadtypes.h bits/pthreadtypes-arch.h bits/sem.h bits/semaphore.h bits/setjmp.h |
157 | oe_multilib_header bits/shm.h bits/sigstack.h bits/stat.h bits/statfs.h bits/typesizes.h | 162 | oe_multilib_header bits/shm.h bits/sigstack.h bits/stat.h bits/statfs.h bits/typesizes.h |
158 | oe_multilib_header bits/procfs-id.h bits/procfs.h bits/shmlba.h | 163 | oe_multilib_header bits/procfs-id.h bits/procfs.h bits/shmlba.h |
159 | oe_multilib_header bits/struct_stat.h | 164 | oe_multilib_header bits/struct_stat.h bits/pthread_stack_min.h |
165 | oe_multilib_header bits/dl_find_object.h bits/rseq.h bits/timesize.h | ||
160 | 166 | ||
161 | oe_multilib_header fpu_control.h gnu/lib-names.h gnu/stubs.h ieee754.h | 167 | oe_multilib_header fpu_control.h gnu/lib-names.h gnu/stubs.h ieee754.h |
162 | 168 | ||
@@ -252,35 +258,35 @@ stash_locale_package_cleanup() { | |||
252 | stash_locale_cleanup ${PKGD} | 258 | stash_locale_cleanup ${PKGD} |
253 | } | 259 | } |
254 | 260 | ||
255 | python populate_packages_prepend () { | 261 | python populate_packages:prepend () { |
256 | if d.getVar('DEBIAN_NAMES'): | 262 | if d.getVar('DEBIAN_NAMES'): |
257 | pkgs = d.getVar('PACKAGES').split() | 263 | pkgs = d.getVar('PACKAGES').split() |
258 | bpn = d.getVar('BPN') | 264 | bpn = d.getVar('BPN') |
259 | prefix = d.getVar('MLPREFIX') or "" | 265 | prefix = d.getVar('MLPREFIX') or "" |
260 | # Set the base package... | 266 | # Set the base package... |
261 | d.setVar('PKG_' + prefix + bpn, prefix + 'libc6') | 267 | d.setVar('PKG:' + prefix + bpn, prefix + 'libc6') |
262 | libcprefix = prefix + bpn + '-' | 268 | libcprefix = prefix + bpn + '-' |
263 | for p in pkgs: | 269 | for p in pkgs: |
264 | # And all the subpackages. | 270 | # And all the subpackages. |
265 | if p.startswith(libcprefix): | 271 | if p.startswith(libcprefix): |
266 | renamed = p.replace(bpn, 'libc6', 1) | 272 | renamed = p.replace(bpn, 'libc6', 1) |
267 | d.setVar('PKG_' + p, renamed) | 273 | d.setVar('PKG:' + p, renamed) |
268 | # For backward compatibility with old -dbg package | 274 | # For backward compatibility with old -dbg package |
269 | d.appendVar('RPROVIDES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') | 275 | d.appendVar('RPROVIDES:' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') |
270 | d.appendVar('RCONFLICTS_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') | 276 | d.appendVar('RCONFLICTS:' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') |
271 | d.appendVar('RREPLACES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') | 277 | d.appendVar('RREPLACES:' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') |
272 | } | 278 | } |
273 | 279 | ||
274 | pkg_postinst_nscd () { | 280 | pkg_postinst:nscd () { |
275 | if [ -z "$D" ]; then | 281 | if [ -z "$D" ]; then |
276 | if command -v systemd-tmpfiles >/dev/null; then | 282 | if command -v systemd-tmpfiles >/dev/null; then |
277 | systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/nscd.conf | 283 | systemd-tmpfiles --create ${nonarch_libdir}/tmpfiles.d/nscd.conf |
278 | elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then | 284 | elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then |
279 | ${sysconfdir}/init.d/populate-volatile.sh update | 285 | ${sysconfdir}/init.d/populate-volatile.sh update |
280 | fi | 286 | fi |
281 | fi | 287 | fi |
282 | } | 288 | } |
283 | CONFFILES_nscd="${sysconfdir}/nscd.conf" | 289 | CONFFILES:nscd="${sysconfdir}/nscd.conf" |
284 | 290 | ||
285 | SYSTEMD_PACKAGES = "nscd" | 291 | SYSTEMD_PACKAGES = "nscd" |
286 | SYSTEMD_SERVICE_nscd = "nscd.service" | 292 | SYSTEMD_SERVICE:nscd = "nscd.service" |