* [PATCH 2/2] nfs-utils: debianize start-statd
@ 2014-10-24 5:32 rongqing.li
2014-10-27 11:15 ` Burton, Ross
0 siblings, 1 reply; 3+ messages in thread
From: rongqing.li @ 2014-10-24 5:32 UTC (permalink / raw)
To: openembedded-core
From: Li Wang <li.wang@windriver.com>
make start-statd command to use nfscommon configure, too.
Signed-off-by: Henrik Riomar <henrik.riomar@ericsson.com>
Signed-off-by: Li Wang <li.wang@windriver.com>
---
.../files/nfs-utils-debianize-start-statd.patch | 39 ++++++++++++++++++++++
.../nfs-utils/nfs-utils_1.3.0.bb | 1 +
2 files changed, 40 insertions(+)
create mode 100644 meta/recipes-connectivity/nfs-utils/files/nfs-utils-debianize-start-statd.patch
diff --git a/meta/recipes-connectivity/nfs-utils/files/nfs-utils-debianize-start-statd.patch b/meta/recipes-connectivity/nfs-utils/files/nfs-utils-debianize-start-statd.patch
new file mode 100644
index 0000000..78e5eed
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/files/nfs-utils-debianize-start-statd.patch
@@ -0,0 +1,39 @@
+[PATCH] nfs-utils: debianize start-statd
+
+Upstream-status: Pending
+
+make start-statd command to use nfscommon configure, too.
+
+Signed-off-by: Henrik Riomar <henrik.riomar@ericsson.com>
+Signed-off-by: Li Wang <li.wang@windriver.com>
+Signed-off-by: Roy Li <rongqing.li@windriver.com>
+---
+ utils/statd/start-statd | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/utils/statd/start-statd b/utils/statd/start-statd
+index 803aeba..7d3c07b 100644
+--- a/utils/statd/start-statd
++++ b/utils/statd/start-statd
+@@ -4,9 +4,17 @@
+ # /var/run/rpc.statd.pid).
+ # It should run statd with whatever flags are apropriate for this
+ # site.
++
+ PATH=/bin:/usr/sbin:/sbin
++# Read config
++DEFAULTFILE=/etc/default/nfs-common
++NEED_IDMAPD=
++if [ -f $DEFAULTFILE ]; then
++ . $DEFAULTFILE
++fi
++
+ if systemctl start statd.service 2>/dev/null
+ then :
+ else
+- exec rpc.statd --no-notify
++ exec rpc.statd --no-notify $STATDOPTS
+ fi
+--
+1.7.10.4
+
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb
index 4933e10..8ead5d0 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb
@@ -33,6 +33,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
file://0001-statd-fixed-the-with-statdpath-flag.patch \
file://fix-a-Gcc-undefined-behavior.patch \
file://fix-the-start-statd.patch \
+ file://nfs-utils-debianize-start-statd.patch \
"
SRC_URI[md5sum] = "6e93a7997ca3a1eac56bf219adab72a8"
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 2/2] nfs-utils: debianize start-statd
2014-10-24 5:32 [PATCH 2/2] nfs-utils: debianize start-statd rongqing.li
@ 2014-10-27 11:15 ` Burton, Ross
2014-10-28 0:16 ` Rongqing Li
0 siblings, 1 reply; 3+ messages in thread
From: Burton, Ross @ 2014-10-27 11:15 UTC (permalink / raw)
To: rongqing.li@windriver.com; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 525 bytes --]
On 24 October 2014 06:32, <rongqing.li@windriver.com> wrote:
> .../files/nfs-utils-debianize-start-statd.patch | 39
> ++++++++++++++++++++++
>
ERROR: Command Error: exit status: 1 Output:
Applying patch nfs-utils-debianize-start-statd.patch
patching file utils/statd/start-statd
Hunk #1 FAILED at 4.
1 out of 1 hunk FAILED -- rejects in file utils/statd/start-statd
Patch nfs-utils-debianize-start-statd.patch does not apply (enforce with -f)
Please rebase this, there's been changes in master.
Ross
[-- Attachment #2: Type: text/html, Size: 1261 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 2/2] nfs-utils: debianize start-statd
2014-10-27 11:15 ` Burton, Ross
@ 2014-10-28 0:16 ` Rongqing Li
0 siblings, 0 replies; 3+ messages in thread
From: Rongqing Li @ 2014-10-28 0:16 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
On 10/27/2014 07:15 PM, Burton, Ross wrote:
>
> On 24 October 2014 06:32, <rongqing.li@windriver.com
> <mailto:rongqing.li@windriver.com>> wrote:
>
> .../files/nfs-utils-debianize-start-statd.patch | 39
> ++++++++++++++++++++++
>
>
> ERROR: Command Error: exit status: 1 Output:
> Applying patch nfs-utils-debianize-start-statd.patch
> patching file utils/statd/start-statd
> Hunk #1 FAILED at 4.
> 1 out of 1 hunk FAILED -- rejects in file utils/statd/start-statd
> Patch nfs-utils-debianize-start-statd.patch does not apply (enforce with -f)
>
> Please rebase this, there's been changes in master.
>
> Ross
This patch should follow "[OE-core] [PATCH v2] nfs-utils: fix start-statd"
-Roy
--
Best Reagrds,
Roy | RongQing Li
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-10-28 0:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-24 5:32 [PATCH 2/2] nfs-utils: debianize start-statd rongqing.li
2014-10-27 11:15 ` Burton, Ross
2014-10-28 0:16 ` Rongqing Li
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox