Changeset 16027


Ignore:
Timestamp:
2009-05-24T15:13:23+02:00 (9 years ago)
Author:
florian
Message:

merge r15136, r15137, r15276, r16025, r16026 to packages_8.09 should fix #4716

Location:
branches/packages_8.09/net
Files:
1 added
5 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • branches/packages_8.09/net/nfs-kernel-server/Makefile

    r12175 r16027  
     1# Copyright (C) 2009 OpenWrt.org 
     2# 
     3# This is free software, licensed under the GNU General Public License v2. 
     4# See /LICENSE for more information. 
     5# 
    16# $Id$ 
    27 
     
    49 
    510PKG_NAME:=nfs-kernel-server 
    6 PKG_VERSION:=1.0.7 
    7 PKG_RELEASE:=1 
    8 PKG_MD5SUM:=8f863120261cd572ad320a9152581e11 
     11PKG_VERSION:=1.1.5 
     12PKG_RELEASE:=3 
     13PKG_MD5SUM:=2848072a5e53840b9bc520fbb6782b57 
    914 
    1015PKG_SOURCE_URL:=@SF/nfs 
    11 PKG_SOURCE:=nfs-utils-$(PKG_VERSION).tar.gz 
     16PKG_SOURCE:=nfs-utils-$(PKG_VERSION).tar.bz2 
    1217 
    1318PKG_BUILD_DIR:=$(BUILD_DIR)/nfs-utils-$(PKG_VERSION) 
     
    1520include $(INCLUDE_DIR)/package.mk 
    1621 
     22define Package/nfs-kernel-server/Default 
     23  SECTION:=net 
     24  CATEGORY:=Network 
     25  DEPENDS:=+libwrap +libblkid 
     26  URL:=http://nfs.sourceforge.net/ 
     27endef 
     28 
    1729define Package/nfs-kernel-server 
    18 SECTION:=net 
    19 CATEGORY:=Network 
    20 TITLE:=Kernel NFS server support 
    21 URL:=http://nfs.sourceforge.net/ 
    22 DEPENDS:=+kmod-fs-nfsd +kmod-fs-nfs +portmap 
     30  $(call Package/nfs-kernel-server/Default) 
     31  TITLE:=Kernel NFS server support 
     32  DEPENDS+= +kmod-fs-nfsd +kmod-fs-nfs +portmap 
    2333endef 
    2434 
    2535define Package/nfs-kernel-server/description 
    26 Kernel NFS server support 
     36  Kernel NFS server support 
    2737endef 
    2838 
    2939define Package/nfs-kernel-server-utils 
    30 SECTION:=net 
    31 CATEGORY:=Network 
    32 TITLE:=NFS server utils 
    33 URL:=http://nfs.sourceforge.net 
    34 DEPENDS:=nfs-kernel-server 
     40  $(call Package/nfs-kernel-server/Default) 
     41  TITLE:=NFS server utils 
     42  DEPENDS:=nfs-kernel-server 
    3543endef 
    3644 
    3745define Package/nfs-kernel-server-utils/description 
    38 NFS server utils 
     46  NFS server utils 
    3947endef 
    4048 
     
    4351endef 
    4452 
    45 define Build/Configure 
    46         $(call Build/Configure/Default, \ 
    47                 --enable-static \ 
    48                 --enable-shared \ 
    49                 --disable-nfsv4 \ 
    50                 --disable-gss \ 
    51         ) 
     53define Package/nfs-utils 
     54  $(call Package/nfs-kernel-server/Default) 
     55  DEPENDS+= +libevent 
     56  TITLE:=updated mount utility (includes nfs4) 
    5257endef 
    5358 
     59define Package/nfs-utils/description 
     60  Updated mount.nfs command - allows mounting nfs4 volumes 
     61endef 
     62 
     63CONFIGURE_ARGS += \ 
     64        --disable-gss \ 
     65        --disable-nfsv4 \ 
     66        --enable-static \ 
     67        --enable-shared 
     68 
     69TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib  
     70TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib  
     71 
    5472define Build/Compile 
    55         rm -rf $(PKG_INSTALL_DIR) 
    56         mkdir -p $(PKG_INSTALL_DIR) 
    57         $(MAKE) -C $(PKG_BUILD_DIR) 
     73        $(call Build/Compile/Default, \ 
     74                OPT="$(TARGET_CFLAGS)" \ 
     75                INSTALLSUID="install -m 4755" \ 
     76                DESTDIR="$(PKG_INSTALL_DIR)" \ 
     77                all install \ 
     78        ) 
    5879endef 
    5980 
     
    6283        $(INSTALL_DATA) ./files/nfsd.exports $(1)/etc/exports 
    6384        $(INSTALL_BIN) ./files/nfsd.init $(1)/etc/init.d/nfsd 
    64         $(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/lockd/lockd $(1)/usr/sbin/rpc.lockd 
    6585        $(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/statd/statd $(1)/usr/sbin/rpc.statd 
    6686        $(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/nfsd/nfsd $(1)/usr/sbin/rpc.nfsd 
     
    7595endef 
    7696 
     97define Package/nfs-utils/install 
     98        $(INSTALL_DIR) $(1)/sbin 
     99        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/mount.nfs $(1)/sbin/ 
     100        (cd $(1)/sbin; ln -sf mount.nfs mount.nfs4; ln -sf mount.nfs umount.nfs; ln -sf mount.nfs umount.nfs4) 
     101endef 
     102 
    77103$(eval $(call BuildPackage,nfs-kernel-server)) 
    78104$(eval $(call BuildPackage,nfs-kernel-server-utils)) 
     105$(eval $(call BuildPackage,nfs-utils)) 
  • branches/packages_8.09/net/nfs-kernel-server/files/nfsd.init

    r6730 r16027  
    1010         
    1111        /usr/sbin/rpc.statd 
    12         /usr/sbin/rpc.lockd 
    1312        /usr/sbin/exportfs -r 
    1413        /usr/sbin/rpc.nfsd 
     
    2019        killall -9 rpc.nfsd 2> /dev/null 
    2120        /usr/sbin/exportfs -au 
    22         killall lockd 2> /dev/null 
    2321        killall rpc.statd 2> /dev/null 
    2422} 
Note: See TracChangeset for help on using the changeset viewer.