Changeset 2485524 in freewrt

Timestamp:

Mar 27, 2007, 12:23:01 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

422b5b5

Parents:

188d52d

Message:

• don't build some linux specific host tools; unbreak building rpcgen on BSD (where it probably isn't needed since the BSDs come with rpcgen already, but this was easier…)
• rename nfs-utils init script from S70nfsd to S70knfsd (nfsd is the user space nfs-server)
• rename nfs-utils rc.conf item from $nfsd to $knfsd, too
• kernel nfsd also needs $portmap=YES in rc.conf to function
• add the rc.conf symbol in postinstall, it was missing
• CPPFLAGS additions belong into TCPPFLAGS+= line
• some style nits

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

Location:

package

Files:

• Config.in (modified) (1 diff)
• nfs-utils/Makefile (modified) (4 diffs)
• nfs-utils/files/nfsd.init (modified) (1 diff)
• nfs-utils/ipkg/nfs-utils.postinst (added)
• nfs-utils/patches/patch-tools_Makefile_in (added)
• nfs-utils/patches/patch-tools_getiversion_Makefile_in (deleted)
• nfs-utils/patches/patch-tools_getkversion_Makefile_in (deleted)
• nfs-utils/patches/patch-tools_locktest_Makefile_in (deleted)
• nfs-utils/patches/patch-tools_rpcdebug_Makefile_in (deleted)
• nfs-utils/patches/patch-tools_rpcgen_Makefile_in (deleted)

package/Config.in

@@ -150 +150 @@
 source "package/netperf/Config.in"
 source "package/netstat-nat/Config.in"
-#source "package/nfs-utils/Config.in"
+source "package/nfs-utils/Config.in"
 source "package/nfs-server/Config.in"
 source "package/nmap/Config.in"

package/nfs-utils/Makefile

@@ -9 +9 @@
 PKG_NAME:=              nfs-utils
 PKG_VERSION:=           1.0.10
-PKG_RELEASE:=           1
+PKG_RELEASE:=           2
 PKG_MD5SUM:=            1949634d0dc896696d8a880bdca622c8
 PKG_INIT:=              70
@@ -19 +19 @@
 
 CONFIGURE_STYLE=        gnu
-CONFIGURE_ENV+=         CPPFLAGS="-I${LINUX_DIR}/include" \
-                        knfsd_cv_bsd_signals=no
+CONFIGURE_ENV+=         knfsd_cv_bsd_signals=no
 CONFIGURE_ARGS+=        --disable-nfsv4 \
                         --disable-gss
 BUILD_STYLE=            auto
 INSTALL_STYLE=          auto
+TCPPFLAGS+=             -I${LINUX_DIR}/include
 
 post-install:
@@ -31 +31 @@
         ${INSTALL_DIR} ${IDIR_NFS_UTILS}/etc/init.d
         ${INSTALL_BIN} ./files/nfsd.init \
-                ${IDIR_NFS_UTILS}/etc/init.d/S${PKG_INIT}nfsd
+            ${IDIR_NFS_UTILS}/etc/init.d/S${PKG_INIT}knfsd
         ${INSTALL_DIR} ${IDIR_NFS_UTILS}/usr/sbin
         ${INSTALL_BIN} ${WRKBUILD}/utils/lockd/lockd ${IDIR_NFS_UTILS}/usr/sbin/
@@ -38 +38 @@
         ${INSTALL_BIN} ${WRKBUILD}/utils/mountd/mountd ${IDIR_NFS_UTILS}/usr/sbin/
         ${INSTALL_BIN} ${WRKBUILD}/utils/exportfs/exportfs ${IDIR_NFS_UTILS}/usr/sbin/
+
 include ${TOPDIR}/mk/pkg-bottom.mk

package/nfs-utils/files/nfsd.init

@@ -5 +5 @@
 case $1 in
 autostart)
-        test x"${nfsd:-NO}" = x"NO" && exit 0
+        test x"${portmap:-NO}" = x"NO" && exit 0
+        test x"${knfsd:-NO}" = x"NO" && exit 0
         exec $0 start
         ;;