diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-12-20 15:40:20 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-19 13:24:38 +0000 |
commit | 2b5cf2a067cb6d9ca32d851dacdc1aff0cbfe904 (patch) | |
tree | b19c049d43c8b2f1a2eefcc1f257eeef03a62c62 /meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch | |
parent | c7a903aaa10eadae4ec7f4af3f3fa30763c144fc (diff) | |
download | poky-2b5cf2a067cb6d9ca32d851dacdc1aff0cbfe904.tar.gz |
glibc: Upgrade to 2.31
License-Update: Prefer https to http for gnu.org and fsf.org URLs [1]
[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=5a82c74822d3272df2f5929133680478c0cfb4bd
(From OE-Core rev: b22626d996e153d6094e1f76ed33ee1bb3eea751)
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/0016-timezone-re-written-tzselect-as-posix-sh.patch')
-rw-r--r-- | meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch b/meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch deleted file mode 100644 index 4d1cf31973..0000000000 --- a/meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From a74f31ea9edf105f1a6dc26497aa2a12ae736660 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 18 Mar 2015 00:33:03 +0000 | ||
4 | Subject: [PATCH 16/28] timezone: re-written tzselect as posix sh | ||
5 | |||
6 | To avoid the bash dependency. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | timezone/Makefile | 2 +- | ||
14 | timezone/tzselect.ksh | 2 +- | ||
15 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/timezone/Makefile b/timezone/Makefile | ||
18 | index 493deca790..36e559e16c 100644 | ||
19 | --- a/timezone/Makefile | ||
20 | +++ b/timezone/Makefile | ||
21 | @@ -122,7 +122,7 @@ $(testdata)/XT%: testdata/XT% | ||
22 | cp $< $@ | ||
23 | |||
24 | $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make | ||
25 | - sed -e 's|/bin/bash|$(BASH)|' \ | ||
26 | + sed -e 's|/bin/bash|/bin/sh|' \ | ||
27 | -e 's|TZDIR=[^}]*|TZDIR=$(zonedir)|' \ | ||
28 | -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \ | ||
29 | -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \ | ||
30 | diff --git a/timezone/tzselect.ksh b/timezone/tzselect.ksh | ||
31 | index 18fce27e24..70745f9d36 100755 | ||
32 | --- a/timezone/tzselect.ksh | ||
33 | +++ b/timezone/tzselect.ksh | ||
34 | @@ -34,7 +34,7 @@ REPORT_BUGS_TO=tz@iana.org | ||
35 | |||
36 | # Specify default values for environment variables if they are unset. | ||
37 | : ${AWK=awk} | ||
38 | -: ${TZDIR=`pwd`} | ||
39 | +: ${TZDIR=$(pwd)} | ||
40 | |||
41 | # Output one argument as-is to standard output. | ||
42 | # Safer than 'echo', which can mishandle '\' or leading '-'. | ||
43 | -- | ||
44 | 2.22.0 | ||
45 | |||