summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/libc-package.bbclass4
-rw-r--r--meta/recipes-core/glibc/cross-localedef-native_2.24.bb2
-rw-r--r--meta/recipes-core/glibc/glibc_2.24.bb2
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index c1781c64b4..8c99d6113d 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -262,7 +262,7 @@ python package_do_split_gconvs () {
262 bb.error("locale_arch_options not found for target_arch=" + target_arch) 262 bb.error("locale_arch_options not found for target_arch=" + target_arch)
263 raise bb.build.FuncFailed("unknown arch:" + target_arch + " for locale_arch_options") 263 raise bb.build.FuncFailed("unknown arch:" + target_arch + " for locale_arch_options")
264 264
265 localedef_opts += " --force --old-style --no-archive --prefix=%s \ 265 localedef_opts += " --force --no-archive --prefix=%s \
266 --inputfile=%s/%s/i18n/locales/%s --charmap=%s %s/%s" \ 266 --inputfile=%s/%s/i18n/locales/%s --charmap=%s %s/%s" \
267 % (treedir, treedir, datadir, locale, encoding, outputpath, name) 267 % (treedir, treedir, datadir, locale, encoding, outputpath, name)
268 268
@@ -270,7 +270,7 @@ python package_do_split_gconvs () {
270 (path, i18npath, gconvpath, localedef_opts) 270 (path, i18npath, gconvpath, localedef_opts)
271 else: # earlier slower qemu way 271 else: # earlier slower qemu way
272 qemu = qemu_target_binary(d) 272 qemu = qemu_target_binary(d)
273 localedef_opts = "--force --old-style --no-archive --prefix=%s \ 273 localedef_opts = "--force --no-archive --prefix=%s \
274 --inputfile=%s/i18n/locales/%s --charmap=%s %s" \ 274 --inputfile=%s/i18n/locales/%s --charmap=%s %s" \
275 % (treedir, datadir, locale, encoding, name) 275 % (treedir, datadir, locale, encoding, name)
276 276
diff --git a/meta/recipes-core/glibc/cross-localedef-native_2.24.bb b/meta/recipes-core/glibc/cross-localedef-native_2.24.bb
index 79c31326e5..104e38bceb 100644
--- a/meta/recipes-core/glibc/cross-localedef-native_2.24.bb
+++ b/meta/recipes-core/glibc/cross-localedef-native_2.24.bb
@@ -22,7 +22,7 @@ GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
22SRCBRANCH ?= "master" 22SRCBRANCH ?= "master"
23UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)" 23UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)"
24 24
25SRCREV_glibc ?= "1ac3eaa6bcc473a56340c24511786ff48a91293e" 25SRCREV_glibc ?= "d461c9682d4954076f9ee9e07be903c2eef8e73b"
26SRCREV_localedef ?= "29869b6dc11427c5bab839bdb155c85a7c644c71" 26SRCREV_localedef ?= "29869b6dc11427c5bab839bdb155c85a7c644c71"
27 27
28SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ 28SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
diff --git a/meta/recipes-core/glibc/glibc_2.24.bb b/meta/recipes-core/glibc/glibc_2.24.bb
index 77630e3c70..f0c6a0366d 100644
--- a/meta/recipes-core/glibc/glibc_2.24.bb
+++ b/meta/recipes-core/glibc/glibc_2.24.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSES;md5=e9a558e243b36d3209f380deb394b213 \
7 7
8DEPENDS += "gperf-native" 8DEPENDS += "gperf-native"
9 9
10SRCREV ?= "1ac3eaa6bcc473a56340c24511786ff48a91293e" 10SRCREV ?= "d461c9682d4954076f9ee9e07be903c2eef8e73b"
11 11
12#SRCBRANCH ?= "release/${PV}/master" 12#SRCBRANCH ?= "release/${PV}/master"
13SRCBRANCH ?= "master" 13SRCBRANCH ?= "master"