[oe-commits] org.oe.dev glibc-package.bbclass: replace os.path.join with base_path_join to make OE use the locales from WORKDIR instead of /usr, closes #1821

[koen commit]

glibc-package.bbclass: replace os.path.join with base_path_join to make OE use the locales from WORKDIR instead of /usr, closes #1821

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 5b2b2941e7e4881e571d056410b3ef2263b250e5
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5b2b2941e7e4881e571d056410b3ef2263b250e5
Files:
1
packages/glibc/glibc-package.bbclass
Diffs:

#
# mt diff -r3a83490f3912de8140c15cfc3041c16cc3cb74f9 -r5b2b2941e7e4881e571d056410b3ef2263b250e5
#
# 
# 
# patch "packages/glibc/glibc-package.bbclass"
#  from [45250e3b9ed0bf25df8e696bed6078f4e20730ac]
#    to [2529c6468fce1e1b9ff4d39758addca2534e19fb]
# 
============================================================
--- packages/glibc/glibc-package.bbclass	45250e3b9ed0bf25df8e696bed6078f4e20730ac
+++ packages/glibc/glibc-package.bbclass	2529c6468fce1e1b9ff4d39758addca2534e19fb
@@ -175,10 +175,10 @@ python package_do_split_gconvs () {
 		bb.error("datadir not defined")
 		return
 
-	gconv_libdir = os.path.join(libdir, "gconv")
-	charmap_dir = os.path.join(datadir, "i18n", "charmaps")
-	locales_dir = os.path.join(datadir, "i18n", "locales")
-	binary_locales_dir = os.path.join(libdir, "locale")
+	gconv_libdir = base_path_join(libdir, "gconv")
+	charmap_dir = base_path_join(datadir, "i18n", "charmaps")
+	locales_dir = base_path_join(datadir, "i18n", "locales")
+	binary_locales_dir = base_path_join(libdir, "locale")
 
 	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')
 
@@ -204,7 +204,7 @@ python package_do_split_gconvs () {
 
 	supported = bb.data.getVar('GLIBC_GENERATE_LOCALES', d, 1)
 	if not supported or supported == "all":
-	    f = open(os.path.join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r")
+	    f = open(base_path_join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r")
 	    supported = f.readlines()
 	    f.close()
 	else:
@@ -257,9 +257,9 @@ python package_do_split_gconvs () {
 		bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d)
 		bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d)
 
-		treedir = os.path.join(bb.data.getVar("WORKDIR", d, 1), "locale-tree")
+		treedir = base_path_join(bb.data.getVar("WORKDIR", d, 1), "locale-tree")
 		path = bb.data.getVar("PATH", d, 1)
-		i18npath = os.path.join(treedir, datadir, "i18n")
+		i18npath = base_path_join(treedir, datadir, "i18n")
 
 		localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, name)
 		cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, treedir, localedef_opts)