projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ar71xx: use Power-LED as Diag-LED on FRITZBox 4020
[openwrt/openwrt.git]
/
include
/
feeds.mk
diff --git
a/include/feeds.mk
b/include/feeds.mk
index 054b5aa7965f01658f60a707311eb851a3dd0818..cecd30424f19525fc7bbb606b45c1e5baf9e8157 100644
(file)
--- a/
include/feeds.mk
+++ b/
include/feeds.mk
@@
-23,18
+23,10
@@
ifneq ($(CONFIG_PER_FEED_REPO),)
endif
endif
endif
endif
-PACKAGE_DIR_ALL := $(TOPDIR)/staging_dir/packages/$(BOARD)
-
opkg_package_files = $(wildcard \
$(foreach dir,$(PACKAGE_SUBDIRS), \
$(foreach pkg,$(1), $(dir)/$(pkg)_*.ipk)))
opkg_package_files = $(wildcard \
$(foreach dir,$(PACKAGE_SUBDIRS), \
$(foreach pkg,$(1), $(dir)/$(pkg)_*.ipk)))
-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))
-
# 1: package name
define FeedPackageDir
$(strip $(if $(CONFIG_PER_FEED_REPO), \
# 1: package name
define FeedPackageDir
$(strip $(if $(CONFIG_PER_FEED_REPO), \
@@
-47,10
+39,10
@@
endef
# 1: destination file
define FeedSourcesAppend
( \
# 1: destination file
define FeedSourcesAppend
( \
- echo "src/gz %
n
_core %U/targets/%S/packages"; \
+ echo "src/gz %
d
_core %U/targets/%S/packages"; \
$(strip $(if $(CONFIG_PER_FEED_REPO), \
$(strip $(if $(CONFIG_PER_FEED_REPO), \
- $(foreach feed,base $(FEEDS_ENABLED),echo "src/gz %
n
_$(feed) %U/packages/%A/$(feed)";) \
+ $(foreach feed,base $(FEEDS_ENABLED),echo "src/gz %
d
_$(feed) %U/packages/%A/$(feed)";) \
$(if $(CONFIG_PER_FEED_REPO_ADD_DISABLED), \
$(if $(CONFIG_PER_FEED_REPO_ADD_DISABLED), \
- $(foreach feed,$(FEEDS_DISABLED),echo "$(if $(CONFIG_PER_FEED_REPO_ADD_COMMENTED),# )src/gz %
n
_$(feed) %U/packages/%A/$(feed)";)))) \
+ $(foreach feed,$(FEEDS_DISABLED),echo "$(if $(CONFIG_PER_FEED_REPO_ADD_COMMENTED),# )src/gz %
d
_$(feed) %U/packages/%A/$(feed)";)))) \
) >> $(1)
endef
) >> $(1)
endef