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-09 15:14:31 -0700 |
| commit | 254ca955ca22944634982f6b138bb3de56863777 (patch) | |
| tree | 320b87a01ce6433544dfa87d13bb6426711662e5 | |
| parent | 3583814792967bfa5f0a3d7d18146e447eabe348 (diff) | |
| download | openembedded-core-contrib-254ca955ca22944634982f6b138bb3de56863777.tar.gz | |
which: Upgrade 2.20 -> 2.21
* Drop one upstreamed patch, update the other one
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-extended/which/which-2.20/remove-declaration.patch | 18 | ||||
| -rw-r--r-- | meta/recipes-extended/which/which-2.21/automake.patch (renamed from meta/recipes-extended/which/which-2.20/automake.patch) | 14 | ||||
| -rw-r--r-- | meta/recipes-extended/which/which_2.21.bb (renamed from meta/recipes-extended/which/which_2.20.bb) | 6 |
3 files changed, 12 insertions, 26 deletions
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 @@ -Remove the declaration of group_member since it has already been -declared in unistd.h - -Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> - -Upstream-Status: Inappropriate [embedded specific] - -diff -ruN which-2.20-orig/bash.c which-2.20/bash.c ---- which-2.20-orig/bash.c 2010-08-03 12:59:08.897088878 +0800 -+++ which-2.20/bash.c 2010-08-03 13:17:23.406097212 +0800 -@@ -46,7 +46,6 @@ - * - changed all occurences of 'gid_t' into 'GID_T'. - * - exported functions needed in which.c - */ --static int group_member (GID_T gid); - static char* extract_colon_unit (char const* string, int* p_index); - - /*=========================================================================== diff --git a/meta/recipes-extended/which/which-2.20/automake.patch b/meta/recipes-extended/which/which-2.21/automake.patch index ef00bc9f23..4d0f2e4d7b 100644 --- a/meta/recipes-extended/which/which-2.20/automake.patch +++ b/meta/recipes-extended/which/which-2.21/automake.patch @@ -7,9 +7,13 @@ diff --git a/configure.ac b/configure.ac index d974461..a20dfa8 100644 --- a/configure.ac +++ b/configure.ac -@@ -2,2 +2,3 @@ dnl Process this file with autoconf to produce a configure script. --AC_INIT(which.c) --AM_INIT_AUTOMAKE(which, 2.20) -+AC_INIT([which],[2.20]) -+AC_CONFIG_SRCDIR(which.c) +@@ -1,7 +1,7 @@ + dnl Process this file with autoconf to produce a configure script. + AC_INIT([which], [2.21]) + AC_CONFIG_SRCDIR(which.c) +-AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([foreign]) + AM_CONFIG_HEADER(config.h) + AM_MAINTAINER_MODE + + diff --git a/meta/recipes-extended/which/which_2.20.bb b/meta/recipes-extended/which/which_2.21.bb index 74835543de..a7687f6fe4 100644 --- a/meta/recipes-extended/which/which_2.20.bb +++ b/meta/recipes-extended/which/which_2.21.bb @@ -19,10 +19,10 @@ EXTRA_OECONF = "--disable-iberty" SRC_URI = "${GNU_MIRROR}/which/which-${PV}.tar.gz \ file://automake.patch \ - file://remove-declaration.patch" + " -SRC_URI[md5sum] = "95be0501a466e515422cde4af46b2744" -SRC_URI[sha256sum] = "d417b65c650d88ad26a208293c1c6e3eb60d4b6d847f01ff8f66aca63e2857f8" +SRC_URI[md5sum] = "097ff1a324ae02e0a3b0369f07a7544a" +SRC_URI[sha256sum] = "f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad" do_configure_prepend() { sed -i -e 's%@ACLOCAL_CWFLAGS@%-I ${STAGING_DIR_NATIVE}/usr/share/cwautomacros/m4%g' ${S}/Makefile.am ${S}/tilde/Makefile.am |