diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-08-08 10:04:18 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-15 09:44:33 +0100 |
commit | fb535ac046697db5923575bb23ee419fe7cfbab2 (patch) | |
tree | 8f842469be51c8e27647d28f4f2e8d955354dd83 /meta/recipes-core/glibc/glibc/archive-path.patch | |
parent | 19ee0f26cbaaacebacf552878ce98149957d0ac3 (diff) | |
download | poky-fb535ac046697db5923575bb23ee419fe7cfbab2.tar.gz |
glibc: Upgrade to 2.28
License-Update: libidn is dropped from glibc and a testcase that was a particular contributor copyrighted
see
https://sourceware.org/git/?p=glibc.git;a=blobdiff;f=LICENSES;h=0e3a9fe39b26e97038d92f904508a4c3aa1bb43b;hp=b29efe01084af28cc40953d7317f22927c0ee3b7;hb=5a357506659f9a00fcf5bc9c5d8fc676175c89a7;hpb=7279af007c420a9d5f88a6909d11e7cb712c16a4
https://sourceware.org/git/?p=glibc.git;a=blobdiff;f=LICENSES;h=b29efe01084af28cc40953d7317f22927c0ee3b7;hp=80f7f1487947f57815b9fe076fadc8c7f94eeb8e;hb=7f9f1ecb710eac4d65bb02785ddf288cac098323;hpb=5f7b841d3aebdccc2baed27cb4b22ddb08cd7c0c
Drop upstreamed and backported patches
(From OE-Core rev: da8bf414922ce7af865fadc4a86fd96ab6262506)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glibc/glibc/archive-path.patch')
-rw-r--r-- | meta/recipes-core/glibc/glibc/archive-path.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/meta/recipes-core/glibc/glibc/archive-path.patch b/meta/recipes-core/glibc/glibc/archive-path.patch deleted file mode 100644 index b0d3158cfe..0000000000 --- a/meta/recipes-core/glibc/glibc/archive-path.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | localedef --add-to-archive uses a hard-coded locale path which doesn't exist in | ||
2 | normal use, and there's no way to pass an alternative filename. | ||
3 | |||
4 | Add a fallback of $LOCALEARCHIVE from the environment, and allow creation of new locale archives that are not the system archive. | ||
5 | |||
6 | Upstream-Status: Inappropriate (OE-specific) | ||
7 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
8 | |||
9 | diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c | ||
10 | index ca332a34..6b7ba9b2 100644 | ||
11 | --- a/locale/programs/locarchive.c | ||
12 | +++ b/locale/programs/locarchive.c | ||
13 | @@ -569,10 +569,13 @@ open_archive (struct locarhandle *ah, bool readonly) | ||
14 | /* If ah has a non-NULL fname open that otherwise open the default. */ | ||
15 | if (archivefname == NULL) | ||
16 | { | ||
17 | - archivefname = default_fname; | ||
18 | - if (output_prefix) | ||
19 | - memcpy (default_fname, output_prefix, prefix_len); | ||
20 | - strcpy (default_fname + prefix_len, ARCHIVE_NAME); | ||
21 | + archivefname = getenv("LOCALEARCHIVE"); | ||
22 | + if (archivefname == NULL) { | ||
23 | + archivefname = default_fname; | ||
24 | + if (output_prefix) | ||
25 | + memcpy (default_fname, output_prefix, prefix_len); | ||
26 | + strcpy (default_fname + prefix_len, ARCHIVE_NAME); | ||
27 | + } | ||
28 | } | ||
29 | |||
30 | while (1) | ||
31 | @@ -585,7 +588,7 @@ open_archive (struct locarhandle *ah, bool readonly) | ||
32 | the default locale archive we ignore the failure and | ||
33 | list an empty archive, otherwise we print an error | ||
34 | and exit. */ | ||
35 | - if (errno == ENOENT && archivefname == default_fname) | ||
36 | + if (errno == ENOENT) | ||
37 | { | ||
38 | if (readonly) | ||
39 | { | ||