diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-01 19:45:20 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-01 19:45:20 +0100 |
| commit | 269e98c93f1bff77dc33701f1e5e8615a031ec0b (patch) | |
| tree | d6e35e6da4bc19f657ac07ff8447ec065d85a4aa /package/base-files | |
| parent | d1b6ea47f57cbcac8543a4dba976e13e3bc2e985 (diff) | |
| parent | 2a8b0c42a074556bd489ef88a2b788f84ff6cf1e (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/base-files')
| -rw-r--r-- | package/base-files/Makefile | 9 | ||||
| -rwxr-xr-x | package/base-files/extra/init | 2 |
2 files changed, 9 insertions, 2 deletions
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},) diff --git a/package/base-files/extra/init b/package/base-files/extra/init index e11446366..618547693 100755 --- a/package/base-files/extra/init +++ b/package/base-files/extra/init @@ -1,5 +1,5 @@ #!/bin/sh -echo "Starting system ..." +echo "System initialization ..." export PATH=/bin:/sbin:/usr/bin:/usr/sbin mount -nt proc proc /proc mount -o nosuid,nodev,noexec -t sysfs sysfs /sys |