diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2015-05-28 09:47:37 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-05-28 09:47:37 +0000 |
| commit | 3c5357d6efe1a8d603f0071ce64d6807a6ebdfb6 (patch) | |
| tree | 287839d2c13fa7b1309c60e1feffa34adfe85cb4 /target/imagebuilder | |
| parent | 21e16964bf40bb89a759a8e250e29af63d1402cf (diff) | |
| download | master-31e0f0ae-3c5357d6efe1a8d603f0071ce64d6807a6ebdfb6.tar.gz master-31e0f0ae-3c5357d6efe1a8d603f0071ce64d6807a6ebdfb6.tar.bz2 master-31e0f0ae-3c5357d6efe1a8d603f0071ce64d6807a6ebdfb6.zip | |
feeds: use common macro "FeedSourcesAppend" to populate opkg configurations
This introduces a common macro to assemble the correct url templates to
avoid code duplication and have the feed config handling in a central place.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
SVN-Revision: 45799
Diffstat (limited to 'target/imagebuilder')
| -rw-r--r-- | target/imagebuilder/Makefile | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index 218def7e1d..7f48ed885f 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -37,20 +37,10 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean ifeq ($(CONFIG_IB_STANDALONE),) echo '## Remote package repositories' >> $(PKG_BUILD_DIR)/repositories.conf - ifeq ($(CONFIG_PER_FEED_REPO),) - echo "src/gz %n %U" >> $(PKG_BUILD_DIR)/repositories.conf - else - for d in base $(FEEDS_ENABLED); do \ - echo "src/gz %n_$$d %U/$$d" >> $(PKG_BUILD_DIR)/repositories.conf; \ - done - ifneq ($(CONFIG_PER_FEED_REPO_ADD_DISABLED),) - for d in $(FEEDS_DISABLED); do \ - echo "$(if $(CONFIG_PER_FEED_REPO_ADD_COMMENTED),# )src/gz %n_$$d %U/$$d" >> $(PKG_BUILD_DIR)/repositories.conf; \ - done - endif - endif + $(call FeedSourcesAppend,$(PKG_BUILD_DIR)/repositories.conf) endif + echo '' >> $(PKG_BUILD_DIR)/repositories.conf echo '## This is the local package repository, do not remove!' >> $(PKG_BUILD_DIR)/repositories.conf echo 'src imagebuilder file:packages' >> $(PKG_BUILD_DIR)/repositories.conf |