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 14:38:47 +0000 |
| commit | fe19d0e01cb1563cf4735ef250f80af20059103b (patch) | |
| tree | 07aa1208bfaccdd27d69b523ed82caf0bc75ff0a /meta/recipes-core/eglibc/eglibc-2.16/tzselect-awk.patch | |
| parent | 648cda68def82fa12b3af599c06caecdc7568668 (diff) | |
| download | openembedded-core-fe19d0e01cb1563cf4735ef250f80af20059103b.tar.gz openembedded-core-fe19d0e01cb1563cf4735ef250f80af20059103b.tar.bz2 openembedded-core-fe19d0e01cb1563cf4735ef250f80af20059103b.zip | |
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].
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 @@ +tzselect: workaround bug in busybox awk + +busybox's version of awk in version 1.20.2 and lower doesn't support +escape sequences in conjunction with the -F option. Use -v FS= instead +as a workaround until the bug is fixed. + +Reference: +https://bugs.busybox.net/show_bug.cgi?id=5126 + +Upstream-Status: Inappropriate [other] + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> + +--- libc/timezone/tzselect.ksh ++++ libc/timezone/tzselect.ksh +@@ -208,7 +208,7 @@ while + TZ_for_date=$TZ;; + *) + # Get list of names of countries in the continent or ocean. +- countries=$($AWK -F'\t' \ ++ countries=$($AWK -v FS="\t" \ + -v continent="$continent" \ + -v TZ_COUNTRY_TABLE="$TZ_COUNTRY_TABLE" \ + ' +@@ -252,7 +252,7 @@ while + + + # Get list of names of time zone rule regions in the country. +- regions=$($AWK -F'\t' \ ++ regions=$($AWK -v FS="\t" \ + -v country="$country" \ + -v TZ_COUNTRY_TABLE="$TZ_COUNTRY_TABLE" \ + ' +@@ -289,7 +289,7 @@ while + esac + + # Determine TZ from country and region. +- TZ=$($AWK -F'\t' \ ++ TZ=$($AWK -v FS="\t" \ + -v country="$country" \ + -v region="$region" \ + -v TZ_COUNTRY_TABLE="$TZ_COUNTRY_TABLE" \ |