summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2011-02-12 21:53:03 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-02-14 11:01:01 +0100
commita975b1cd5b0fa467793e5d8f90159668748b41d8 (patch)
treefa47d489be4a93e9c3d1c6a4e17f27ca6027afe5 /patches
parent386fc02ab5f99d65bc31f128426e86852bf89886 (diff)
downloadptxdist-a975b1cd5b0fa467793e5d8f90159668748b41d8.tar.gz
ptxdist-a975b1cd5b0fa467793e5d8f90159668748b41d8.tar.xz
nfsutils: version bump 1.1.6 -> 1.2.3
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/nfs-utils-1.1.6/nfs-utils-1.1.6-ttycom.diff31
-rw-r--r--patches/nfs-utils-1.1.6/series1
2 files changed, 0 insertions, 32 deletions
diff --git a/patches/nfs-utils-1.1.6/nfs-utils-1.1.6-ttycom.diff b/patches/nfs-utils-1.1.6/nfs-utils-1.1.6-ttycom.diff
deleted file mode 100644
index 7c7cdef7a..000000000
--- a/patches/nfs-utils-1.1.6/nfs-utils-1.1.6-ttycom.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Subject: use ioctl.h instead of ttycom.h on Linux
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-
-When compiling nfs-utils-1.1.6, I get this error:
-
-arm-iwmmx-linux-gnueabi-gcc -DHAVE_CONFIG_H -I. -I../../support/include -isystem /home/rsc/svn/oselas/bsp/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-phyCORE-PXA270.PCM990/sysroot-target/include -isystem /home/rsc/svn/oselas/bsp/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-phyCORE-PXA270.PCM990/sysroot-target/usr/include -D_GNU_SOURCE -Wall -Wstrict-prototypes -pipe -g -O2 -MT sm_inter_svc.o -MD -MP -MF .deps/sm_inter_svc.Tpo -c -o sm_inter_svc.o sm_inter_svc.c
-sm_inter_svc.c:10:39: error: sys/ttycom.h: No such file or directory
-
-Use sys/ioctl.h instead.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
-# wsa: 20091230: applied upstream \o/ : http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=e456ee18bfbe422750dfad36f0afe2583f412538
-
- tools/rpcgen/rpc_main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: nfs-utils-1.1.6/tools/rpcgen/rpc_main.c
-===================================================================
---- nfs-utils-1.1.6.orig/tools/rpcgen/rpc_main.c
-+++ nfs-utils-1.1.6/tools/rpcgen/rpc_main.c
-@@ -550,7 +550,7 @@ s_output(int argc, char **argv, char *in
- f_print(fout, "#include <sys/ttycom.h>/* TIOCNOTTY */\n");
- #else
- if( !tirpcflag )
-- f_print(fout, "#include <sys/ttycom.h>/* TIOCNOTTY */\n");
-+ f_print(fout, "#include <sys/ioctl.h>/* TIOCNOTTY */\n");
- #endif
- if( Cflag && (inetdflag || pmflag ) ) {
- f_print(fout, "#ifdef __cplusplus\n");
diff --git a/patches/nfs-utils-1.1.6/series b/patches/nfs-utils-1.1.6/series
deleted file mode 100644
index 3024abc8c..000000000
--- a/patches/nfs-utils-1.1.6/series
+++ /dev/null
@@ -1 +0,0 @@
-nfs-utils-1.1.6-ttycom.diff