nfs-utils: bump version, convert to autotargets

[PATCH] fix build with uClibc

uClibc doesn't have/need libio.h, so don't include it from sockaddr.h

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

---

 support/include/sockaddr.h |    5 ++++-

 1 file changed, 4 insertions(+), 1 deletion(-)

Index: nfs-utils-1.2.3/support/include/sockaddr.h

===================================================================

--- nfs-utils-1.2.3.orig/support/include/sockaddr.h

+++ nfs-utils-1.2.3/support/include/sockaddr.h

@@ -20,7 +20,10 @@

 #ifndef NFS_UTILS_SOCKADDR_H

 #define NFS_UTILS_SOCKADDR_H

-#include <libio.h>

+/* uClibc doesn't have/need libio.h */

+#ifndef __UCLIBC__

+#include <libio.h> 

+#endif

 #include <stdbool.h>

 #include <sys/socket.h>

 #include <netinet/in.h>

diff -ur nfs-utils-1.0.10/utils/rquotad/Makefile.in nfs-utils-1.0.10-patched/utils/rquotad/Makefile.in

--- nfs-utils-1.0.10/utils/rquotad/Makefile.in	2006-08-07 01:43:46.000000000 -0500

+++ nfs-utils-1.0.10-patched/utils/rquotad/Makefile.in	2007-01-13 21:24:26.971232703 -0600

@@ -653,14 +653,6 @@

 $(RPCGEN):

 	make -C $(top_srcdir)/tools/rpcgen all

-$(GENFILES_XDR): %_xdr.c: %.x $(RPCGEN)

-	test -f $@ && rm -rf $@ || true

-	$(RPCGEN) -c -o $@ $<

-

-$(GENFILES_H): %.h: %.x $(RPCGEN)

-	test -f $@ && rm -rf $@ || true

-	$(RPCGEN) -h -o $@ $<

-

 #######################################################################

 # The following allows the current practice of having

 # daemons renamed during the install to include RPCPREFIX

# nfs-utils

#

#############################################################

NFS_UTILS_VERSION:=1.0.10

NFS_UTILS_SOURCE:=nfs-utils-$(NFS_UTILS_VERSION).tar.gz

NFS_UTILS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/nfs/

NFS_UTILS_CAT:=$(ZCAT)

NFS_UTILS_DIR:=$(BUILD_DIR)/nfs-utils-$(NFS_UTILS_VERSION)

NFS_UTILS_BINARY:=utils/nfsd/nfsd

NFS_UTILS_TARGET_BINARY:=usr/sbin/rpc.nfsd

NFS_UTILS_VERSION = 1.2.3

NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.bz2

NFS_UTILS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/nfs/

BR2_NFS_UTILS_CFLAGS=

ifeq ($(BR2_LARGEFILE),)

BR2_NFS_UTILS_CFLAGS+=-U_LARGEFILE64_SOURCE -U_FILE_OFFSET_BITS

endif

BR2_NFS_UTILS_CFLAGS+=-DUTS_RELEASE='\"$(LINUX_HEADERS_VERSION)\"'

NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no

$(DL_DIR)/$(NFS_UTILS_SOURCE):

	 $(call DOWNLOAD,$(NFS_UTILS_SITE),$(NFS_UTILS_SOURCE))

nfs-utils-source: $(DL_DIR)/$(NFS_UTILS_SOURCE)

$(NFS_UTILS_DIR)/.unpacked: $(DL_DIR)/$(NFS_UTILS_SOURCE)

	$(NFS_UTILS_CAT) $(DL_DIR)/$(NFS_UTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

	toolchain/patch-kernel.sh $(NFS_UTILS_DIR) package/nfs-utils/ nfs-utils\*.patch

	toolchain/patch-kernel.sh $(NFS_UTILS_DIR) $(NFS_UTILS_DIR)/debian/ \*.patch

	$(CONFIG_UPDATE) $(NFS_UTILS_DIR)

	touch $@

$(NFS_UTILS_DIR)/.configured: $(NFS_UTILS_DIR)/.unpacked

	(cd $(NFS_UTILS_DIR); rm -rf config.cache; \

		$(TARGET_CONFIGURE_OPTS) \

		$(TARGET_CONFIGURE_ARGS) \

		CFLAGS="$(TARGET_CFLAGS) $(BR2_NFS_UTILS_CFLAGS)" \

		knfsd_cv_bsd_signals=no \

		./configure $(QUIET) \

		--target=$(GNU_TARGET_NAME) \

		--host=$(GNU_TARGET_NAME) \

		--build=$(GNU_HOST_NAME) \

		--prefix=/usr \

NFS_UTILS_CONF_OPT = \

		--disable-nfsv4 \

		--disable-gss \

	)

	touch $@

$(NFS_UTILS_DIR)/$(NFS_UTILS_BINARY): $(NFS_UTILS_DIR)/.configured

	$(MAKE) CC="$(TARGET_CC)" CC_FOR_BUILD="$(HOSTCC)" \

		RPCGEN=/usr/bin/rpcgen -C $(NFS_UTILS_DIR)

	touch -c $@

NFS_UTILS_TARGETS_ :=

NFS_UTILS_TARGETS_y := usr/sbin/exportfs usr/sbin/rpc.mountd \

			usr/sbin/rpc.nfsd usr/sbin/rpc.statd

		--disable-tirpc \

		--disable-uuid \

		--without-tcp-wrappers \

		--with-rpcgen=internal

NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPCDEBUG) += usr/sbin/rpcdebug

NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_LOCKD) += usr/sbin/rpc.lockd

NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD) += usr/sbin/rpc.rquotad

$(BUILD_DIR)/.fakeroot.nfs-utils: $(NFS_UTILS_DIR)/$(NFS_UTILS_BINARY)

	# Use fakeroot to pretend to do 'make install' as root

	echo '$(MAKE) prefix=$(TARGET_DIR)/usr statedir=$(TARGET_DIR)/var/lib/nfs $(TARGET_CONFIGURE_OPTS) -C $(NFS_UTILS_DIR) install' > $@

	echo 'rm -f $(TARGET_DIR)/usr/bin/event_rpcgen.py $(TARGET_DIR)/usr/sbin/nhfs* $(TARGET_DIR)/usr/sbin/nfsstat $(TARGET_DIR)/usr/sbin/showmount' >> $@

	echo 'rm -rf $(TARGET_DIR)/usr/share/man' >> $@

	echo '$(INSTALL) -m 0755 package/nfs-utils/S60nfs $(TARGET_DIR)/etc/init.d' >> $@

	echo -n 'for file in $(NFS_UTILS_TARGETS_); do rm -f $(TARGET_DIR)/' >> $@

	echo -n "\$$" >> $@

	echo "file; done" >> $@

	echo 'rm -rf $(TARGET_DIR)/var/lib/nfs' >> $@

$(TARGET_DIR)/$(NFS_UTILS_TARGET_BINARY): $(BUILD_DIR)/.fakeroot.nfs-utils

	touch -c $@

define NFS_UTILS_INSTALL_FIXUP

	$(INSTALL) -m 0755 package/nfs-utils/S60nfs \

		$(TARGET_DIR)/etc/init.d/S60nfs

	rm -f $(NFS_UTILS_TARGETS_)

endef

nfs-utils: host-fakeroot $(TARGET_DIR)/$(NFS_UTILS_TARGET_BINARY)

NFS_UTILS_POST_INSTALL_TARGET_HOOKS += NFS_UTILS_INSTALL_FIXUP

nfs-utils-clean:

	rm -f $(TARGET_DIR)/etc/init.d/S60nfs

	for file in $(NFS_UTILS_TARGETS_y); do \

		rm -f $(TARGET_DIR)/$$file; \

	done

	-$(MAKE) -C $(NFS_UTILS_DIR) clean

	rm -f $(BUILD_DIR)/.fakeroot.nfs-utils

nfs-utils-dirclean:

	rm -rf $(NFS_UTILS_DIR)

#############################################################

#

# Toplevel Makefile options

#

#############################################################

ifeq ($(BR2_PACKAGE_NFS_UTILS),y)

TARGETS+=nfs-utils

endif

$(eval $(call AUTOTARGETS,package,nfs-utils))