diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2016-07-07 11:08:27 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-12 23:10:02 +0100 |
| commit | 78ab1e7cdedc6a73395af5d053b49cf081416732 (patch) | |
| tree | 7ab5d37d67a16a7b6dba2e91d7ad155d92a9cc24 | |
| parent | 37e8b6ecf9f9163d7b5b3becdc2feba57df4838f (diff) | |
| download | openembedded-core-contrib-78ab1e7cdedc6a73395af5d053b49cf081416732.tar.gz | |
glibc: Upgrade to latest tip of master
- libc-package.bbclass: Do not use --old-style
This option has been dropped from latest glibc
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/classes/libc-package.bbclass | 4 | ||||
| -rw-r--r-- | meta/recipes-core/glibc/cross-localedef-native_2.24.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-core/glibc/glibc_2.24.bb | 2 |
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 () { bb.error("locale_arch_options not found for target_arch=" + target_arch) raise bb.build.FuncFailed("unknown arch:" + target_arch + " for locale_arch_options") - localedef_opts += " --force --old-style --no-archive --prefix=%s \ + localedef_opts += " --force --no-archive --prefix=%s \ --inputfile=%s/%s/i18n/locales/%s --charmap=%s %s/%s" \ % (treedir, treedir, datadir, locale, encoding, outputpath, name) @@ -270,7 +270,7 @@ python package_do_split_gconvs () { (path, i18npath, gconvpath, localedef_opts) else: # earlier slower qemu way qemu = qemu_target_binary(d) - localedef_opts = "--force --old-style --no-archive --prefix=%s \ + localedef_opts = "--force --no-archive --prefix=%s \ --inputfile=%s/i18n/locales/%s --charmap=%s %s" \ % (treedir, datadir, locale, encoding, name) 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" SRCBRANCH ?= "master" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)" -SRCREV_glibc ?= "1ac3eaa6bcc473a56340c24511786ff48a91293e" +SRCREV_glibc ?= "d461c9682d4954076f9ee9e07be903c2eef8e73b" SRCREV_localedef ?= "29869b6dc11427c5bab839bdb155c85a7c644c71" SRC_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 \ DEPENDS += "gperf-native" -SRCREV ?= "1ac3eaa6bcc473a56340c24511786ff48a91293e" +SRCREV ?= "d461c9682d4954076f9ee9e07be903c2eef8e73b" #SRCBRANCH ?= "release/${PV}/master" SRCBRANCH ?= "master" |