nfs-utils: 1.3.3 -> 1.3.4
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 nfs-utils: 1.3.3 -> 1.3.4
From: Mariano Lopez <[email protected]>
---
.../files/nfs-utils-debianize-start-statd.patch | 23 +++--
...tatd-fix-a-segfault-caused-by-improper-us.patch | 113 ---------------------
.../{nfs-utils_1.3.3.bb => nfs-utils_1.3.4.bb} | 5 +-
3 files changed, 14 insertions(+), 127 deletions(-)
delete mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-nfs-utils-statd-fix-a-segfault-caused-by-improper-us.patch
rename meta/recipes-connectivity/nfs-utils/{nfs-utils_1.3.3.bb => nfs-utils_1.3.4.bb} (96%)meta/recipes-connectivity/nfs-utils/files/nfs-utils-debianize-start-statd.patch +12 -11
@@ -9,17 +9,18 @@ Signed-off-by: Li Wang <[email protected]> Signed-off-by: Roy Li <[email protected]> Signed-off-by: Wenzong Fan <[email protected]> --- - utils/statd/start-statd | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) + 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 ec9383b..3969b8c 100755 +index 2fd6039..f591b34 100755 --- a/utils/statd/start-statd +++ b/utils/statd/start-statd -@@ -6,6 +6,13 @@ - # site. - PATH="/sbin:/usr/sbin:/bin:/usr/bin" - +@@ -17,6 +17,14 @@ then + # statd already running - must have been slow to respond. + exit 0 + fi ++ +# Read config +DEFAULTFILE=/etc/default/nfs-common +NEED_IDMAPD=
@@ -28,14 +29,14 @@ index ec9383b..3969b8c 100755 +fi + # First try systemd if it's installed. - if systemctl --help >/dev/null 2>&1; then + if [ -d /run/systemd/system ]; then # Quit only if the call worked. -@@ -13,4 +20,4 @@ if systemctl --help >/dev/null 2>&1; then - fi +@@ -25,4 +33,4 @@ fi + cd / # Fall back to launching it ourselves. -exec rpc.statd --no-notify +exec rpc.statd --no-notify $STATDOPTS -- -1.9.1 +2.6.6
meta/recipes-connectivity/nfs-utils/nfs-utils/0001-nfs-utils-statd-fix-a-segfault-caused-by-improper-us.patch deleted +0 -113
113 lines not on this page · raw message
meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb renamed from meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.3.bb +2 -3
@@ -31,12 +31,11 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x file://proc-fs-nfsd.mount \ file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \ file://nfs-utils-debianize-start-statd.patch \ - file://0001-nfs-utils-statd-fix-a-segfault-caused-by-improper-us.patch \ file://bugfix-adjust-statd-service-name.patch \ " -SRC_URI[md5sum] = "cd6b568c2e9301cc3bfac09d87fbbc0b" -SRC_URI[sha256sum] = "700d689c5622c87953c34102e5befafc4d3c811e676852238f0dd79c9c0c084d" +SRC_URI[md5sum] = "54e4119043ec8507a2a0e054cf2889a4" +SRC_URI[sha256sum] = "b42a5bc0a8d80d04650030ceb9a11f08f4acfbcb1ee297f657fb94e339c45975" # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will # pull in the remainder of the dependencies.
Signature · 1 line
2.6.6
Quoted 4 lines · On 22 November 2016 at 08:46, <[email protected]> wrote:
From: Mariano Lopez <[email protected]>
Signed-off-by Mariano Lopez <[email protected]>
ERROR: nfs-utils-1.3.4-r0 do_patch: Command Error: 'quilt --quiltrc /data/poky-master/tmp-glibc/sysroots/x86_64-linux/etc/quiltrc push' exited
with 0 Output:
Applying patch fix-protocol-minor-version-fall-back.patch
patching file utils/mount/stropts.c
Hunk #1 FAILED at 841.
1 out of 1 hunk FAILED -- rejects in file utils/mount/stropts.c
Patch fix-protocol-minor-version-fall-back.patch can be reverse-applied
ERROR: nfs-utils-1.3.4-r0 do_patch: Function failed: patch_do_patch
ERROR: Logfile of failure stored in:
/data/poky-master/tmp-glibc/work/corei7-64-poky-linux/nfs-utils/1.3.4-r0/temp/log.do_patch.18084
ERROR: Task (/home/ross/Yocto/poky/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.4.bb:do_patch) failed with exit code '1'
I really wish I knew why some people quilt silently handles this and for others it throws an error.
Ross