summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2015-01-13 10:02:02 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-23 11:36:30 +0000
commit38978eef17383fa082d47b84b97292d8132b6331 (patch)
treeb696ac6abfc1d6874c8ff4280a4966b23d7e4240 /meta/recipes-extended
parent36763782feba44279db01e2b225fa2a994e1b457 (diff)
downloadpoky-38978eef17383fa082d47b84b97292d8132b6331.tar.gz
rpcbind: upgrade to 0.2.2
Drop 0001-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch which has been merged to 0.2.2 (From OE-Core rev: 07a3ae994b293053c57f38b176e428322fb816bc) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/rpcbind/rpcbind/0001-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch34
-rw-r--r--meta/recipes-extended/rpcbind/rpcbind_0.2.2.bb (renamed from meta/recipes-extended/rpcbind/rpcbind_0.2.1.bb)5
2 files changed, 2 insertions, 37 deletions
diff --git a/meta/recipes-extended/rpcbind/rpcbind/0001-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch b/meta/recipes-extended/rpcbind/rpcbind/0001-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch
deleted file mode 100644
index b556a46347..0000000000
--- a/meta/recipes-extended/rpcbind/rpcbind/0001-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 914507aa6980129fefb4decaabea1a4f60c7182b Mon Sep 17 00:00:00 2001
2From: Steve Dickson <steved@redhat.com>
3Date: Wed, 21 Aug 2013 14:40:22 -0400
4Subject: [PATCH 1/1] rpcbind: rpcuser not being set in Makefile.am
5
6Upstream-Status: backport
7
8Commit 8d7a0708 cause a regression where the rpcuser id was not
9being set, which in turn cause rpcbind to immediately exit.
10This patch removes the extra ',' that was in the AC_ARG_WITH
11statement in the configure.ac file.
12
13Signed-off-by: Steve Dickson <steved@redhat.com>
14Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
15---
16 configure.ac | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/configure.ac b/configure.ac
20index 2b67720..1cf42d3 100644
21--- a/configure.ac
22+++ b/configure.ac
23@@ -23,7 +23,7 @@ AC_ARG_WITH([statedir],
24 AC_SUBST([statedir], [$with_statedir])
25
26 AC_ARG_WITH([rpcuser],
27- AS_HELP_STRING([--with-rpcuser=ARG], [use ARG for RPC @<:@default=root@:>@]),
28+ AS_HELP_STRING([--with-rpcuser=ARG], [use ARG for RPC @<:@default=root@:>@])
29 ,, [with_rpcuser=root])
30 AC_SUBST([rpcuser], [$with_rpcuser])
31
32--
331.8.3.2
34
diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.1.bb b/meta/recipes-extended/rpcbind/rpcbind_0.2.2.bb
index b7324766f7..44c79eb21f 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_0.2.1.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.2.bb
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b46486e4c4a416602693a711bb5bfa39 \
11 file://src/rpcinfo.c;beginline=1;endline=27;md5=f8a8cd2cb25ac5aa16767364fb0e3c24" 11 file://src/rpcinfo.c;beginline=1;endline=27;md5=f8a8cd2cb25ac5aa16767364fb0e3c24"
12 12
13SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \ 13SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
14 file://0001-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch \
15 file://init.d \ 14 file://init.d \
16 ${UCLIBCPATCHES} \ 15 ${UCLIBCPATCHES} \
17 file://rpcbind.conf \ 16 file://rpcbind.conf \
@@ -24,8 +23,8 @@ UCLIBCPATCHES_libc-uclibc = "file://0001-uclibc-nss.patch \
24 " 23 "
25UCLIBCPATCHES ?= "" 24UCLIBCPATCHES ?= ""
26 25
27SRC_URI[md5sum] = "0a5f9c2142af814c55d957aaab3bcc68" 26SRC_URI[md5sum] = "8acf839bfef2364a05fbd6be5f8edf9a"
28SRC_URI[sha256sum] = "da169ff877a5a07581fad50a9a808ac6e96f0c277a3df49a7ef005778428496e" 27SRC_URI[sha256sum] = "13dbc8c796dbe0ce8df873007bea0490c8460b56202d918c9eb6fa0358a08f29"
29 28
30inherit autotools update-rc.d systemd pkgconfig 29inherit autotools update-rc.d systemd pkgconfig
31 30