diff options
Diffstat (limited to 'meta/recipes-core/glibc/glibc/0015-timezone-re-written-tzselect-as-posix-sh.patch')
-rw-r--r-- | meta/recipes-core/glibc/glibc/0015-timezone-re-written-tzselect-as-posix-sh.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-core/glibc/glibc/0015-timezone-re-written-tzselect-as-posix-sh.patch b/meta/recipes-core/glibc/glibc/0015-timezone-re-written-tzselect-as-posix-sh.patch new file mode 100644 index 0000000000..b5feffa06a --- /dev/null +++ b/meta/recipes-core/glibc/glibc/0015-timezone-re-written-tzselect-as-posix-sh.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From b8cb8cb242cb751d888feb1ada5c4d0f05cbc1d7 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 15/25] 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 d6cc7ba357..e4ead6e1a7 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 d2c3a6d1dd..089679f306 100755 | ||
32 | --- a/timezone/tzselect.ksh | ||
33 | +++ b/timezone/tzselect.ksh | ||
34 | @@ -35,7 +35,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.13.2 | ||
45 | |||