From b3785da634e0e05f9991afebbdf998b111856839 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 30 Jan 2010 11:21:22 +0100 Subject: do not install interfaces file on NFSROOT filesystems --- package/base-files/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'package') diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 82541e6f4..92949ea13 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 9 +PKG_RELEASE:= 10 PKG_DESCR:= basic filesystem structure and scripts PKG_SECTION:= base @@ -24,8 +24,15 @@ INSTALL_STYLE:= manual do-install: $(CP) ./extra/* $(IDIR_BASE_FILES) $(CP) $(TOPDIR)/target/$(ADK_TARGET)/files/* $(IDIR_BASE_FILES) +ifeq (${ADK_TARGET_ROOTFS_NFSROOT},y) + @-rm $(IDIR_BASE_FILES)/etc/network/interfaces +endif +ifeq (${ADK_TARGET_PACKAGE_IPKG},y) $(SED) 's,@TARGET@,$(ADK_TARGET),g' $(IDIR_BASE_FILES)/etc/ipkg.conf $(SED) 's,@VERSION@,$(ADK_VERSION),g' $(IDIR_BASE_FILES)/etc/ipkg.conf +else + @-rm $(IDIR_BASE_FILES)/etc/ipkg.conf +endif echo /bin/sh >${IDIR_BASE_FILES}/etc/shells echo /bin/ash >>${IDIR_BASE_FILES}/etc/shells ifneq (${ADK_PACKAGE_BASH},) -- cgit v1.2.3