- nfs-utils: move files to package dir

make/target-files.mk

@@ -7,7 +7,6 @@ files-etc: \
 	$(TARGET_sysconfdir)/default/rcS \
 	$(TARGET_sysconfdir)/network/interfaces \
 	$(TARGET_sysconfdir)/date-dummy \
-	$(TARGET_sysconfdir)/exports \
 	$(TARGET_sysconfdir)/filesystems \
 	$(TARGET_sysconfdir)/fstab \
 	$(TARGET_sysconfdir)/group \
@@ -38,13 +37,6 @@ endif
 $(TARGET_sysconfdir)/date-dummy:
 	echo "$(shell date +%Y)01010000" > $(@)
 
-$(TARGET_sysconfdir)/exports:
-ifeq ($(PERSISTENT_VAR_PARTITION),yes)
-	$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/exports-var $(TARGET_localstatedir)/etc/exports
-else
-	$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/exports $(@)
-endif
-
 $(TARGET_sysconfdir)/filesystems:
 	$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/filesystems $(@)
 

make/target-tools.mk

@@ -1721,6 +1721,11 @@ nfs-utils: $(NFS_UTILS_DEPS) $(DL_DIR)/$(NFS_UTILS_SOURCE) | $(TARGET_DIR)
 	chmod 0755 $(TARGET_base_sbindir)/mount.nfs
 	rm -f $(addprefix $(TARGET_base_sbindir)/,mount.nfs4 osd_login umount.nfs umount.nfs4)
 	rm -f $(addprefix $(TARGET_sbindir)/,mountstats nfsiostat)
+  ifeq ($(PERSISTENT_VAR_PARTITION),yes)
+	$(INSTALL_DATA) -D $(PKG_FILES_DIR)/exports-var $(TARGET_localstatedir)/etc/exports
+  else
+	$(INSTALL_DATA) -D $(PKG_FILES_DIR)/exports $(TARGET_sysconfdir)/exports
+  endif
 	$(INSTALL_EXEC) -D $(PKG_FILES_DIR)/nfsd.init $(TARGET_sysconfdir)/init.d/nfsd
 	$(UPDATE-RC.D) nfsd defaults 75 25
 	$(REMOVE)/$(PKG_DIR)