Changeset 724 for trunk/Makefile


Ignore:
Timestamp:
Feb 28, 2016, 4:51:55 PM (3 years ago)
Author:
amain
Message:

Simplyfy patch / release management. Restructure make menuconfig. Add auto upload for buildbot builds. Latest OpenWrt trunk fixes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile

    r695 r724  
    4848        @echo "DEBWRTVERSION : $$DEBWRTVERSION"
    4949        @echo "TARGET_ARCH   : $$TARGET_ARCH"
    50         @echo "BOARD         : $$BOARD"
    51         @echo "SUB_BOARD     : $$SUB_BOARD"
     50        @echo "TARGET        : $$TARGET"
     51        @echo "SUB_TARGET    : $$SUB_TARGET"
    5252        @echo "LINUX_VERSION : $$OPENWRT_LINUX_VERSION ($$LINUX_VERSION)"
    5353
     
    5959               /select/ {next} \
    6060               // { print $0 }' \
    61         >$(TOPDIR)/config/target.in
    62         cat $(OPENWRT_BUILD_DIR)/target/Config.in | grep -v 'source "tmp/.config-target.in"' >$(TOPDIR)/config/archs.in
     61        >$(TOPDIR)/config/kernel/target/target.in
     62        cat $(OPENWRT_BUILD_DIR)/target/Config.in | grep -v 'source "tmp/.config-target.in"' >$(TOPDIR)/config/kernel/target/archs.in
    6363
    6464board:
    65         @echo "Board    :" $(BOARD)
    66         @echo "Sub-Board:" $(SUB_BOARD)
     65        @echo "Architecture: " $(TARGET_ARCH)
     66        @echo "Target      : " $(TARGET)
     67        @echo "Sub-Target  : " $(SUB_TARGET)
    6768
    6869flash:
     
    7071        @echo "Note: wait a couple of minutes before rebooting your device. It takes time to write the firmware to the flash."
    7172
    72 ifeq ($(CONFIG_DEBWRT_FIRMWARE),n)
     73ifeq ($(CONFIG_DEBWRT_FIRMWARE),y)
    7374clean: openwrt/clean debian/clean config/clean plugins/clean
    74         @rm -f .config .config.old
    7575else
    7676clean: debian/clean config/clean plugins/clean
    77         @rm -f .config .config.old
    7877endif
     78        rm -f .config
    7979
    80 .PHONY: clean
     80.PHONY: clean all world flash board update-targets
    8181
    8282FORCE: ;
    8383.PHONY: FORCE
    8484.NOTPARALLEL:
    85 
    86 
Note: See TracChangeset for help on using the changeset viewer.