Merge branch 'nfs-utils-update' into core67-merge

This commit is contained in:
Stefan Schantl
2013-03-03 13:59:05 +01:00
2 changed files with 14 additions and 6 deletions

View File

@@ -1,5 +1,7 @@
etc/rc.d/init.d/nfs-server
sbin/mount.nfs sbin/mount.nfs
sbin/mount.nfs4 sbin/mount.nfs4
sbin/osd_login
sbin/umount.nfs sbin/umount.nfs
sbin/umount.nfs4 sbin/umount.nfs4
#usr/include/nfsidmap.h #usr/include/nfsidmap.h
@@ -20,6 +22,9 @@ usr/lib/libnfsidmap/static.so
usr/lib/libnfsidmap/umich_ldap.so usr/lib/libnfsidmap/umich_ldap.so
#usr/lib/pkgconfig/libnfsidmap.pc #usr/lib/pkgconfig/libnfsidmap.pc
usr/sbin/exportfs usr/sbin/exportfs
usr/sbin/mountstats
usr/sbin/nfsdcltrack
usr/sbin/nfsiostat
usr/sbin/nfsstat usr/sbin/nfsstat
usr/sbin/rpc.idmapd usr/sbin/rpc.idmapd
usr/sbin/rpc.mountd usr/sbin/rpc.mountd
@@ -37,7 +42,10 @@ usr/sbin/start-statd
#usr/share/man/man8/idmapd.8 #usr/share/man/man8/idmapd.8
#usr/share/man/man8/mount.nfs.8 #usr/share/man/man8/mount.nfs.8
#usr/share/man/man8/mountd.8 #usr/share/man/man8/mountd.8
#usr/share/man/man8/mountstats.8
#usr/share/man/man8/nfsd.8 #usr/share/man/man8/nfsd.8
#usr/share/man/man8/nfsdcltrack.8
#usr/share/man/man8/nfsiostat.8
#usr/share/man/man8/nfsstat.8 #usr/share/man/man8/nfsstat.8
#usr/share/man/man8/rpc.idmapd.8 #usr/share/man/man8/rpc.idmapd.8
#usr/share/man/man8/rpc.mountd.8 #usr/share/man/man8/rpc.mountd.8
@@ -56,5 +64,4 @@ var/lib/nfs/sm
#var/lib/nfs/sm.bak #var/lib/nfs/sm.bak
var/lib/nfs/state var/lib/nfs/state
var/lib/nfs/xtab var/lib/nfs/xtab
etc/rc.d/init.d/nfs-server
var/ipfire/nfs/nfs-server var/ipfire/nfs/nfs-server

11
lfs/nfs
View File

@@ -24,7 +24,7 @@
include Config include Config
VER = 1.2.2 VER = 1.2.7
THISAPP = nfs-utils-$(VER) THISAPP = nfs-utils-$(VER)
DL_FILE = $(THISAPP).tar.bz2 DL_FILE = $(THISAPP).tar.bz2
@@ -32,11 +32,11 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP) DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
PROG = nfs PROG = nfs
PAK_VER = 4 PAK_VER = 5
DEPS = "portmap" DEPS = "portmap"
LIBNFSIDMAP = 0.23 LIBNFSIDMAP = 0.25
############################################################################### ###############################################################################
# Top-level Rules # Top-level Rules
@@ -48,8 +48,8 @@ objects = $(DL_FILE) \
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
libnfsidmap-$(LIBNFSIDMAP).tar.gz = $(DL_FROM)/libnfsidmap-$(LIBNFSIDMAP).tar.gz libnfsidmap-$(LIBNFSIDMAP).tar.gz = $(DL_FROM)/libnfsidmap-$(LIBNFSIDMAP).tar.gz
$(DL_FILE)_MD5 = dad92f64db3266c7757f71bb53ee8f35 $(DL_FILE)_MD5 = 3b5ca797197765dc0c3a4122720c7716
libnfsidmap-$(LIBNFSIDMAP).tar.gz_MD5 = 28f3ece648c1dc5d25e8d623d55f8bd6 libnfsidmap-$(LIBNFSIDMAP).tar.gz_MD5 = 2ac4893c92716add1a1447ae01df77ab
install : $(TARGET) install : $(TARGET)
@@ -93,6 +93,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--sysconfdir=/etc \ --sysconfdir=/etc \
--disable-gss \ --disable-gss \
--disable-tirpc \ --disable-tirpc \
--disable-nfsv41 \
--without-tcp-wrappers --without-tcp-wrappers
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)