summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/libc-package.bbclass (renamed from meta/classes/glibc-package.bbclass)216
1 files changed, 143 insertions, 73 deletions
diff --git a/meta/classes/glibc-package.bbclass b/meta/classes/libc-package.bbclass
index 56bf8ba40a..c0e7176472 100644
--- a/meta/classes/glibc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -1,5 +1,5 @@
1# 1#
2# This class knows how to package up glibc. Its shared since prebuild binary toolchains 2# This class knows how to package up [e]glibc. Its shared since prebuild binary toolchains
3# may need packaging and its pointless to duplicate this code. 3# may need packaging and its pointless to duplicate this code.
4# 4#
5# Caller should set GLIBC_INTERNAL_USE_BINARY_LOCALE to one of: 5# Caller should set GLIBC_INTERNAL_USE_BINARY_LOCALE to one of:
@@ -9,57 +9,27 @@
9 9
10GLIBC_INTERNAL_USE_BINARY_LOCALE ?= "ondevice" 10GLIBC_INTERNAL_USE_BINARY_LOCALE ?= "ondevice"
11 11
12PACKAGES = "glibc-dbg glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" 12inherit qemu
13PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* locale-base-* glibc-binary-localedata-*" 13
14 14def get_libc_fpu_setting(bb, d):
15libc_baselibs = "${base_libdir}/libc* ${base_libdir}/libm* ${base_libdir}/ld* ${base_libdir}/libpthread* ${base_libdir}/libresolv* ${base_libdir}/librt* ${base_libdir}/libutil* ${base_libdir}/libnsl* ${base_libdir}/libnss_files* ${base_libdir}/libnss_compat* ${base_libdir}/libnss_dns* ${base_libdir}/libdl* ${base_libdir}/libanl* ${base_libdir}/libBrokenLocale*" 15 if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
16 16 return "--without-fp"
17 17 return ""
18# The problem is that if PN = "glibc", FILES_${PN} will overwrite FILES_glibc 18
19# Solution: Make them both the same thing, then it doesn't matter 19OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
20 20
21glibcfiles = "${sysconfdir} ${libc_baselibs} ${base_sbindir}/ldconfig ${libexecdir}/* ${datadir}/zoneinfo" 21do_configure_prepend() {
22glibcdbgfiles = "${bindir}/.debug ${sbindir}/.debug ${libdir}/.debug \ 22 sed -e "s#@BASH@#/bin/sh#" -i ${S}/elf/ldd.bash.in
23 ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug \ 23}
24 ${libdir}/gconv/.debug ${libexecdir}/*/.debug" 24
25glibcdevfiles = "${bindir}/rpcgen ${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
26 ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
27 ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
28
29FILES_glibc = "${glibcfiles}"
30FILES_${PN} = "${glibcfiles}"
31FILES_ldd = "${bindir}/ldd"
32FILES_libsegfault = "${base_libdir}/libSegFault*"
33FILES_glibc-extra-nss = "${base_libdir}/libnss*"
34FILES_sln = "${base_sbindir}/sln"
35FILES_glibc-dev = "${glibcdevfiles}"
36FILES_${PN}-dev = "${glibcdevfiles}"
37FILES_glibc-dbg = "${glibcdbgfiles}"
38FILES_${PN}-dbg = "${glibcdbgfiles}"
39FILES_nscd = "${sbindir}/nscd* ${sysconfdir}/nscd* ${sysconfdir}/init.d/nscd*"
40FILES_glibc-utils = "${bindir}/* ${sbindir}/*"
41FILES_glibc-gconv = "${libdir}/gconv/*"
42FILES_catchsegv = "${bindir}/catchsegv"
43RDEPENDS_catchsegv = "libsegfault"
44FILES_glibc-pcprofile = "${base_libdir}/libpcprofile.so"
45FILES_glibc-thread-db = "${base_libdir}/libthread_db*"
46FILES_localedef = "${bindir}/localedef"
47RPROVIDES_glibc-dev += "libc-dev"
48
49DESCRIPTION_sln = "glibc: create symbolic links between files"
50DESCRIPTION_nscd = "glibc: name service cache daemon for passwd, group, and hosts"
51DESCRIPTION_glibc-extra-nss = "glibc: nis, nisplus and hesiod search services"
52DESCRIPTION_ldd = "glibc: print shared library dependencies"
53DESCRIPTION_localedef = "glibc: compile locale definition files"
54DESCRIPTION_glibc-utils = "glibc: misc utilities like iconf, local, gencat, tzselect, rpcinfo, ..."
55 25
56TMP_LOCALE="/tmp/locale${libdir}/locale"
57 26
27# indentation removed on purpose
58locale_base_postinst() { 28locale_base_postinst() {
59#!/bin/sh 29#!/bin/sh
60 30
61if [ "x$D" != "x" ]; then 31if [ "x$D" != "x" ]; then
62 exit 1 32 exit 1
63fi 33fi
64 34
65rm -rf ${TMP_LOCALE} 35rm -rf ${TMP_LOCALE}
@@ -73,6 +43,7 @@ mv ${TMP_LOCALE}/locale-archive ${libdir}/locale/
73rm -rf ${TMP_LOCALE} 43rm -rf ${TMP_LOCALE}
74} 44}
75 45
46# indentation removed on purpose
76locale_base_postrm() { 47locale_base_postrm() {
77#!/bin/sh 48#!/bin/sh
78 49
@@ -86,6 +57,31 @@ mv ${TMP_LOCALE}/locale-archive ${libdir}/locale/
86rm -rf ${TMP_LOCALE} 57rm -rf ${TMP_LOCALE}
87} 58}
88 59
60
61do_install() {
62 oe_runmake install_root=${D} install
63 for r in ${rpcsvc}; do
64 h=`echo $r|sed -e's,\.x$,.h,'`
65 install -m 0644 ${S}/sunrpc/rpcsvc/$h ${D}/${includedir}/rpcsvc/
66 done
67 install -m 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/
68 install -d ${D}${libdir}/locale
69 make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED"
70 # get rid of some broken files...
71 for i in ${GLIBC_BROKEN_LOCALES}; do
72 grep -v $i ${WORKDIR}/SUPPORTED > ${WORKDIR}/SUPPORTED.tmp
73 mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED
74 done
75 rm -f ${D}{sysconfdir}/rpc
76 rm -f ${D}${includedir}/scsi/sg.h
77 rm -f ${D}${includedir}/scsi/scsi_ioctl.h
78 rm -f ${D}${includedir}/scsi/scsi.h
79 rm -rf ${D}${datadir}/zoneinfo
80 rm -rf ${D}${libexecdir}/getconf
81}
82
83TMP_LOCALE="/tmp/locale${libdir}/locale"
84
89do_prep_locale_tree() { 85do_prep_locale_tree() {
90 treedir=${WORKDIR}/locale-tree 86 treedir=${WORKDIR}/locale-tree
91 rm -rf $treedir 87 rm -rf $treedir
@@ -118,6 +114,7 @@ python package_do_split_gconvs () {
118 if not bb.data.getVar('PACKAGES', d, 1): 114 if not bb.data.getVar('PACKAGES', d, 1):
119 return 115 return
120 116
117 bpn = bb.data.getVar('BPN', d, 1)
121 libdir = bb.data.getVar('libdir', d, 1) 118 libdir = bb.data.getVar('libdir', d, 1)
122 if not libdir: 119 if not libdir:
123 bb.error("libdir not defined") 120 bb.error("libdir not defined")
@@ -132,9 +129,46 @@ python package_do_split_gconvs () {
132 locales_dir = base_path_join(datadir, "i18n", "locales") 129 locales_dir = base_path_join(datadir, "i18n", "locales")
133 binary_locales_dir = base_path_join(libdir, "locale") 130 binary_locales_dir = base_path_join(libdir, "locale")
134 131
135 do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern='glibc-gconv-%s', description='gconv module for character set %s', extra_depends='glibc-gconv') 132 def calc_gconv_deps(fn, pkg, file_regex, output_pattern, group):
133 deps = []
134 f = open(fn, "r")
135 c_re = re.compile('^copy "(.*)"')
136 i_re = re.compile('^include "(\w+)".*')
137 for l in f.readlines():
138 m = c_re.match(l) or i_re.match(l)
139 if m:
140 dp = legitimize_package_name('%s-gconv-%s' % (bpn, m.group(1)))
141 if not dp in deps:
142 deps.append(dp)
143 f.close()
144 if deps != []:
145 bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d)
146 if bpn != 'glibc':
147 bb.data.setVar('RPROVIDES_%s' % pkg, pkg.replace(bpn, 'glibc'), d)
148
149 do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern=bpn+'-gconv-%s', \
150 description='gconv module for character set %s', hook=calc_gconv_deps, \
151 extra_depends=bpn+'-gconv')
136 152
137 do_split_packages(d, charmap_dir, file_regex='^(.*)\.gz$', output_pattern='glibc-charmap-%s', description='character map for %s encoding', extra_depends='') 153 def calc_charmap_deps(fn, pkg, file_regex, output_pattern, group):
154 deps = []
155 f = open(fn, "r")
156 c_re = re.compile('^copy "(.*)"')
157 i_re = re.compile('^include "(\w+)".*')
158 for l in f.readlines():
159 m = c_re.match(l) or i_re.match(l)
160 if m:
161 dp = legitimize_package_name('%s-charmap-%s' % (bpn, m.group(1)))
162 if not dp in deps:
163 deps.append(dp)
164 f.close()
165 if deps != []:
166 bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d)
167 if bpn != 'glibc':
168 bb.data.setVar('RPROVIDES_%s' % pkg, pkg.replace(bpn, 'glibc'), d)
169
170 do_split_packages(d, charmap_dir, file_regex='^(.*)\.gz$', output_pattern=bpn+'-charmap-%s', \
171 description='character map for %s encoding', hook=calc_charmap_deps, extra_depends='')
138 172
139 def calc_locale_deps(fn, pkg, file_regex, output_pattern, group): 173 def calc_locale_deps(fn, pkg, file_regex, output_pattern, group):
140 deps = [] 174 deps = []
@@ -144,24 +178,33 @@ python package_do_split_gconvs () {
144 for l in f.readlines(): 178 for l in f.readlines():
145 m = c_re.match(l) or i_re.match(l) 179 m = c_re.match(l) or i_re.match(l)
146 if m: 180 if m:
147 dp = legitimize_package_name('glibc-localedata-%s' % m.group(1)) 181 dp = legitimize_package_name(bpn+'-localedata-%s' % m.group(1))
148 if not dp in deps: 182 if not dp in deps:
149 deps.append(dp) 183 deps.append(dp)
150 f.close() 184 f.close()
151 if deps != []: 185 if deps != []:
152 bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d) 186 bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d)
187 if bpn != 'glibc':
188 bb.data.setVar('RPROVIDES_%s' % pkg, pkg.replace(bpn, 'glibc'), d)
153 189
154 do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='glibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='') 190 do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern=bpn+'-localedata-%s', \
155 bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' glibc-gconv', d) 191 description='locale definition for %s', hook=calc_locale_deps, extra_depends='')
192 bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' ' + bpn + '-gconv', d)
156 193
157 use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1) 194 use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1)
158 195
159 dot_re = re.compile("(.*)\.(.*)") 196 dot_re = re.compile("(.*)\.(.*)")
160 197
198#GLIBC_GENERATE_LOCALES var specifies which locales to be supported, empty or "all" means all locales
161 if use_bin != "precompiled": 199 if use_bin != "precompiled":
162 f = open(os.path.join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r") 200 supported = bb.data.getVar('GLIBC_GENERATE_LOCALES', d, 1)
163 supported = f.readlines() 201 if not supported or supported == "all":
164 f.close() 202 f = open(base_path_join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r")
203 supported = f.readlines()
204 f.close()
205 else:
206 supported = supported.split()
207 supported = map(lambda s:s.replace(".", " ") + "\n", supported)
165 else: 208 else:
166 supported = [] 209 supported = []
167 full_bin_path = bb.data.getVar('PKGD', d, True) + binary_locales_dir 210 full_bin_path = bb.data.getVar('PKGD', d, True) + binary_locales_dir
@@ -188,44 +231,66 @@ python package_do_split_gconvs () {
188 encodings[locale].append(charset) 231 encodings[locale].append(charset)
189 232
190 def output_locale_source(name, pkgname, locale, encoding): 233 def output_locale_source(name, pkgname, locale, encoding):
191 bb.data.setVar('RDEPENDS_%s' % pkgname, 'localedef glibc-localedata-%s glibc-charmap-%s' % (legitimize_package_name(locale), legitimize_package_name(encoding)), d) 234 bb.data.setVar('RDEPENDS_%s' % pkgname, 'localedef %s-localedata-%s %s-charmap-%s' % \
192 bb.data.setVar('pkg_postinst_%s' % pkgname, bb.data.getVar('locale_base_postinst', d, 1) % (locale, encoding, locale), d) 235 (bpn, legitimize_package_name(locale), bpn, legitimize_package_name(encoding)), d)
193 bb.data.setVar('pkg_postrm_%s' % pkgname, bb.data.getVar('locale_base_postrm', d, 1) % (locale, encoding, locale), d) 236 bb.data.setVar('pkg_postinst_%s' % pkgname, bb.data.getVar('locale_base_postinst', d, 1) \
237 % (locale, encoding, locale), d)
238 bb.data.setVar('pkg_postrm_%s' % pkgname, bb.data.getVar('locale_base_postrm', d, 1) % \
239 (locale, encoding, locale), d)
194 240
195 def output_locale_binary_rdepends(name, pkgname, locale, encoding): 241 def output_locale_binary_rdepends(name, pkgname, locale, encoding):
196 m = re.match("(.*)\.(.*)", name) 242 m = re.match("(.*)_(.*)", name)
197 if m: 243 if m:
198 glibc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-","")) 244 libc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-",""))
199 else: 245 else:
200 glibc_name = name 246 libc_name = name
201 bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('glibc-binary-localedata-%s' % glibc_name), d) 247 bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \
248 % (bpn, libc_name)), d)
249 rprovides = (bb.data.getVar('RPROVIDES_%s' % pkgname, d, True) or "").split()
250 rprovides.append(legitimize_package_name('%s-binary-localedata-%s' % (bpn, libc_name)))
251 bb.data.setVar('RPROVIDES_%s' % pkgname, " ".join(rprovides), d)
202 252
203 def output_locale_binary(name, pkgname, locale, encoding): 253 def output_locale_binary(name, pkgname, locale, encoding):
254 qemu = qemu_target_binary(d)
255
204 treedir = base_path_join(bb.data.getVar("WORKDIR", d, 1), "locale-tree") 256 treedir = base_path_join(bb.data.getVar("WORKDIR", d, 1), "locale-tree")
257 ldlibdir = "%s/lib" % treedir
205 path = bb.data.getVar("PATH", d, 1) 258 path = bb.data.getVar("PATH", d, 1)
206 i18npath = base_path_join(treedir, datadir, "i18n") 259 i18npath = base_path_join(treedir, datadir, "i18n")
207 target_arch = bb.data.getVar("TARGET_ARCH", d, 1) 260
208 qemu = "qemu-%s" % target_arch 261 localedef_opts = "--force --old-style --no-archive --prefix=%s \
209 localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, name) 262 --inputfile=%s/i18n/locales/%s --charmap=%s %s" \
263 % (treedir, datadir, locale, encoding, name)
210 264
211 qemu_options = bb.data.getVar("QEMU_OPTIONS_%s" % bb.data.getVar('PACKAGE_ARCH', d, 1), d, 1) 265 qemu_options = bb.data.getVar("QEMU_OPTIONS_%s" % bb.data.getVar('PACKAGE_ARCH', d, 1), d, 1)
212 if not qemu_options: 266 if not qemu_options:
213 qemu_options = bb.data.getVar('QEMU_OPTIONS', d, 1) 267 qemu_options = bb.data.getVar('QEMU_OPTIONS', d, 1)
214 268
215 cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, qemu_options, treedir, localedef_opts) 269 cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s \
270 -E LD_LIBRARY_PATH=%s %s %s/bin/localedef %s" % \
271 (path, i18npath, qemu, treedir, ldlibdir, qemu_options, treedir, localedef_opts)
216 bb.note("generating locale %s (%s)" % (locale, encoding)) 272 bb.note("generating locale %s (%s)" % (locale, encoding))
217 if os.system(cmd): 273 import subprocess
218 raise bb.build.FuncFailed("localedef returned an error (command was %s)." % cmd) 274 process = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
275 if process.wait() != 0:
276 bb.note("cmd:")
277 bb.note(cmd)
278 bb.note("stdout:")
279 bb.note(process.stdout.read())
280 bb.note("stderr:")
281 bb.note(process.stderr.read())
282 raise bb.build.FuncFailed("localedef returned an error")
219 283
220 def output_locale(name, locale, encoding): 284 def output_locale(name, locale, encoding):
221 pkgname = 'locale-base-' + legitimize_package_name(name) 285 pkgname = 'locale-base-' + legitimize_package_name(name)
222 bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d) 286 bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d)
223 bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d) 287 bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d)
224 rprovides = 'virtual-locale-%s' % legitimize_package_name(name) 288 rprovides = ' virtual-locale-%s' % legitimize_package_name(name)
225 m = re.match("(.*)_(.*)", name) 289 m = re.match("(.*)_(.*)", name)
226 if m: 290 if m:
227 rprovides += ' virtual-locale-%s' % m.group(1) 291 rprovides += ' virtual-locale-%s' % m.group(1)
228 bb.data.setVar('RPROVIDES_%s' % pkgname, rprovides, d) 292 bb.data.setVar('RPROVIDES_%s' % pkgname, rprovides, d)
293
229 if use_bin == "compile": 294 if use_bin == "compile":
230 output_locale_binary_rdepends(name, pkgname, locale, encoding) 295 output_locale_binary_rdepends(name, pkgname, locale, encoding)
231 output_locale_binary(name, pkgname, locale, encoding) 296 output_locale_binary(name, pkgname, locale, encoding)
@@ -261,9 +326,13 @@ python package_do_split_gconvs () {
261 if use_bin == "compile": 326 if use_bin == "compile":
262 bb.note("collecting binary locales from locale tree") 327 bb.note("collecting binary locales from locale tree")
263 bb.build.exec_func("do_collect_bins_from_locale_tree", d) 328 bb.build.exec_func("do_collect_bins_from_locale_tree", d)
264 do_split_packages(d, binary_locales_dir, file_regex='(.*)', output_pattern='glibc-binary-localedata-%s', description='binary locale definition for %s', extra_depends='', allow_dirs=True) 329 do_split_packages(d, binary_locales_dir, file_regex='(.*)', \
330 output_pattern=bpn+'-binary-localedata-%s', \
331 description='binary locale definition for %s', extra_depends='', allow_dirs=True)
265 elif use_bin == "precompiled": 332 elif use_bin == "precompiled":
266 do_split_packages(d, binary_locales_dir, file_regex='(.*)', output_pattern='glibc-binary-localedata-%s', description='binary locale definition for %s', extra_depends='', allow_dirs=True) 333 do_split_packages(d, binary_locales_dir, file_regex='(.*)', \
334 output_pattern=bpn+'-binary-localedata-%s', \
335 description='binary locale definition for %s', extra_depends='', allow_dirs=True)
267 else: 336 else:
268 bb.note("generation of binary locales disabled. this may break i18n!") 337 bb.note("generation of binary locales disabled. this may break i18n!")
269 338
@@ -273,7 +342,8 @@ python package_do_split_gconvs () {
273# from the called function even though we're prepending 342# from the called function even though we're prepending
274python populate_packages_prepend () { 343python populate_packages_prepend () {
275 if bb.data.getVar('DEBIAN_NAMES', d, 1): 344 if bb.data.getVar('DEBIAN_NAMES', d, 1):
276 bb.data.setVar('PKG_glibc', 'libc6', d) 345 bpn = bb.data.getVar('BPN', d, 1)
277 bb.data.setVar('PKG_glibc-dev', 'libc6-dev', d) 346 bb.data.setVar('PKG_'+bpn, 'libc6', d)
347 bb.data.setVar('PKG_'+bpn+'-dev', 'libc6-dev', d)
278 bb.build.exec_func('package_do_split_gconvs', d) 348 bb.build.exec_func('package_do_split_gconvs', d)
279} 349}