diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2014-10-16 10:30:16 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2014-10-16 10:30:16 +0000 |
| commit | 41f42651018420470e57ee4483db06ccad8ec0c6 (patch) | |
| tree | daefccf3d5b079cdedf80a9a4352349b64115167 /package | |
| parent | b3c29f9f2368461851e80e430143ec48212db97a (diff) | |
| download | upstream-41f42651018420470e57ee4483db06ccad8ec0c6.tar.gz upstream-41f42651018420470e57ee4483db06ccad8ec0c6.tar.bz2 upstream-41f42651018420470e57ee4483db06ccad8ec0c6.zip | |
build: improve feed handling for opkg.conf
- Consider not installed feeds as well
- Add option to decide whether to comment disabled feeds
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42931 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/base-files/image-config.in | 11 | ||||
| -rw-r--r-- | package/system/opkg/Makefile | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in index 67604cdd54..c679a5b33a 100644 --- a/package/base-files/image-config.in +++ b/package/base-files/image-config.in @@ -217,11 +217,18 @@ menuconfig PER_FEED_REPO for the core packages and each enabled feed. config PER_FEED_REPO_ADD_DISABLED - bool "Add installed but disabled feeds to opkg.conf" + bool "Add available but not enabled feeds to opkg.conf" default y depends on PER_FEED_REPO help - Add installed but disabled feeds as commented out source lines to opkg.conf. + Add not installed or disabled feeds from feeds.conf to opkg.conf. + + config PER_FEED_REPO_ADD_COMMENTED + bool "Comment out not enabled feeds" + default y + depends on PER_FEED_REPO && PER_FEED_REPO_ADD_DISABLED + help + Add not enabled feeds as commented out source lines to opkg.conf. source "tmp/.config-feeds.in" diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile index 8a63fb4352..6dd3f31818 100644 --- a/package/system/opkg/Makefile +++ b/package/system/opkg/Makefile @@ -113,7 +113,7 @@ define Package/opkg/Default/install done ifneq ($(CONFIG_PER_FEED_REPO_ADD_DISABLED),) for d in $(FEEDS_DISABLED); do \ - echo "# src/gz %n_$$$$d %U/$$$$d" >> $(1)/etc/opkg.conf; \ + echo "$(if $(CONFIG_PER_FEED_REPO_ADD_COMMENTED),# )src/gz %n_$$$$d %U/$$$$d" >> $(1)/etc/opkg.conf; \ done endif endif |