From 9910ddc19e5a04abd3287012587e8cd4bc6f0d83 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 30 May 2014 08:02:12 +0200 Subject: do not install ipkg.conf by default --- package/base-files/Makefile | 8 ++------ package/base-files/files/ipkg.conf | 3 +++ package/base-files/src/etc/ipkg.conf | 3 --- 3 files changed, 5 insertions(+), 9 deletions(-) create mode 100644 package/base-files/files/ipkg.conf delete mode 100644 package/base-files/src/etc/ipkg.conf (limited to 'package') diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 6f09ab0b6..6dea5f4dc 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:= 96 +PKG_RELEASE:= 97 PKG_SECTION:= base/apps PKG_DESCR:= basic files and scripts @@ -27,14 +27,10 @@ ifeq (${ADK_TARGET_ROOTFS_NFSROOT},y) @echo "#" > $(IDIR_BASE_FILES)/etc/network/interfaces endif ifeq (${ADK_TARGET_PACKAGE_IPKG},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 -ifneq ($(ADK_TARGET_ABI),) - $(SED) 's,@ABI@,_$(ADK_TARGET_ABI),g' $(IDIR_BASE_FILES)/etc/ipkg.conf -else - $(SED) 's,@ABI@,,g' $(IDIR_BASE_FILES)/etc/ipkg.conf -endif $(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/ipkg/lists diff --git a/package/base-files/files/ipkg.conf b/package/base-files/files/ipkg.conf new file mode 100644 index 000000000..a31487176 --- /dev/null +++ b/package/base-files/files/ipkg.conf @@ -0,0 +1,3 @@ +src @VENDOR@ http://@HOST@/pkg/@SYSTEM@_@LIBC@/packages +dest root / +dest ram /tmp diff --git a/package/base-files/src/etc/ipkg.conf b/package/base-files/src/etc/ipkg.conf deleted file mode 100644 index 9c5ae17d3..000000000 --- a/package/base-files/src/etc/ipkg.conf +++ /dev/null @@ -1,3 +0,0 @@ -src @VENDOR@ http://@HOST@/pkg/@SYSTEM@_@ARCH@_@LIBC@@ABI@/packages -dest root / -dest ram /tmp -- cgit v1.2.3