diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-08-06 11:42:02 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-10 12:40:26 -0700 |
commit | 3893a4fab9962830f3d1782e12728382f5ad1642 (patch) | |
tree | 7ba9bf78b3819c6f78d4a3abbb1147bf9418d2f7 /meta/recipes-extended/which/which-2.20 | |
parent | d70a3db3dd0f65bc66e95bb41498e0acb349a581 (diff) | |
download | poky-3893a4fab9962830f3d1782e12728382f5ad1642.tar.gz |
which: Upgrade 2.20 -> 2.21
* Drop one upstreamed patch, update the other one
(From OE-Core rev: 254ca955ca22944634982f6b138bb3de56863777)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/which/which-2.20')
-rw-r--r-- | meta/recipes-extended/which/which-2.20/automake.patch | 15 | ||||
-rw-r--r-- | meta/recipes-extended/which/which-2.20/remove-declaration.patch | 18 |
2 files changed, 0 insertions, 33 deletions
diff --git a/meta/recipes-extended/which/which-2.20/automake.patch b/meta/recipes-extended/which/which-2.20/automake.patch deleted file mode 100644 index ef00bc9f23..0000000000 --- a/meta/recipes-extended/which/which-2.20/automake.patch +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | Update autoconf prologue to use "foreign" strictness. | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
5 | |||
6 | diff --git a/configure.ac b/configure.ac | ||
7 | index d974461..a20dfa8 100644 | ||
8 | --- a/configure.ac | ||
9 | +++ b/configure.ac | ||
10 | @@ -2,2 +2,3 @@ dnl Process this file with autoconf to produce a configure script. | ||
11 | -AC_INIT(which.c) | ||
12 | -AM_INIT_AUTOMAKE(which, 2.20) | ||
13 | +AC_INIT([which],[2.20]) | ||
14 | +AC_CONFIG_SRCDIR(which.c) | ||
15 | +AM_INIT_AUTOMAKE([foreign]) | ||
diff --git a/meta/recipes-extended/which/which-2.20/remove-declaration.patch b/meta/recipes-extended/which/which-2.20/remove-declaration.patch deleted file mode 100644 index d3340a3530..0000000000 --- a/meta/recipes-extended/which/which-2.20/remove-declaration.patch +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | Remove the declaration of group_member since it has already been | ||
2 | declared in unistd.h | ||
3 | |||
4 | Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> | ||
5 | |||
6 | Upstream-Status: Inappropriate [embedded specific] | ||
7 | |||
8 | diff -ruN which-2.20-orig/bash.c which-2.20/bash.c | ||
9 | --- which-2.20-orig/bash.c 2010-08-03 12:59:08.897088878 +0800 | ||
10 | +++ which-2.20/bash.c 2010-08-03 13:17:23.406097212 +0800 | ||
11 | @@ -46,7 +46,6 @@ | ||
12 | * - changed all occurences of 'gid_t' into 'GID_T'. | ||
13 | * - exported functions needed in which.c | ||
14 | */ | ||
15 | -static int group_member (GID_T gid); | ||
16 | static char* extract_colon_unit (char const* string, int* p_index); | ||
17 | |||
18 | /*=========================================================================== | ||