This is now bundled in nfs-utils.
This patch needs a rootfile update for nfs
Signed-off-by: Michael Tremer michael.tremer@ipfire.org --- config/rootfiles/packages/libnfsidmap | 15 ----- lfs/libnfsidmap | 88 --------------------------- lfs/nfs | 4 +- make.sh | 1 - 4 files changed, 2 insertions(+), 106 deletions(-) delete mode 100644 config/rootfiles/packages/libnfsidmap delete mode 100644 lfs/libnfsidmap
diff --git a/config/rootfiles/packages/libnfsidmap b/config/rootfiles/packages/libnfsidmap deleted file mode 100644 index 0c9d3ab12..000000000 --- a/config/rootfiles/packages/libnfsidmap +++ /dev/null @@ -1,15 +0,0 @@ -#usr/include/nfsidmap.h -#usr/lib/libnfsidmap -#usr/lib/libnfsidmap.la -#usr/lib/libnfsidmap.so -usr/lib/libnfsidmap.so.0 -usr/lib/libnfsidmap.so.0.3.0 -#usr/lib/libnfsidmap/nsswitch.la -usr/lib/libnfsidmap/nsswitch.so -#usr/lib/libnfsidmap/static.la -usr/lib/libnfsidmap/static.so -#usr/lib/libnfsidmap/umich_ldap.la -usr/lib/libnfsidmap/umich_ldap.so -#usr/lib/pkgconfig/libnfsidmap.pc -#usr/share/man/man3/nfs4_uid_to_name.3 -#usr/share/man/man5/idmapd.conf.5 diff --git a/lfs/libnfsidmap b/lfs/libnfsidmap deleted file mode 100644 index 1980d9306..000000000 --- a/lfs/libnfsidmap +++ /dev/null @@ -1,88 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.27 - -THISAPP = libnfsidmap-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = libnfsidmap -PAK_VER = 2 - -#CFLAGS += -I/usr/include/tirpc - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 27cfb22f1ee85e51b863b71858a97da0 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-static - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/nfs b/lfs/nfs index 55accfb28..702f7116f 100644 --- a/lfs/nfs +++ b/lfs/nfs @@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nfs -PAK_VER = 15 +PAK_VER = 16
-DEPS = libnfsidmap rpcbind +DEPS = rpcbind
############################################################################### # Top-level Rules diff --git a/make.sh b/make.sh index 5930699f0..d9240a008 100755 --- a/make.sh +++ b/make.sh @@ -1496,7 +1496,6 @@ buildipfire() { lfsmake2 rsync lfsmake2 rpcbind lfsmake2 keyutils - lfsmake2 libnfsidmap lfsmake2 nfs lfsmake2 gnu-netcat lfsmake2 ncat