diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-12-12 14:15:25 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-13 15:18:46 +0000 |
commit | 2f85e62b896ef71e616b5645360cb6750fe4514e (patch) | |
tree | 4411bad2d4593dbafe59ca76ffec737c65308acf /meta/recipes-core/eglibc/eglibc-2.16/tzselect-awk.patch | |
parent | 5693f3e15850cdb05bafb178d92df1aa8e196fe9 (diff) | |
download | poky-2f85e62b896ef71e616b5645360cb6750fe4514e.tar.gz |
eglibc: remove dependency of eglibc-utils on bash
Adapt a patch from Peter Seebach <peter.seebach@windriver.com> to remove
the non-POSIX elements from the tzselect script, and add a separate
patch to work around a bug in the current version of busybox's awk
command. This replaces the /bin/bash reference in the script header with
/bin/sh and thus eliminates the dependency on bash picked up during
packaging.
Fixes [YOCTO #3551].
(From OE-Core rev: fe19d0e01cb1563cf4735ef250f80af20059103b)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/eglibc/eglibc-2.16/tzselect-awk.patch')
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-2.16/tzselect-awk.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/tzselect-awk.patch b/meta/recipes-core/eglibc/eglibc-2.16/tzselect-awk.patch new file mode 100644 index 0000000000..dc9949bec9 --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.16/tzselect-awk.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | tzselect: workaround bug in busybox awk | ||
2 | |||
3 | busybox's version of awk in version 1.20.2 and lower doesn't support | ||
4 | escape sequences in conjunction with the -F option. Use -v FS= instead | ||
5 | as a workaround until the bug is fixed. | ||
6 | |||
7 | Reference: | ||
8 | https://bugs.busybox.net/show_bug.cgi?id=5126 | ||
9 | |||
10 | Upstream-Status: Inappropriate [other] | ||
11 | |||
12 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
13 | |||
14 | --- libc/timezone/tzselect.ksh | ||
15 | +++ libc/timezone/tzselect.ksh | ||
16 | @@ -208,7 +208,7 @@ while | ||
17 | TZ_for_date=$TZ;; | ||
18 | *) | ||
19 | # Get list of names of countries in the continent or ocean. | ||
20 | - countries=$($AWK -F'\t' \ | ||
21 | + countries=$($AWK -v FS="\t" \ | ||
22 | -v continent="$continent" \ | ||
23 | -v TZ_COUNTRY_TABLE="$TZ_COUNTRY_TABLE" \ | ||
24 | ' | ||
25 | @@ -252,7 +252,7 @@ while | ||
26 | |||
27 | |||
28 | # Get list of names of time zone rule regions in the country. | ||
29 | - regions=$($AWK -F'\t' \ | ||
30 | + regions=$($AWK -v FS="\t" \ | ||
31 | -v country="$country" \ | ||
32 | -v TZ_COUNTRY_TABLE="$TZ_COUNTRY_TABLE" \ | ||
33 | ' | ||
34 | @@ -289,7 +289,7 @@ while | ||
35 | esac | ||
36 | |||
37 | # Determine TZ from country and region. | ||
38 | - TZ=$($AWK -F'\t' \ | ||
39 | + TZ=$($AWK -v FS="\t" \ | ||
40 | -v country="$country" \ | ||
41 | -v region="$region" \ | ||
42 | -v TZ_COUNTRY_TABLE="$TZ_COUNTRY_TABLE" \ | ||