X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Ffeeds.mk;h=f89687a27e61397d8e718b41ea2c84690640f849;hb=423a7a6b752d4780f7f61722443ed5f4f50e3bda;hp=4ca7b3a9bc1d0647d082b28ccdc3894f76b25e56;hpb=e351f7c695760b50ef9ab8a08907d443dc5ea585;p=openwrt%2Fopenwrt.git

diff --git a/include/feeds.mk b/include/feeds.mk
index 4ca7b3a9bc..f89687a27e 100644
--- a/include/feeds.mk
+++ b/include/feeds.mk
@@ -10,7 +10,7 @@
 
 FEEDS_INSTALLED:=$(notdir $(wildcard $(TOPDIR)/package/feeds/*))
 FEEDS_AVAILABLE:=$(sort $(FEEDS_INSTALLED) $(shell $(SCRIPT_DIR)/feeds list -n))
-FEEDS_ENABLED:=$(foreach feed,$(FEEDS_INSTALLED),$(if $(CONFIG_FEED_$(feed)),$(feed)))
+FEEDS_ENABLED:=$(foreach feed,$(FEEDS_AVAILABLE),$(if $(CONFIG_FEED_$(feed)),$(feed)))
 FEEDS_DISABLED:=$(filter-out $(FEEDS_ENABLED),$(FEEDS_AVAILABLE))
 
 PACKAGE_SUBDIRS=$(PACKAGE_DIR)
@@ -23,11 +23,11 @@ ifneq ($(CONFIG_PER_FEED_REPO),)
   endif
 endif
 
-PKG_CONFIG_DEPENDS += \
-	CONFIG_PER_FEED_REPO \
-	CONFIG_PER_FEED_REPO_ADD_DISABLED \
-	CONFIG_PER_FEED_REPO_ADD_COMMENTED \
-	$(foreach feed,$(FEEDS_INSTALLED),CONFIG_FEED_$(feed))
+PACKAGE_DIR_ALL := $(TOPDIR)/staging_dir/packages/$(BOARD)
+
+opkg_package_files = $(wildcard \
+	$(foreach dir,$(PACKAGE_SUBDIRS), \
+	  $(foreach pkg,$(1), $(dir)/$(pkg)_*.ipk)))
 
 # 1: package name
 define FeedPackageDir