X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/bca7ac77bf1981587e65d397ab25a7a6f3cc35ad..f08f0691af7bd6dc266fff403ca4ac8b48fa62cb:/include/package-ipkg.mk

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 20d132613..cc9a78014 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -60,12 +60,10 @@ 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   | $(XARGS) rm -rf
-	-find $$(IDIR_$(1)) -name .svn  | $(XARGS) rm -rf
-	-find $$(IDIR_$(1)) -name '.#*' | $(XARGS) rm -f
+	-find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' | $(XARGS) rm -rf
 	$(RSTRIP) $$(IDIR_$(1))
 	$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
 	@[ -f $$(IPKG_$(1)) ] || false 
@@ -78,11 +76,17 @@ ifeq ($(DUMP),)
 
     clean: $(1)-clean
 
-    $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH): $(PKG_BUILD_DIR)/.prepared
+    $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH): $(STAMP_PREPARED)
 	-@rm -f $(PKG_BUILD_DIR)/.version-$(1)_* 2>/dev/null
 	@touch $$@
 
     $$(eval $$(call Build/DefaultTargets,$(1)))
 
   endef
+
+  $(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
+
 endif