KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

move ipkg.conf creation from tools/ipkg-utils to include/package-ipkg.mk

Browse source 
SVN-Revision: 8481
This commit is contained in:
Nicolas Thill 2007-08-25 11:55:01 +00:00
parent 34c758830a
commit d21941ca4d
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/package-ipkg.mk
View file

@ -60,7 +60,7 @@ ifeq ($(DUMP),)
$($(1)_COMMANDS) \ $($(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))) $(call Package/$(1)/install,$$(IDIR_$(1)))
mkdir -p $(PACKAGE_DIR) mkdir -p $(PACKAGE_DIR)
-find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' | $(XARGS) rm -rf -find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' | $(XARGS) rm -rf
@ -71,6 +71,11 @@ ifeq ($(DUMP),)
$$(INFO_$(1)): $$(IPKG_$(1)) $$(INFO_$(1)): $$(IPKG_$(1))
$(IPKG) install $$(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: $(1)-clean:
rm -f $(PACKAGE_DIR)/$(1)_* rm -f $(PACKAGE_DIR)/$(1)_*

3
tools/ipkg-utils/Makefile
View file

@ -17,9 +17,6 @@ PKG_CAT:=zcat
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
define Build/Install 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) \ $(INSTALL_BIN) \
$(PKG_BUILD_DIR)/ipkg-build \ $(PKG_BUILD_DIR)/ipkg-build \
$(PKG_BUILD_DIR)/ipkg-buildpackage \ $(PKG_BUILD_DIR)/ipkg-buildpackage \