summaryrefslogtreecommitdiff
path: root/package/nfs-utils/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-12-30 22:45:29 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-12-30 22:45:29 +0100
commit220a96f9926788ed531717f78e44fdf1e7ab3b34 (patch)
tree406f65eea71fabd8cf66c2bd1108ec63f8c349ee /package/nfs-utils/patches
parent38af8185ea05a1c5d1abb32a68a025e3b4afa4d6 (diff)
rework architecture / embedded systems concept
Make configuration of new targets cheap. Just add a new file in target/arch/sys-enabled/foo. See other files for syntax. While doing runtime tests with the new infrastructure I've updated a lot of other stuff: - gcc 4.5.2 - uClibc 0.9.32-rc1 (NPTL) - strongswan, php, miredo, parted, util-linux-ng, e2fsprogs I promise, this is the last big fat commit this year ;)
Diffstat (limited to 'package/nfs-utils/patches')
-rw-r--r--package/nfs-utils/patches/patch-support_include_sockaddr_h10
-rw-r--r--package/nfs-utils/patches/patch-tools_Makefile_in4
-rw-r--r--package/nfs-utils/patches/patch-tools_locktest_Makefile_in47
-rw-r--r--package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in11
-rw-r--r--package/nfs-utils/patches/patch-tools_rpcgen_rpc_cout_c10
-rw-r--r--package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c32
6 files changed, 108 insertions, 6 deletions
diff --git a/package/nfs-utils/patches/patch-support_include_sockaddr_h b/package/nfs-utils/patches/patch-support_include_sockaddr_h
new file mode 100644
index 000000000..07d9eda46
--- /dev/null
+++ b/package/nfs-utils/patches/patch-support_include_sockaddr_h
@@ -0,0 +1,10 @@
+--- nfs-utils-1.2.3.orig/support/include/sockaddr.h 2010-09-28 14:24:16.000000000 +0200
++++ nfs-utils-1.2.3/support/include/sockaddr.h 2010-12-25 00:47:43.000000000 +0100
+@@ -20,7 +20,6 @@
+ #ifndef NFS_UTILS_SOCKADDR_H
+ #define NFS_UTILS_SOCKADDR_H
+
+-#include <libio.h>
+ #include <stdbool.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
diff --git a/package/nfs-utils/patches/patch-tools_Makefile_in b/package/nfs-utils/patches/patch-tools_Makefile_in
index 51581c14a..b6a50e54e 100644
--- a/package/nfs-utils/patches/patch-tools_Makefile_in
+++ b/package/nfs-utils/patches/patch-tools_Makefile_in
@@ -1,5 +1,5 @@
--- nfs-utils-1.2.3.orig/tools/Makefile.in 2010-09-28 14:32:32.000000000 +0200
-+++ nfs-utils-1.2.3/tools/Makefile.in 2010-10-10 13:37:18.000000000 +0200
++++ nfs-utils-1.2.3/tools/Makefile.in 2010-12-24 15:48:13.000000000 +0100
@@ -77,7 +77,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE
distdir
ETAGS = etags
@@ -14,7 +14,7 @@
top_srcdir = @top_srcdir@
OPTDIRS = $(am__append_1)
-SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat $(OPTDIRS)
-+SUBDIRS = $(OPTDIRS)
++SUBDIRS = rpcgen
MAINTAINERCLEANFILES = Makefile.in
all: all-recursive
diff --git a/package/nfs-utils/patches/patch-tools_locktest_Makefile_in b/package/nfs-utils/patches/patch-tools_locktest_Makefile_in
new file mode 100644
index 000000000..9e8eb3f6d
--- /dev/null
+++ b/package/nfs-utils/patches/patch-tools_locktest_Makefile_in
@@ -0,0 +1,47 @@
+--- nfs-utils-1.2.3.orig/tools/locktest/Makefile.in 2010-09-28 14:32:32.000000000 +0200
++++ nfs-utils-1.2.3/tools/locktest/Makefile.in 2010-12-24 15:40:35.000000000 +0100
+@@ -67,20 +67,20 @@ am_testlk_OBJECTS = testlk-testlk.$(OBJE
+ testlk_OBJECTS = $(am_testlk_OBJECTS)
+ testlk_LDADD = $(LDADD)
+ testlk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(testlk_CFLAGS) $(CFLAGS) \
+- $(testlk_LDFLAGS) $(LDFLAGS) -o $@
++ --mode=link $(CCLD) $(testlk_CFLAGS) \
++ $(testlk_LDFLAGS) -o $@
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ am__mv = mv -f
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++ $(CPPFLAGS) $(AM_CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++ --mode=link $(CCLD) $(AM_CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
+ SOURCES = $(testlk_SOURCES)
+ DIST_SOURCES = $(testlk_SOURCES)
+@@ -101,15 +101,15 @@ AWK = @AWK@
+ CC = $(CC_FOR_BUILD)
+ CCDEPMODE = @CCDEPMODE@
+ CC_FOR_BUILD = @CC_FOR_BUILD@
+-CFLAGS = @CFLAGS@
++CFLAGS =
+ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+ CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
++CPPFLAGS =
+ CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
++CXXFLAGS =
+ CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
+ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in
index d5fb62c97..8216aa35e 100644
--- a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in
+++ b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in
@@ -1,5 +1,5 @@
--- nfs-utils-1.2.3.orig/tools/rpcgen/Makefile.in 2010-09-28 14:32:33.000000000 +0200
-+++ nfs-utils-1.2.3/tools/rpcgen/Makefile.in 2010-10-10 13:29:26.000000000 +0200
++++ nfs-utils-1.2.3/tools/rpcgen/Makefile.in 2010-12-25 00:45:58.000000000 +0100
@@ -72,21 +72,21 @@ am_rpcgen_OBJECTS = rpcgen-rpc_clntout.$
rpcgen_OBJECTS = $(am_rpcgen_OBJECTS)
rpcgen_LDADD = $(LDADD)
@@ -29,6 +29,15 @@
SOURCES = $(rpcgen_SOURCES)
DIST_SOURCES = $(rpcgen_SOURCES)
ETAGS = etags
+@@ -97,7 +97,7 @@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALLOCA = @ALLOCA@
+ AMTAR = @AMTAR@
+ AM_CFLAGS = @AM_CFLAGS@
+-AM_CPPFLAGS = @AM_CPPFLAGS@
++AM_CPPFLAGS =
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
@@ -106,10 +106,10 @@ AWK = @AWK@
CC = $(CC_FOR_BUILD)
CCDEPMODE = @CCDEPMODE@
diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_rpc_cout_c b/package/nfs-utils/patches/patch-tools_rpcgen_rpc_cout_c
new file mode 100644
index 000000000..a94015405
--- /dev/null
+++ b/package/nfs-utils/patches/patch-tools_rpcgen_rpc_cout_c
@@ -0,0 +1,10 @@
+--- nfs-utils-1.2.3.orig/tools/rpcgen/rpc_cout.c 2010-09-28 14:24:16.000000000 +0200
++++ nfs-utils-1.2.3/tools/rpcgen/rpc_cout.c 2010-12-24 15:51:41.000000000 +0100
+@@ -36,7 +36,6 @@ static char sccsid[] = "@(#)rpc_cout.c 1
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+-#include <malloc.h>
+ #include <ctype.h>
+ #include "rpc_parse.h"
+ #include "rpc_util.h"
diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c b/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c
index 5bc54e758..078212ba3 100644
--- a/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c
+++ b/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c
@@ -1,6 +1,32 @@
---- nfs-utils-1.2.1.orig/tools/rpcgen/rpc_main.c 2009-11-04 12:13:56.000000000 +0100
-+++ nfs-utils-1.2.1/tools/rpcgen/rpc_main.c 2010-01-16 11:22:02.359375000 +0100
-@@ -562,9 +562,6 @@ s_output(int argc, char **argv, char *in
+--- nfs-utils-1.2.3.orig/tools/rpcgen/rpc_main.c 2010-09-28 14:24:16.000000000 +0200
++++ nfs-utils-1.2.3/tools/rpcgen/rpc_main.c 2010-12-24 23:45:11.000000000 +0100
+@@ -155,11 +155,7 @@ int timerflag; /* TRUE if !indefinite &
+ int newstyle; /* newstyle of passing arguments (by value) */
+ int Cflag = 0 ; /* ANSI C syntax */
+ static int allfiles; /* generate all files */
+-#ifdef linux
+ int tirpcflag = 0; /* no tirpc by default */
+-#else
+-int tirpcflag = 1; /* generating code for tirpc, by default */
+-#endif
+
+ int
+ main(int argc, char **argv)
+@@ -543,13 +539,8 @@ s_output(int argc, char **argv, char *in
+ timerflag = 1;
+ }
+
+-#ifndef linux
+- if( !tirpcflag && inetdflag )
+- f_print(fout, "#include <sys/ttycom.h>/* TIOCNOTTY */\n");
+-#else
+ if( !tirpcflag )
+ f_print(fout, "#include <sys/ioctl.h>/* TIOCNOTTY */\n");
+-#endif
+ if( Cflag && (inetdflag || pmflag ) ) {
+ f_print(fout, "#ifdef __cplusplus\n");
+ f_print(fout, "#include <sysent.h> /* getdtablesize, open */\n");
+@@ -562,9 +553,6 @@ s_output(int argc, char **argv, char *in
f_print(fout, "#include <sys/types.h>\n");
f_print(fout, "#include <memory.h>\n");