From f40f63143b48e2ec2572b31f101621f02dd77138 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 22 Mar 2007 18:31:40 +0000 Subject: nfs-utils: moved from meta-extras to meta git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1385 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../nfs-utils-1.0.6/acinclude-lossage.patch | 142 --------------------- .../nfs-utils/nfs-utils-1.0.6/forgotten-defines | 5 - .../nfs-utils/nfs-utils-1.0.6/kernel-2.6.18+.patch | 13 -- .../nfs-utils/nfs-utils-1.0.6/rpcgen-lossage.patch | 11 -- .../nfs-utils/nfs-utils-1.0.6/stat-include.patch | 11 -- 5 files changed, 182 deletions(-) delete mode 100644 meta-extras/packages/nfs-utils/nfs-utils-1.0.6/acinclude-lossage.patch delete mode 100644 meta-extras/packages/nfs-utils/nfs-utils-1.0.6/forgotten-defines delete mode 100644 meta-extras/packages/nfs-utils/nfs-utils-1.0.6/kernel-2.6.18+.patch delete mode 100644 meta-extras/packages/nfs-utils/nfs-utils-1.0.6/rpcgen-lossage.patch delete mode 100644 meta-extras/packages/nfs-utils/nfs-utils-1.0.6/stat-include.patch (limited to 'meta-extras/packages/nfs-utils/nfs-utils-1.0.6') diff --git a/meta-extras/packages/nfs-utils/nfs-utils-1.0.6/acinclude-lossage.patch b/meta-extras/packages/nfs-utils/nfs-utils-1.0.6/acinclude-lossage.patch deleted file mode 100644 index 0d2d7f382..000000000 --- a/meta-extras/packages/nfs-utils/nfs-utils-1.0.6/acinclude-lossage.patch +++ /dev/null @@ -1,142 +0,0 @@ ---- nfs-utils-1.0.6/acinclude.m4.old 2004-11-07 12:28:58.000000000 +0000 -+++ nfs-utils-1.0.6/acinclude.m4 2000-10-11 22:49:45.000000000 +0100 -@@ -0,0 +1,139 @@ -+dnl aclocal.m4 -- custom autoconf macros for various purposes -+dnl Updated for Autoconf v2 -+dnl -+dnl ******** save/restore stuff ********** -+define(AC_KNFSD_SAVE, -+ [AC_LANG_SAVE -+ save_LDFLAGS=$LDFLAGS -+ save_CFLAGS=$CFLAGS -+ save_CXXFLAGS=$CXXFLAGS -+ save_LIBS=$LIBS -+])dnl -+define(AC_KNFSD_RESTORE, -+ [LDFLAGS=$save_LDFLAGS -+ CFLAGS=$save_CFLAGS -+ CXXFLAGS=$save_CXXFLAGS -+ LIBS=$save_LIBS -+ AC_LANG_RESTORE -+])dnl -+dnl *********** GNU libc 2 *************** -+define(AC_GNULIBC, -+ [AC_MSG_CHECKING(for GNU libc2) -+ AC_CACHE_VAL(knfsd_cv_glibc2, -+ [AC_TRY_CPP([ -+ #include -+ #if !defined(__GLIBC__) -+ # error Nope -+ #endif], knfsd_cv_glibc2=yes, knfsd_cv_glibc2=no)]) -+ AC_MSG_RESULT($knfsd_cv_glibc2) -+ if test $knfsd_cv_glibc2 = yes; then -+ CFLAGS="$CFLAGS -D_GNU_SOURCE" -+ CXXFLAGS="$CXXFLAGS -D_GNU_SOURCE" -+ fi -+]) dnl -+dnl -+dnl ************* egcs ******************* -+define(AC_PROG_EGCS, -+ [AC_MSG_CHECKING(for egcs) -+ AC_CACHE_VAL(knfsd_cv_prog_EGCS, -+ [case `$CC --version 2>/dev/null` in -+ egcs*) -+ knfsd_cv_prog_EGCS=yes;; -+ *) -+ knfsd_cv_prog_EGCS=no;; -+ esac -+ ]) -+ AC_MSG_RESULT($knfsd_cv_prog_EGCS) -+ test $knfsd_cv_prog_EGCS = yes && AC_DEFINE(HAVE_EGCS) -+]) dnl -+dnl *********** sizeof(dev_t) ************** -+dnl ** We have to kludge this rather than use AC_CHECK_SIZEOF because -+dnl ** we have to include sys/types.h. Ugh. -+define(AC_DEV_T_SIZE, -+ [AC_MSG_CHECKING(size of dev_t) -+ AC_CACHE_VAL(ac_cv_sizeof_dev_t, -+ [AC_TRY_LINK( -+ [#include -+ #include -+ main() -+ { -+ FILE *f=fopen("conftestval", "w"); -+ if (!f) exit(1); -+ fprintf(f, "%d\n", sizeof(dev_t)); -+ exit(0); -+ }], ac_cv_sizeof_dev_t=`cat conftestval`, ac_cv_sizeof_dev_t=0)]) -+ AC_MSG_RESULT($ac_cv_sizeof_dev_t) -+ AC_DEFINE(SIZEOF_DEV_T,$ac_cv_sizeof_dev_t) -+ ]) -+dnl *********** sizeof(xxx_t) ************** -+dnl ** Overwrite the AC_CHECK_SIZEOF macro as we must include sys/types.h -+define([AC_CHECK_SIZEOF], -+ [changequote(<<, >>)dnl -+ define(<>,translit(sizeof_$1, [a-z *], [A-Z_P]))dnl -+ define(<>, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl -+ changequote([, ])dnl -+ AC_MSG_CHECKING(size of $1) -+ AC_CACHE_VAL(AC_CV_NAME, -+ [AC_TRY_RUN( -+ [#include -+ #include -+ main() -+ { -+ FILE *f=fopen("conftestval", "w"); -+ if (!f) exit(1); -+ fprintf(f, "%d\n", sizeof($1)); -+ exit(0); -+ }], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=0)]) -+ AC_MSG_RESULT($AC_CV_NAME) -+ AC_DEFINE_UNQUOTED(AC_TYPE_NAME,$AC_CV_NAME) -+ undefine([AC_TYPE_NAME])dnl -+ undefine([AC_CV_NAME])dnl -+ ]) -+dnl *********** BSD vs. POSIX signal handling ************** -+define([AC_BSD_SIGNALS], -+ [AC_MSG_CHECKING(for BSD signal semantics) -+ AC_CACHE_VAL(knfsd_cv_bsd_signals, -+ [AC_TRY_RUN([ -+ #include -+ #include -+ #include -+ -+ static int counter = 0; -+ static RETSIGTYPE handler(int num) { counter++; } -+ -+ int main() -+ { -+ int s; -+ if ((s = fork()) < 0) return 1; -+ if (s != 0) { -+ if (wait(&s) < 0) return 1; -+ return WIFSIGNALED(s)? 1 : 0; -+ } -+ -+ signal(SIGHUP, handler); -+ kill(getpid(), SIGHUP); kill(getpid(), SIGHUP); -+ return (counter == 2)? 0 : 1; -+ } -+ ], knfsd_cv_bsd_signals=yes, knfsd_cv_bsd_signals=no)]) dnl -+ AC_MSG_RESULT($knfsd_cv_bsd_signals) -+ test $knfsd_cv_bsd_signals = yes && AC_DEFINE(HAVE_BSD_SIGNALS) -+])dnl -+dnl *********** the tcp wrapper library *************** -+define(AC_TCP_WRAPPER, -+ [AC_MSG_CHECKING(for the tcp wrapper library) -+ AC_CACHE_VAL(knfsd_cv_tcp_wrapper, -+ [old_LIBS="$LIBS" -+ LIBS="$LIBS -lwrap $LIBNSL" -+ AC_TRY_LINK([ -+ int deny_severity = 0; -+ int allow_severity = 0;], -+ [return hosts_ctl ("nfsd", "", "")], -+ knfsd_cv_tcp_wrapper=yes, knfsd_cv_tcp_wrapper=no) -+ LIBS="$old_LIBS"]) -+ AC_MSG_RESULT($knfsd_cv_tcp_wrapper) -+ if test "$knfsd_cv_tcp_wrapper" = yes; then -+ CFLAGS="$CFLAGS -DHAVE_TCP_WRAPPER" -+ CXXFLAGS="$CXXFLAGS -DHAVE_TCP_WRAPPER" -+ LIBWRAP="-lwrap" -+ fi -+]) dnl diff --git a/meta-extras/packages/nfs-utils/nfs-utils-1.0.6/forgotten-defines b/meta-extras/packages/nfs-utils/nfs-utils-1.0.6/forgotten-defines deleted file mode 100644 index a18333100..000000000 --- a/meta-extras/packages/nfs-utils/nfs-utils-1.0.6/forgotten-defines +++ /dev/null @@ -1,5 +0,0 @@ - -/* This defines the location of the NFS state files - * Warning: these must match definitions in config.mk! - */ -#define NFS_STATEDIR "/var/lib/nfs" diff --git a/meta-extras/packages/nfs-utils/nfs-utils-1.0.6/kernel-2.6.18+.patch b/meta-extras/packages/nfs-utils/nfs-utils-1.0.6/kernel-2.6.18+.patch deleted file mode 100644 index 219bed094..000000000 --- a/meta-extras/packages/nfs-utils/nfs-utils-1.0.6/kernel-2.6.18+.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- nfs-utils-1.0.6/tools/getkversion/getkversion.c.orig 2007-02-22 12:33:54.000000000 +0000 -+++ nfs-utils-1.0.6/tools/getkversion/getkversion.c 2007-02-22 12:33:56.000000000 +0000 -@@ -12,6 +12,10 @@ - int - main(void) /* This is for Dan Popp ;) */ - { -+ -+#ifdef UTS_RELEASE - printf("%s\n", UTS_RELEASE); -+#endif -+ - return 0; - } diff --git a/meta-extras/packages/nfs-utils/nfs-utils-1.0.6/rpcgen-lossage.patch b/meta-extras/packages/nfs-utils/nfs-utils-1.0.6/rpcgen-lossage.patch deleted file mode 100644 index d1e1fb700..000000000 --- a/meta-extras/packages/nfs-utils/nfs-utils-1.0.6/rpcgen-lossage.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nfs-utils-1.0.6/config.mk.in.old 2004-11-07 12:30:05.000000000 +0000 -+++ nfs-utils-1.0.6/config.mk.in 2004-11-07 12:30:19.000000000 +0000 -@@ -52,7 +52,7 @@ - LN_S = ln -sf - RANLIB = @RANLIB@ - INDENT = indent --RPCGEN = $(TOP)bin/rpcgen -+RPCGEN = rpcgen - GETKVER = $(TOP)tools/getkversion - INSTALL = install - MAN2PS = groff -Tps -man diff --git a/meta-extras/packages/nfs-utils/nfs-utils-1.0.6/stat-include.patch b/meta-extras/packages/nfs-utils/nfs-utils-1.0.6/stat-include.patch deleted file mode 100644 index d0ae02246..000000000 --- a/meta-extras/packages/nfs-utils/nfs-utils-1.0.6/stat-include.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nfs-utils-1.0.6/utils/statd/statd.c~ 2003-09-11 20:24:29.000000000 -1000 -+++ nfs-utils-1.0.6/utils/statd/statd.c 2005-03-27 03:11:03.025582700 -1000 -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - #include - #include "statd.h" - #include "version.h" - -- cgit v1.2.3