From 5a78fe0ce555495be74399f03494316c136f4d27 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sun, 24 May 2009 12:44:31 +0000 Subject: [PATCH] [package] nfs-utils and nfs-kernel server use the same tarball, merge them into a single package SVN-Revision: 16025 --- net/nfs-kernel-server/Makefile | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/net/nfs-kernel-server/Makefile b/net/nfs-kernel-server/Makefile index 6f09bccf21..20282f402c 100644 --- a/net/nfs-kernel-server/Makefile +++ b/net/nfs-kernel-server/Makefile @@ -1,9 +1,14 @@ +# Copyright (C) 2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk PKG_NAME:=nfs-kernel-server PKG_VERSION:=1.1.5 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_MD5SUM:=2848072a5e53840b9bc520fbb6782b57 PKG_SOURCE_URL:=@SF/nfs @@ -16,12 +21,14 @@ include $(INCLUDE_DIR)/package.mk define Package/nfs-kernel-server/Default SECTION:=net CATEGORY:=Network + DEPENDS:=+libwrap +libblkid URL:=http://nfs.sourceforge.net/ endef define Package/nfs-kernel-server + $(call Package/nfs-kernel-server/Default) TITLE:=Kernel NFS server support - DEPENDS:=+kmod-fs-nfsd +kmod-fs-nfs +portmap +libwrap +libblkid + DEPENDS+= +kmod-fs-nfsd +kmod-fs-nfs +portmap endef define Package/nfs-kernel-server/description @@ -29,8 +36,9 @@ define Package/nfs-kernel-server/description endef define Package/nfs-kernel-server-utils + $(call Package/nfs-kernel-server/Default) TITLE:=NFS server utils - DEPENDS:=+nfs-kernel-server + DEPENDS:=nfs-kernel-server endef define Package/nfs-kernel-server-utils/description @@ -41,6 +49,16 @@ define Package/nfs-kernel-server/conffiles /etc/exports endef +define Package/nfs-utils + $(call Package/nfs-kernel-server/Default) + DEPENDS+= +libevent + TITLE:=updated mount utility (includes nfs4) +endef + +define Package/nfs-utils/description + Updated mount.nfs command - allows mounting nfs4 volumes +endef + CONFIGURE_ARGS += \ --disable-gss \ --disable-nfsv4 \ @@ -75,5 +93,12 @@ define Package/nfs-kernel-server-utils/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/nfsstat/nfsstat $(1)/usr/sbin endef +define Package/nfs-utils/install + $(INSTALL_DIR) $(1)/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/mount.nfs $(1)/sbin/ + (cd $(1)/sbin; ln -sf mount.nfs mount.nfs4; ln -sf mount.nfs umount.nfs; ln -sf mount.nfs umount.nfs4) +endef + $(eval $(call BuildPackage,nfs-kernel-server)) $(eval $(call BuildPackage,nfs-kernel-server-utils)) +$(eval $(call BuildPackage,nfs-utils)) -- 2.30.2