summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glibc/glibc/0017-timezone-re-written-tzselect-as-posix-sh.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-03-18 02:05:06 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-16 22:40:53 +0100
commitcb7368c110553dcb972480abc4a59b975677f7df (patch)
tree2ffd1b35c59f320e2141bc3016ca1777ffa4d412 /meta/recipes-core/glibc/glibc/0017-timezone-re-written-tzselect-as-posix-sh.patch
parent0183d7c4067fdf171a4420477e965dca58f6d7d3 (diff)
downloadpoky-cb7368c110553dcb972480abc4a59b975677f7df.tar.gz
glibc: Upgrade 2.21 -> 2.22
- git'ify the OE patches - add_resource_h_to_wait_h.patch - dropped, we do not support that old perf anymore - mips-rld-map-check.patch - Dropped because binutils is fixed for it see https://sourceware.org/ml/binutils/2011-12/msg00112.html - initgroups_keys.patch - Folded into 0026-eglibc-Forward-port-eglibc-options-groups-support.patch Change-Id: Ib8e731b212f52b8ff12e2180babbc19970fb1ef1 (From OE-Core rev: 6ea08396dbb628140fd3289fc9fb19df97914326) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glibc/glibc/0017-timezone-re-written-tzselect-as-posix-sh.patch')
-rw-r--r--meta/recipes-core/glibc/glibc/0017-timezone-re-written-tzselect-as-posix-sh.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-core/glibc/glibc/0017-timezone-re-written-tzselect-as-posix-sh.patch b/meta/recipes-core/glibc/glibc/0017-timezone-re-written-tzselect-as-posix-sh.patch
new file mode 100644
index 0000000000..0ce823087d
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc/0017-timezone-re-written-tzselect-as-posix-sh.patch
@@ -0,0 +1,45 @@
1From c90306107fbbe2979012917e87747ce78c82ab88 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 00:33:03 +0000
4Subject: [PATCH 17/27] timezone: re-written tzselect as posix sh
5
6To avoid the bash dependency.
7
8Upstream-Status: Pending
9
10Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
11Signed-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
17diff --git a/timezone/Makefile b/timezone/Makefile
18index 24c93c6..886b06e 100644
19--- a/timezone/Makefile
20+++ b/timezone/Makefile
21@@ -126,7 +126,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)"|' \
30diff --git a/timezone/tzselect.ksh b/timezone/tzselect.ksh
31index 9d70691..25f45a8 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 # Check for awk Posix compliance.
42 ($AWK -v x=y 'BEGIN { exit 123 }') </dev/null >/dev/null 2>&1
43--
442.1.4
45