Changeset 44441


Ignore:
Timestamp:
2015-02-13T12:59:16+01:00 (3 years ago)
Author:
jow
Message:

BB: 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@…>

Backport of r42931

Location:
branches/barrier_breaker
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/barrier_breaker/include/feeds.mk

    r42017 r44441  
    1111FEEDS_INSTALLED:=$(notdir $(wildcard $(TOPDIR)/package/feeds/*)) 
    1212FEEDS_ENABLED:=$(foreach feed,$(FEEDS_INSTALLED),$(if $(CONFIG_FEED_$(feed)),$(feed))) 
    13 FEEDS_DISABLED:=$(filter-out $(FEEDS_ENABLED),$(FEEDS_INSTALLED)) 
     13FEEDS_DISABLED:=$(filter-out $(FEEDS_ENABLED),$(FEEDS_AVAILABLE)) 
    1414 
    1515PKG_CONFIG_DEPENDS += \ 
    1616        CONFIG_PER_FEED_REPO \ 
     17        CONFIG_PER_FEED_REPO_ADD_DISABLED \ 
     18        CONFIG_PER_FEED_REPO_ADD_COMMENTED \ 
    1719        $(foreach feed,$(FEEDS_INSTALLED),CONFIG_FEED_$(feed)) 
    1820 
  • branches/barrier_breaker/package/base-files/image-config.in

    r42352 r44441  
    218218 
    219219        config PER_FEED_REPO_ADD_DISABLED 
    220                 bool "Add installed but disabled feeds to opkg.conf" 
     220                bool "Add available but not enabled feeds to opkg.conf" 
    221221                default y 
    222222                depends on PER_FEED_REPO 
    223223                help 
    224                   Add installed but disabled feeds as commented out source lines to opkg.conf. 
     224                  Add not installed or disabled feeds from feeds.conf to opkg.conf. 
     225 
     226        config PER_FEED_REPO_ADD_COMMENTED 
     227                bool "Comment out not enabled feeds" 
     228                default y 
     229                depends on PER_FEED_REPO && PER_FEED_REPO_ADD_DISABLED 
     230                help 
     231                  Add not enabled feeds as commented out source lines to opkg.conf. 
    225232 
    226233source "tmp/.config-feeds.in" 
  • branches/barrier_breaker/package/system/opkg/Makefile

    r42018 r44441  
    114114    ifneq ($(CONFIG_PER_FEED_REPO_ADD_DISABLED),) 
    115115        for d in $(FEEDS_DISABLED); do \ 
    116                 echo "# src/gz %n_$$$$d %U/$$$$d" >> $(1)/etc/opkg.conf; \ 
     116                echo "$(if $(CONFIG_PER_FEED_REPO_ADD_COMMENTED),# )src/gz %n_$$$$d %U/$$$$d" >> $(1)/etc/opkg.conf; \ 
    117117        done 
    118118    endif 
Note: See TracChangeset for help on using the changeset viewer.