diff options
| author | Waldemar Brodkorb <wbrodkorb@conet.de> | 2015-01-28 09:47:18 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbrodkorb@conet.de> | 2015-01-28 09:47:18 +0100 |
| commit | 7214b10f9ca2e5be8f3e479b59d3edf2ddffd7e7 (patch) | |
| tree | 01f3089493ee8c88caa81ea3d24fe014cc898456 /package/base-files | |
| parent | f4d07b4d155c15a640692a9b0d44303e32110ece (diff) | |
| parent | d3edb850913a1c0beafa427661ac996f76a47589 (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 | ||||
| -rw-r--r-- | package/base-files/files/base-files.conffiles | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index b447b643b..0e3c27b3e 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -35,6 +35,15 @@ ifeq (${ADK_TARGET_PACKAGE_IPKG},y) $(SED) 's,@VENDOR@,$(ADK_VENDOR),g' $(IDIR_BASE_FILES)/etc/ipkg.conf mkdir -p $(IDIR_BASE_FILES)/usr/lib/ipkg/lists endif +ifeq (${ADK_TARGET_PACKAGE_OPKG},y) + $(CP) ./files/ipkg.conf $(IDIR_BASE_FILES)/etc/ + $(SED) 's,@ARCH@,$(ADK_TARGET_CPU_ARCH),g' $(IDIR_BASE_FILES)/etc/ipkg.conf + $(SED) 's,@SYSTEM@,$(ADK_TARGET_SYSTEM),g' $(IDIR_BASE_FILES)/etc/ipkg.conf + $(SED) 's,@LIBC@,$(ADK_TARGET_LIBC),g' $(IDIR_BASE_FILES)/etc/ipkg.conf + $(SED) 's,@HOST@,$(ADK_HOST),g' $(IDIR_BASE_FILES)/etc/ipkg.conf + $(SED) 's,@VENDOR@,$(ADK_VENDOR),g' $(IDIR_BASE_FILES)/etc/ipkg.conf + mkdir -p $(IDIR_BASE_FILES)/usr/lib/opkg/lists +endif echo /bin/sh >${IDIR_BASE_FILES}/etc/shells echo /bin/mksh >>${IDIR_BASE_FILES}/etc/shells ifneq (${ADK_PACKAGE_ASH},) diff --git a/package/base-files/files/base-files.conffiles b/package/base-files/files/base-files.conffiles index 59ed2f02b..2ee449379 100644 --- a/package/base-files/files/base-files.conffiles +++ b/package/base-files/files/base-files.conffiles @@ -4,7 +4,6 @@ /etc/group /etc/hosts /etc/hostname -/etc/ipkg.conf /etc/modules /etc/passwd /etc/profile |