From 254ca955ca22944634982f6b138bb3de56863777 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Thu, 6 Aug 2015 11:42:02 +0300 Subject: which: Upgrade 2.20 -> 2.21 * Drop one upstreamed patch, update the other one Signed-off-by: Jussi Kukkonen Signed-off-by: Richard Purdie --- .../which/which-2.20/automake.patch | 15 ---------- .../which/which-2.20/remove-declaration.patch | 18 ------------ .../which/which-2.21/automake.patch | 19 +++++++++++++ meta/recipes-extended/which/which_2.20.bb | 32 ---------------------- meta/recipes-extended/which/which_2.21.bb | 32 ++++++++++++++++++++++ 5 files changed, 51 insertions(+), 65 deletions(-) delete mode 100644 meta/recipes-extended/which/which-2.20/automake.patch delete mode 100644 meta/recipes-extended/which/which-2.20/remove-declaration.patch create mode 100644 meta/recipes-extended/which/which-2.21/automake.patch delete mode 100644 meta/recipes-extended/which/which_2.20.bb create mode 100644 meta/recipes-extended/which/which_2.21.bb (limited to 'meta/recipes-extended') 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 @@ -Update autoconf prologue to use "foreign" strictness. - -Upstream-Status: Pending -Signed-off-by: Ross Burton - -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) -+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 @@ -Remove the declaration of group_member since it has already been -declared in unistd.h - -Signed-off-by: Dongxiao Xu - -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.21/automake.patch b/meta/recipes-extended/which/which-2.21/automake.patch new file mode 100644 index 0000000000..4d0f2e4d7b --- /dev/null +++ b/meta/recipes-extended/which/which-2.21/automake.patch @@ -0,0 +1,19 @@ +Update autoconf prologue to use "foreign" strictness. + +Upstream-Status: Pending +Signed-off-by: Ross Burton + +diff --git a/configure.ac b/configure.ac +index d974461..a20dfa8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -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.20.bb deleted file mode 100644 index 74835543de..0000000000 --- a/meta/recipes-extended/which/which_2.20.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Displays the full path of shell commands" -DESCRIPTION = "Which is a utility that prints out the full path of the \ -executables that bash(1) would execute when the passed \ -program names would have been entered on the shell prompt. \ -It does this by using the exact same algorithm as bash." -SECTION = "libs" -HOMEPAGE = "http://carlo17.home.xs4all.nl/which/" - -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ - file://which.c;beginline=1;endline=17;md5=a9963693af2272e7a8df6f231164e7a2" -DEPENDS = "cwautomacros-native" - -inherit autotools texinfo update-alternatives - -PR = "r3" - -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" - -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 -} - -ALTERNATIVE_${PN} = "which" -ALTERNATIVE_PRIORITY = "100" diff --git a/meta/recipes-extended/which/which_2.21.bb b/meta/recipes-extended/which/which_2.21.bb new file mode 100644 index 0000000000..a7687f6fe4 --- /dev/null +++ b/meta/recipes-extended/which/which_2.21.bb @@ -0,0 +1,32 @@ +SUMMARY = "Displays the full path of shell commands" +DESCRIPTION = "Which is a utility that prints out the full path of the \ +executables that bash(1) would execute when the passed \ +program names would have been entered on the shell prompt. \ +It does this by using the exact same algorithm as bash." +SECTION = "libs" +HOMEPAGE = "http://carlo17.home.xs4all.nl/which/" + +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ + file://which.c;beginline=1;endline=17;md5=a9963693af2272e7a8df6f231164e7a2" +DEPENDS = "cwautomacros-native" + +inherit autotools texinfo update-alternatives + +PR = "r3" + +EXTRA_OECONF = "--disable-iberty" + +SRC_URI = "${GNU_MIRROR}/which/which-${PV}.tar.gz \ + file://automake.patch \ + " + +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 +} + +ALTERNATIVE_${PN} = "which" +ALTERNATIVE_PRIORITY = "100" -- cgit 1.2.3-korg