X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Ffeeds.mk;h=054b5aa7965f01658f60a707311eb851a3dd0818;hb=237454991618e0e8b7ceb8a8a2a43fca12c1a454;hp=cbb3997a8dca7491ed1dd72ebac8003004433636;hpb=180465c38f1599f7339a00f80b383620c7c3818d;p=openwrt%2Fstaging%2Fyousong.git

diff --git a/include/feeds.mk b/include/feeds.mk
index cbb3997a8d..054b5aa796 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,7 +23,11 @@ ifneq ($(CONFIG_PER_FEED_REPO),)
   endif
 endif
 
-PACKAGE_DIR_ALL := $(PACKAGE_DIR)_all
+PACKAGE_DIR_ALL := $(TOPDIR)/staging_dir/packages/$(BOARD)
+
+opkg_package_files = $(wildcard \
+	$(foreach dir,$(PACKAGE_SUBDIRS), \
+	  $(foreach pkg,$(1), $(dir)/$(pkg)_*.ipk)))
 
 PKG_CONFIG_DEPENDS += \
 	CONFIG_PER_FEED_REPO \