Changeset 517 for trunk/config/config.mk


Ignore:
Timestamp:
Jun 26, 2013, 11:25:44 PM (6 years ago)
Author:
amain
Message:

Merge contrib branch 340:516. Main features added:

  • updated plugin architecture
  • improved patch system
  • bitten continous integration support
  • sever build fixed over time to remain in sync with OpenWrt
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/config/config.mk

    r287 r517  
    1616# along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717
    18 TOPDIR:=${CURDIR}
     18TOPDIR:=$(CURDIR)
     19MCONF_DIR=$(TOPDIR)/config/mconf
     20CONF:=$(TOPDIR)/config/mconf/conf
     21MCONF:=$(TOPDIR)/config/mconf/mconf
    1922
    2023all: config/mconf/mconf
    2124
    2225config/mconf/mconf:
    23         @$(MAKE) -s -C config/mconf all
     26        @$(MAKE) -s -C $(MCONF_DIR) all
    2427
    2528config/mconf/conf:
    26         @$(MAKE) -s -C config/mconf conf
     29        @$(MAKE) -s -C $(MCONF_DIR) conf
    2730
    2831# Create new config-target.in from OpenWrt's targets config generated file
    2932# note: include the select <target> lines, exlcude all other selects
    30 config/target:
    31         LC_ALL=C cat $(OPENWRT_BUILD_DIR)/tmp/.config-target.in | awk '/select\W+[[:lower:]]/ { print $0 } /select.*HAS_SUBTARGETS/ { print $0 } ! /select/ { print $0 }' >$(TOPDIR)/config/config-target.in
     33config/target: openwrt/menuconfig
     34        LC_ALL=C cat $(OPENWRT_BUILD_DIR)/tmp/.config-target.in \
     35          | awk \
     36            '/select\W+[[:lower:]]/ { \
     37               print $0 \
     38             } \
     39             \
     40             /select.*HAS_SUBTARGETS/ { \
     41               print $0 \
     42             } \
     43             ! /select/ { \
     44               print $0 \
     45             }' \
     46             | sed \
     47                -e 's/prompt "Target System"/prompt "Target System" if DO_CONF_TARGETS/' \
     48                -e 's/prompt "Target Profile"/prompt "Target Profile" if DO_CONF_TARGETS/' \
     49             >$(TOPDIR)/config/target.in
     50        cat $(OPENWRT_BUILD_DIR)/target/Config.in \
     51          | grep -v "source " \
     52          >$(TOPDIR)/config/archs.in
    3253
    33 config-clean: FORCE
    34         $(MAKE) -C config/mconf clean
     54config/clean:
     55        $(MAKE) -C $(MCONF_DIR) clean
    3556
    3657.config:
     
    3859        @exit 1
    3960
    40 config: plugins/apply config/mconf/conf FORCE
    41         config/mconf/conf Config.in
     61# stop our value from leaking into the config tool, which can be problematic
     62config defconfig oldconfig menuconfig: TARGET_ARCH=
     63
     64config: plugins/generate-config config/mconf/conf FORCE
     65        $(CONF) Config.in
    4266        @echo "Type make help to get a list of available DebWrt make commands"
    4367
    44 defconfig: config/mconf/conf FORCE
     68defconfig: plugins/generate-config config/mconf/conf FORCE
    4569        touch .config
    46         config/mconf/conf -D .config Config.in
     70        $(CONF) -D .config Config.in
    4771        @echo "Type make help to get a list of available DebWrt make commands"
    4872
    49 oldconfig: plugins/apply config/mconf/conf FORCE
    50         config/mconf/conf -o Config.in
     73oldconfig: plugins/generate-config config/mconf/conf FORCE
     74        $(CONF) -o Config.in
    5175        @echo "Type make help to get a list of available DebWrt make commands"
    5276
    53 menuconfig: plugins/apply config/mconf/mconf FORCE
    54         config/mconf/mconf Config.in
     77menuconfig: plugins/generate-config config/mconf/mconf FORCE
     78        $(MCONF) Config.in
    5579        @echo "Type make help to get a list of available DebWrt make commands"
    5680
     81.PHONY: config/clean
     82
Note: See TracChangeset for help on using the changeset viewer.