Changeset 4d96d89 in freewrt


Ignore:
Timestamp:
Jul 7, 2007, 7:24:19 PM (18 years ago)
Author:
Phil Sutter <n0-1@…>
Children:
93702e5
Parents:
d7eca6f
Message:

reorganisation of the various nfs support packages

  • kernel space vs. user space is now a choice (allowing both to be built as modules, but only a single installation into the firmware image, as both provide their own /etc/exports)
  • nfs-utils is also helpful for nfs-server, as it provides 'exportfs', so leave non-utility stuff out of the package and create a new one containing server stuff
  • any comments regarding the menuconfig layout?

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@3165 afb5a338-a214-0410-bd46-81f09a774fd1

Location:
package
Files:
1 added
1 deleted
5 edited
1 moved

Legend:

Unmodified
Added
Removed

  • package/Config.in

    rd7eca6f r4d96d89  
    150150source "package/netperf/Config.in"
    151151source "package/netstat-nat/Config.in"
     152
     153menu "nfs............................... Network Filesystem Support"
    152154source "package/nfs-utils/Config.in"
    153 source "package/nfs-server/Config.in"
     155
     156choice
     157        optional
     158        prompt "NFS server support"
     159        default n
     160
     161config FWRT_PACKAGE_NFS_SERVER
     162        prompt "User Space NFS server"
     163        tristate
     164        help
     165          This package contains all necessary programs to make your Linux machine
     166          act as an NFS server, being an NFS daemon (rpc.nfsd), a mount daemon (rpc.mountd).
     167          Unlike other NFS daemons, this NFS server runs entirely in user space. This
     168          makes it a tad slower than other NFS implementations, and also introduces some
     169          awkwardnesses in the semantics (for instance, moving a file to a different
     170          directory will render its file handle invalid). There is currently no support
     171          for file locking.
     172
     173config FWRT_PACKAGE_NFS_KERNEL_NFSD
     174        prompt "Kernel Space NFS server"
     175        tristate
     176        select FWRT_KPACKAGE_KMOD_NFSD
     177        select FWRT_KPACKAGE_KMOD_NFS_FS
     178        help
     179          NFS kernel server utilities. You only can export attached
     180          USB storage, like a disk or a memory stick.
     181endchoice
     182endmenu
     183
    154184source "package/nmap/Config.in"
    155185source "package/nocatsplash/Config.in"

  • package/Makefile

    rd7eca6f r4d96d89  
    213213package-$(FWRT_PACKAGE_NETSTAT_NAT) += netstat-nat
    214214package-$(FWRT_PACKAGE_NFS_UTILS) += nfs-utils
     215package-$(FWRT_PACKAGE_NFS_KERNEL_NFSD) += nfs-utils
    215216package-$(FWRT_PACKAGE_NFS_SERVER) += nfs-server
    216217package-$(FWRT_PACKAGE_NMAP) += nmap

  • package/nfs-utils/Config.in

    rd7eca6f r4d96d89  
    11config FWRT_PACKAGE_NFS_UTILS
    2         prompt "nfs-utils......................... NFS kernel server utilities"
     2        prompt "nfs-utils......................... NFS server utilities"
    33        tristate
    44        default n
    5         select FWRT_PACKAGE_PORTMAP
    6         select FWRT_KPACKAGE_KMOD_NFSD
    7         select FWRT_KPACKAGE_KMOD_NFS_FS
    85        help
    9          NFS kernel server utilities. You only can export attached
    10          USB storage, like a disk or a memory stick.
     6         NFS server utilities (namely, exportfs). If unsure, say 'yes'.
     7

  • package/nfs-utils/Makefile

    rd7eca6f r4d96d89  
    1616
    1717$(eval $(call PKG_template,NFS_UTILS,nfs-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
     18$(eval $(call PKG_template,NFS_KERNEL_NFSD,nfs-kernel-nfsd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
    1819
    1920CONFIGURE_STYLE=        gnu
    … …  
    2526TCPPFLAGS+=             -I${LINUX_DIR}/include
    2627
    27 post-install:
    28         ${INSTALL_DIR} ${IDIR_NFS_UTILS}/etc
    29         ${INSTALL_DATA} ./files/nfsd.exports ${IDIR_NFS_UTILS}/etc/exports
    30         ${INSTALL_DIR} ${IDIR_NFS_UTILS}/etc/init.d
    31         ${INSTALL_BIN} ./files/nfsd.init \
    32             ${IDIR_NFS_UTILS}/etc/init.d/knfsd
     28NFS_INSTALL_PKG_${FWRT_PACKAGE_NFS_UTILS}+=             install-utils
     29NFS_INSTALL_PKG_${FWRT_PACKAGE_NFS_KERNEL_NFSD}+=       install-server
     30
     31post-install: ${NFS_INSTALL_PKG_y} ${NFS_INSTALL_PKG_m}
     32
     33install-utils:
    3334        ${INSTALL_DIR} ${IDIR_NFS_UTILS}/usr/sbin
    34         ${INSTALL_BIN} ${WRKBUILD}/utils/lockd/lockd ${IDIR_NFS_UTILS}/usr/sbin/
    35         ${INSTALL_BIN} ${WRKBUILD}/utils/statd/statd ${IDIR_NFS_UTILS}/usr/sbin/
    36         ${INSTALL_BIN} ${WRKBUILD}/utils/nfsd/nfsd ${IDIR_NFS_UTILS}/usr/sbin/
    37         ${INSTALL_BIN} ${WRKBUILD}/utils/mountd/mountd ${IDIR_NFS_UTILS}/usr/sbin/
    3835        ${INSTALL_BIN} ${WRKBUILD}/utils/exportfs/exportfs ${IDIR_NFS_UTILS}/usr/sbin/
    3936
     37install-server:
     38        ${INSTALL_DIR} ${IDIR_NFS_KERNEL_NFSD}/etc/init.d
     39        ${INSTALL_DIR} ${IDIR_NFS_KERNEL_NFSD}/usr/sbin
     40        ${INSTALL_BIN} ./files/nfsd.init \
     41            ${IDIR_NFS_KERNEL_NFSD}/etc/init.d/knfsd
     42        ${INSTALL_DATA} ./files/nfsd.exports ${IDIR_NFS_KERNEL_NFSD}/etc/exports
     43        ${INSTALL_BIN} ${WRKBUILD}/utils/lockd/lockd ${IDIR_NFS_KERNEL_NFSD}/usr/sbin/
     44        ${INSTALL_BIN} ${WRKBUILD}/utils/statd/statd ${IDIR_NFS_KERNEL_NFSD}/usr/sbin/
     45        ${INSTALL_BIN} ${WRKBUILD}/utils/nfsd/nfsd ${IDIR_NFS_KERNEL_NFSD}/usr/sbin/
     46        ${INSTALL_BIN} ${WRKBUILD}/utils/mountd/mountd ${IDIR_NFS_KERNEL_NFSD}/usr/sbin/
     47
    4048include ${TOPDIR}/mk/pkg-bottom.mk

  • package/nfs-utils/ipkg/nfs-utils.control

    rd7eca6f r4d96d89  
    22Section: net
    33Priority: optional
    4 Depends: portmap, kmod-fs-nfs, kmod-fs-nfsd
     4Depends:
    55Description: Utilities for NFS kernel server
Note: See TracChangeset for help on using the changeset viewer.