diff options
| author | Nicolas Thill <nico@openwrt.org> | 2007-08-25 11:55:01 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2007-08-25 11:55:01 +0000 |
| commit | 134d9f15d78db12ea19ca331fef4d0b5b599b7a4 (patch) | |
| tree | feb2ea8f36f6f88a46b4e544a84400278011246b | |
| parent | 300c4f54d127009e56c68b5853460d1e37ad7389 (diff) | |
| download | master-187ad058-134d9f15d78db12ea19ca331fef4d0b5b599b7a4.tar.gz master-187ad058-134d9f15d78db12ea19ca331fef4d0b5b599b7a4.tar.bz2 master-187ad058-134d9f15d78db12ea19ca331fef4d0b5b599b7a4.zip | |
move ipkg.conf creation from tools/ipkg-utils to include/package-ipkg.mk
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8481 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/package-ipkg.mk | 7 | ||||
| -rw-r--r-- | tools/ipkg-utils/Makefile | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 36f030375d..c67ee4b8ae 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -60,7 +60,7 @@ ifeq ($(DUMP),) $($(1)_COMMANDS) \ ) - $$(IPKG_$(1)): $(PKG_BUILD_DIR)/.built $$(IDIR_$(1))/CONTROL/control + $$(IPKG_$(1)): $(STAGING_DIR)/etc/ipkg.conf $(PKG_BUILD_DIR)/.built $$(IDIR_$(1))/CONTROL/control $(call Package/$(1)/install,$$(IDIR_$(1))) mkdir -p $(PACKAGE_DIR) -find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' | $(XARGS) rm -rf @@ -71,6 +71,11 @@ ifeq ($(DUMP),) $$(INFO_$(1)): $$(IPKG_$(1)) $(IPKG) install $$(IPKG_$(1)) + $(STAGING_DIR)/etc/ipkg.conf: + mkdir -p $(STAGING_DIR)/etc + echo "dest root /" > $(STAGING_DIR)/etc/ipkg.conf + echo "option offline_root $(TARGET_DIR)" >> $(STAGING_DIR)/etc/ipkg.conf + $(1)-clean: rm -f $(PACKAGE_DIR)/$(1)_* diff --git a/tools/ipkg-utils/Makefile b/tools/ipkg-utils/Makefile index 9c0330859b..830d38a7c4 100644 --- a/tools/ipkg-utils/Makefile +++ b/tools/ipkg-utils/Makefile @@ -17,9 +17,6 @@ PKG_CAT:=zcat include $(INCLUDE_DIR)/host-build.mk define Build/Install - mkdir -p $(STAGING_DIR)/etc - echo "dest root /" > $(STAGING_DIR)/etc/ipkg.conf - echo "option offline_root $(TARGET_DIR)" >> $(STAGING_DIR)/etc/ipkg.conf $(INSTALL_BIN) \ $(PKG_BUILD_DIR)/ipkg-build \ $(PKG_BUILD_DIR)/ipkg-buildpackage \ |