summaryrefslogtreecommitdiff
path: root/package/nfs-utils
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-07-11 11:04:31 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2013-07-11 11:04:31 +0200
commitd1436506d0726f839f5db89271ac479cf6c95486 (patch)
treebef07a63c97c7a2a5c1570cc7966de29c678034b /package/nfs-utils
parentc48b3ef4c19009e200fd2c747b2541cc9a463285 (diff)
fix varios compile issues for raspberry
Diffstat (limited to 'package/nfs-utils')
-rw-r--r--package/nfs-utils/patches/patch-utils_blkmapd_device-process_c11
-rw-r--r--package/nfs-utils/patches/patch-utils_gssd_Makefile_in4
-rw-r--r--package/nfs-utils/patches/patch-utils_mountd_fsloc_c6
3 files changed, 16 insertions, 5 deletions
diff --git a/package/nfs-utils/patches/patch-utils_blkmapd_device-process_c b/package/nfs-utils/patches/patch-utils_blkmapd_device-process_c
new file mode 100644
index 000000000..b6536e14e
--- /dev/null
+++ b/package/nfs-utils/patches/patch-utils_blkmapd_device-process_c
@@ -0,0 +1,11 @@
+--- nfs-utils-1.2.5.orig/utils/blkmapd/device-process.c 2011-09-24 13:55:15.000000000 +0200
++++ nfs-utils-1.2.5/utils/blkmapd/device-process.c 2013-07-11 11:02:58.000000000 +0200
+@@ -296,7 +296,7 @@ decode_blk_volume(uint32_t **pp, uint32_
+ off_t stripe_unit = vol->param.bv_stripe_unit;
+ /* Check limitations imposed by device-mapper */
+ if ((stripe_unit & (stripe_unit - 1)) != 0
+- || stripe_unit < (off_t) (PAGE_SIZE >> 9))
++ || stripe_unit < (off_t) (sysconf(_SC_PAGE_SIZE) >> 9))
+ return -EIO;
+ BLK_READBUF(p, end, 4);
+ READ32(vol->bv_vol_n);
diff --git a/package/nfs-utils/patches/patch-utils_gssd_Makefile_in b/package/nfs-utils/patches/patch-utils_gssd_Makefile_in
index 5b77024e6..1c98ccb16 100644
--- a/package/nfs-utils/patches/patch-utils_gssd_Makefile_in
+++ b/package/nfs-utils/patches/patch-utils_gssd_Makefile_in
@@ -1,6 +1,6 @@
--- nfs-utils-1.2.5.orig/utils/gssd/Makefile.in 2011-09-24 14:13:16.000000000 +0200
-+++ nfs-utils-1.2.5/utils/gssd/Makefile.in 2012-02-27 17:39:34.000000000 +0100
-@@ -355,7 +355,7 @@ gssd_LDADD = ../../support/nfs/libnfs.a
++++ nfs-utils-1.2.5/utils/gssd/Makefile.in 2013-07-11 11:01:30.000000000 +0200
+@@ -355,7 +355,7 @@ gssd_LDADD = ../../support/nfs/libnfs.a
$(RPCSECGSS_LIBS) $(GSSGLUE_LIBS) $(KRBLIBS)
gssd_LDFLAGS = $(KRBLDFLAGS)
diff --git a/package/nfs-utils/patches/patch-utils_mountd_fsloc_c b/package/nfs-utils/patches/patch-utils_mountd_fsloc_c
index e5569c82f..4ec4d3813 100644
--- a/package/nfs-utils/patches/patch-utils_mountd_fsloc_c
+++ b/package/nfs-utils/patches/patch-utils_mountd_fsloc_c
@@ -1,6 +1,6 @@
---- nfs-utils-1.2.1.orig/utils/mountd/fsloc.c 2009-11-04 12:13:56.000000000 +0100
-+++ nfs-utils-1.2.1/utils/mountd/fsloc.c 2009-12-25 19:26:25.000000000 +0100
-@@ -126,7 +126,7 @@ static struct servers *method_list(char
+--- nfs-utils-1.2.5.orig/utils/mountd/fsloc.c 2011-09-24 13:55:15.000000000 +0200
++++ nfs-utils-1.2.5/utils/mountd/fsloc.c 2013-07-11 11:01:30.000000000 +0200
+@@ -126,7 +126,7 @@ static struct servers *method_list(char
struct servers *rv=NULL;
xlog(L_NOTICE, "method_list(%s)\n", data);