* nfsutils.in, nfsutils.make:

	version bump -> 1.0.8 + makefile regenerated


git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.10-trunk@5782 33e552b5-05e3-0310-8538-816dae2090ed

1 files changed, 111 insertions, 108 deletions

diff --git a/rules/nfsutils.make b/rules/nfsutils.make
index 5bf42d154..9a36c6676 100644
--- a/rules/nfsutils.make
+++ b/rules/nfsutils.make
@@ -1,8 +1,9 @@
 # -*-makefile-*-
-# $Id: nfs-utils.make 3876 2006-01-12 20:18:48Z rsc $
+# $Id: template 5709 2006-06-09 13:55:00Z mkl $
 #
-# Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
-# See CREDITS for details about who has contributed to this project. 
+# Copyright (C) 2003-2006 by Pengutronix e.K., Hildesheim, Germany
+#          
+# See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
 # see the README file.
@@ -14,14 +15,14 @@
 PACKAGES-$(PTXCONF_NFSUTILS) += nfsutils
 
 #
-# Paths and names 
+# Paths and names
 #
-NFSUTILS_VERSION	= 1.0.6-ptx4
-NFSUTILS		= nfs-utils-$(NFSUTILS_VERSION)
-NFSUTILS_URL		= http://www.pengutronix.de/software/nfs-utils/$(NFSUTILS).tar.gz
-NFSUTILS_SOURCE		= $(SRCDIR)/$(NFSUTILS).tar.gz
-NFSUTILS_DIR		= $(BUILDDIR)/$(NFSUTILS)
-
+NFSUTILS_VERSION	:= 1.0.8
+NFSUTILS		:= nfs-utils-$(NFSUTILS_VERSION)
+NFSUTILS_SUFFIX		:= tar.gz
+NFSUTILS_URL		:= $(PTXCONF_SETUP_SFMIRROR)/nfs/$(NFSUTILS).$(NFSUTILS_SUFFIX)
+NFSUTILS_SOURCE		:= $(SRCDIR)/$(NFSUTILS).$(NFSUTILS_SUFFIX)
+NFSUTILS_DIR		:= $(BUILDDIR)/$(NFSUTILS)
 
 # ----------------------------------------------------------------------------
 # Get
@@ -29,7 +30,7 @@ NFSUTILS_DIR		= $(BUILDDIR)/$(NFSUTILS)
 
 nfsutils_get: $(STATEDIR)/nfsutils.get
 
-$(STATEDIR)/nfsutils.get: $(NFSUTILS_SOURCE)
+$(STATEDIR)/nfsutils.get: $(nfsutils_get_deps_default)
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -48,10 +49,6 @@ $(STATEDIR)/nfsutils.extract: $(nfsutils_extract_deps_default)
 	@$(call clean, $(NFSUTILS_DIR))
 	@$(call extract, NFSUTILS)
 	@$(call patchin, NFSUTILS)
-#
-# regenerate configure script with new autoconf, to make cross compiling work
-#
-	cd $(NFSUTILS_DIR) && PATH=$(PTXCONF_PREFIX)/$(AUTOCONF257)/bin:$$PATH autoconf
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -60,17 +57,19 @@ $(STATEDIR)/nfsutils.extract: $(nfsutils_extract_deps_default)
 
 nfsutils_prepare: $(STATEDIR)/nfsutils.prepare
 
-# 
-# arcitecture dependend configuration
-#
-NFSUTILS_PATH		=  PATH=$(CROSS_PATH)
-NFSUTILS_ENV		+= CC_FOR_BUILD=$(HOSTCC) $(CROSS_ENV)
-
-NFSUTILS_AUTOCONF	=  $(CROSS_AUTOCONF_USR)
+NFSUTILS_PATH	:= PATH=$(CROSS_PATH)
+NFSUTILS_ENV 	:= \
+	$(CROSS_ENV) \
+	knfsd_cv_bsd_signals=no
 
-# FIXME: these are not probed correctly when cross compiling...
-NFSUTILS_AUTOCONF	+= ac_cv_func_malloc_0_nonnull=yes
-NFSUTILS_AUTOCONF	+= ac_cv_func_realloc_0_nonnull=yes
+#
+# autoconf
+#
+NFSUTILS_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--sbindir=/sbin \
+	--disable-nfsv4 \
+	--disable-gss
 
 ifdef PTXCONF_NFSUTILS_V3
 NFSUTILS_AUTOCONF += --enable-nfsv3
@@ -91,16 +90,18 @@ NFSUTILS_AUTOCONF += --disable-rquotad
 endif
 
 ifdef PTXCONF_NFSUTILS_WITH_TCPWRAPPERS
-NFSUTILS_AUTOCONF += --with-tcpwrappers=$(PTXCONF_PREFIX)
+NFSUTILS_AUTOCONF += --with-tcpwrappers=$(SYSROOT)
 else
 NFSUTILS_AUTOCONF += --without-tcpwrappers
 endif
 
+
 $(STATEDIR)/nfsutils.prepare: $(nfsutils_prepare_deps_default)
 	@$(call targetinfo, $@)
-	cd $(NFSUTILS_DIR) &&						\
-		$(NFSUTILS_PATH) $(NFSUTILS_ENV)			\
-		$(NFSUTILS_DIR)/configure $(NFSUTILS_AUTOCONF)
+	@$(call clean, $(NFSUTILS_DIR)/config.cache)
+	cd $(NFSUTILS_DIR) && \
+		$(NFSUTILS_PATH) $(NFSUTILS_ENV) \
+		./configure $(NFSUTILS_AUTOCONF)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -109,7 +110,7 @@ $(STATEDIR)/nfsutils.prepare: $(nfsutils_prepare_deps_default)
 
 nfsutils_compile: $(STATEDIR)/nfsutils.compile
 
-$(STATEDIR)/nfsutils.compile: $(STATEDIR)/nfsutils.prepare 
+$(STATEDIR)/nfsutils.compile: $(nfsutils_compile_deps_default)
 	@$(call targetinfo, $@)
 	cd $(NFSUTILS_DIR) && $(NFSUTILS_PATH) make
 	@$(call touch, $@)
@@ -120,8 +121,9 @@ $(STATEDIR)/nfsutils.compile: $(STATEDIR)/nfsutils.prepare
 
 nfsutils_install: $(STATEDIR)/nfsutils.install
 
-$(STATEDIR)/nfsutils.install: $(STATEDIR)/nfsutils.compile
+$(STATEDIR)/nfsutils.install: $(nfsutils_install_deps_default)
 	@$(call targetinfo, $@)
+	@$(call install, NFSUTILS)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -130,99 +132,100 @@ $(STATEDIR)/nfsutils.install: $(STATEDIR)/nfsutils.compile
 
 nfsutils_targetinstall: $(STATEDIR)/nfsutils.targetinstall
 
-$(STATEDIR)/nfsutils.targetinstall: $(STATEDIR)/nfsutils.install
+$(STATEDIR)/nfsutils.targetinstall: $(nfsutils_targetinstall_deps_default)
 	@$(call targetinfo, $@)
 
 	@$(call install_init, nfsutils)
-	@$(call install_fixup, nfsutils,PACKAGE,nfsutils)
-	@$(call install_fixup, nfsutils,PRIORITY,optional)
-	@$(call install_fixup, nfsutils,VERSION,$(NFSUTILS_VERSION))
-	@$(call install_fixup, nfsutils,SECTION,base)
-	@$(call install_fixup, nfsutils,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
-	@$(call install_fixup, nfsutils,DEPENDS,)
-	@$(call install_fixup, nfsutils,DESCRIPTION,missing)
-
-        ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_CLIENTSCRIPT))
-	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/etc/nodist/nfs-client, /etc/init.d/nfs-client, n)
-        endif
-        ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_FUNCTIONSSCRIPT))
-	@$(call install_copy, nfsutils, 0, 0, 0644, $(NFSUTILS_DIR)/etc/nodist/nfs-functions, /etc/init.d/nfs-functions, n)
-        endif
-        ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_SERVERSCRIPT))
-	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/etc/nodist/nfs-server, /etc/init.d/nfs-server, n)
-        endif
-
-        ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_EXPORTFS))
-	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/exportfs/.libs/exportfs, /sbin/exportfs)
-        endif
-        ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_LOCKD))
-	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/lockd/.libs/lockd, /sbin/lockd)
-        endif
-        ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_MOUNTD))
-	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/mountd/.libs/mountd, /sbin/mountd)
-        endif
-        ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_NFSD))
-	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nfsd/.libs/nfsd, /sbin/nfsd)
-        endif
-        ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_NFSSTAT))
-	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nfsstat/.libs/nfsstat, /sbin/nfsstat)
-        endif
-        ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_NHFSGRAPH))
-# don't strip, this is a shell script
-	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nhfsstone/nhfsgraph, /sbin/nhfsgraph, n)
-        endif
-        ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_NHFSNUMS))
-# don't strip, this is a shell script
-	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nhfsstone/nhfsnums, /sbin/nhfsnums, n)
-        endif
-        ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_NHFSRUN))
-# don't strip, this is a shell script
-	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nhfsstone/nhfsrun, /sbin/nhfsrun, n)
-        endif
-        ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_NHFSSTONE))
-	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nhfsstone/.libs/nhfsstone, /sbin/nhfsstone)
-        endif
-        ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_SHOWMOUNT))
-	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/showmount/.libs/showmount, /sbin/showmount)
-        endif
-        ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_STATD))
-	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/statd/.libs/statd, /sbin/statd)
-        endif
-# copy necessary libs
-	@$(call install_copy, nfsutils, 0, 0, 0644, \
-		$(NFSUTILS_DIR)/support/export/.libs/libexport.so.0.0.0, \
-		/usr/lib/libexport.so.0.0.0)
-	@$(call install_link, nfsutils, libexport.so.0.0.0, /usr/lib/libexport.so.0.0)
-	@$(call install_link, nfsutils, libexport.so.0.0.0, /usr/lib/libexport.so.0)
+	@$(call install_fixup,nfsutils,PACKAGE,nfsutils)
+	@$(call install_fixup,nfsutils,PRIORITY,optional)
+	@$(call install_fixup,nfsutils,VERSION,$(NFSUTILS_VERSION))
+	@$(call install_fixup,nfsutils,SECTION,base)
+	@$(call install_fixup,nfsutils,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,nfsutils,DEPENDS,)
+	@$(call install_fixup,nfsutils,DESCRIPTION,missing)
+
+#ifdef PTXCONF_NFSUTILS_INSTALL_CLIENTSCRIPT
+#	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/etc/nodist/nfs-client, /etc/init.d/nfs-client, n)
+#endif
+#ifdef PTXCONF_NFSUTILS_INSTALL_FUNCTIONSSCRIPT
+#	@$(call install_copy, nfsutils, 0, 0, 0644, $(NFSUTILS_DIR)/etc/nodist/nfs-functions, /etc/init.d/nfs-functions, n)
+#endif
+#ifdef PTXCONF_NFSUTILS_INSTALL_SERVERSCRIPT
+#	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/etc/nodist/nfs-server, /etc/init.d/nfs-server, n)
+#endif
+
+ifdef PTXCONF_NFSUTILS_INSTALL_EXPORTFS
+	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/exportfs/exportfs, /usr/sbin/exportfs)
+endif
 
-	@$(call install_copy, nfsutils, 0, 0, 0644, \
-		$(NFSUTILS_DIR)/support/nfs/.libs/libnfs.so.0.0.0, \
-		/usr/lib/libnfs.so.0.0.0)
-	@$(call install_link, nfsutils, libnfs.so.0.0.0, /usr/lib/libnfs.so.0.0)
-	@$(call install_link, nfsutils, libnfs.so.0.0.0, /usr/lib/libnfs.so.0)
+ifdef PTXCONF_NFSUTILS_INSTALL_LOCKD
+	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/lockd/lockd, /sbin/rpc.lockd)
+endif
 
-	@$(call install_copy, nfsutils, 0, 0, 0644, \
-		$(NFSUTILS_DIR)/support/misc/.libs/libmisc.so.0.0.0, \
-		/usr/lib/libmisc.so.0.0.0)
-	@$(call install_link, nfsutils, libmisc.so.0.0.0, /usr/lib/libmisc.so.0.0)
-	@$(call install_link, nfsutils, libmisc.so.0.0.0, /usr/lib/libmisc.so.0)
+ifdef PTXCONF_NFSUTILS_INSTALL_MOUNTD
+	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/mountd/mountd, /usr/sbin/mountd)
+endif
+
+ifdef PTXCONF_NFSUTILS_INSTALL_NFSD
+	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nfsd/nfsd, /usr/sbin/rpc.nfsd)
+endif
+
+ifdef PTXCONF_NFSUTILS_INSTALL_NFSSTAT
+	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nfsstat/nfsstat, /usr/sbin/nfsstat)
+endif
+
+ifdef PTXCONF_NFSUTILS_INSTALL_NHFSGRAPH
+	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nhfsstone/nhfsgraph, /usr/sbin/nhfsgraph, n)
+endif
+
+ifdef PTXCONF_NFSUTILS_INSTALL_NHFSNUMS
+	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nhfsstone/nhfsnums, /usr/sbin/nhfsnums, n)
+endif
+
+ifdef PTXCONF_NFSUTILS_INSTALL_NHFSRUN
+	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nhfsstone/nhfsrun, /usr/sbin/nhfsrun, n)
+endif
+
+ifdef PTXCONF_NFSUTILS_INSTALL_NHFSSTONE
+	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/nhfsstone/nhfsstone, /usr/sbin/nhfsstone)
+endif
+
+ifdef PTXCONF_NFSUTILS_INSTALL_SHOWMOUNT
+	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/showmount/showmount, /sbin/showmount)
+endif
+
+ifdef PTXCONF_NFSUTILS_INSTALL_STATD
+	@$(call install_copy, nfsutils, 0, 0, 0755, $(NFSUTILS_DIR)/utils/statd/statd, /sbin/rpc.statd)
+endif
 
 	mkdir -p $(NFSUTILS_DIR)/ptxdist_install_tmp
+
 	touch $(NFSUTILS_DIR)/ptxdist_install_tmp/etab
-	@$(call install_copy, nfsutils, 0, 0, 0755, \
+	@$(call install_copy, nfsutils, 0, 0, 0644, \
 		$(NFSUTILS_DIR)/ptxdist_install_tmp/etab, \
 		/var/lib/nfs/etab, n)
 
 	touch $(NFSUTILS_DIR)/ptxdist_install_tmp/rmtab
-	@$(call install_copy, nfsutils, 0, 0, 0755, \
+	@$(call install_copy, nfsutils, 0, 0, 0644, \
 		$(NFSUTILS_DIR)/ptxdist_install_tmp/rmtab, \
 		/var/lib/nfs/rmtab, n)
 
 	touch $(NFSUTILS_DIR)/ptxdist_install_tmp/xtab
-	@$(call install_copy, nfsutils, 0, 0, 0755, \
+	@$(call install_copy, nfsutils, 0, 0, 0644, \
 		$(NFSUTILS_DIR)/ptxdist_install_tmp/xtab, \
 		/var/lib/nfs/xtab, n)
 
+	touch $(NFSUTILS_DIR)/ptxdist_install_tmp/state
+	@$(call install_copy, nfsutils, 65534, 0, 0600, \
+		$(NFSUTILS_DIR)/ptxdist_install_tmp/xtab, \
+		/var/lib/nfs/xtab, n)
+
+	@$(call install_copy, nfsutils, 65534, 0, 0700, \
+		/var/lib/nfs/sm)
+
+	@$(call install_copy, nfsutils, 65534, 0, 0700, \
+		/var/lib/nfs/sm.bak)
+
 	@$(call install_finish, nfsutils)
 
 	@$(call touch, $@)
@@ -231,9 +234,9 @@ $(STATEDIR)/nfsutils.targetinstall: $(STATEDIR)/nfsutils.install
 # Clean
 # ----------------------------------------------------------------------------
 
-nfsutils_clean: 
-	rm -rf $(STATEDIR)/nfsutils.* 
-	rm -rf $(IMAGEDIR)/nfsutils_* 
+nfsutils_clean:
+	rm -rf $(STATEDIR)/nfsutils.*
+	rm -rf $(IMAGEDIR)/nfsutils_*
 	rm -rf $(NFSUTILS_DIR)
 
 # vim: syntax=make