Changeset 525


Ignore:
Timestamp:
Jun 27, 2013, 10:47:39 PM (6 years ago)
Author:
amain
Message:

debwrt: improve tag support and shorten build path names

Location:
branches/1209
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1209/config/openwrt_version.in

    r519 r525  
    1717
    1818        config OPENWRT_BRANCH_OTHER
    19                 bool "other branch ( specify below )"
     19                bool "other branch (or tag) ( specify below )"
    2020endchoice
    2121
     
    4747if OPENWRT_BRANCH_ATTITUDE_ADJUSTMENT
    4848        config OPENWRT_TAG_ATTITUDE_ADJUSTMENT_12_09
     49                deselect DO_CONF_OPENWRT_REVISON
    4950                bool "attitude_adjustment_12.09"
    5051endif
    5152if OPENWRT_BRANCH_BACKFIRE
    5253        config OPENWRT_TAG_BACKFIRE_10_03_1
     54                deselect DO_CONF_OPENWRT_REVISON
    5355                bool "backfire_10.03.1"
    5456
    5557        config OPENWRT_TAG_BACKFIRE_10_03
     58                deselect DO_CONF_OPENWRT_REVISON
    5659                bool "backfire_10.03"
    5760endif
     
    6669                default "backfire_10.03.1" if OPENWRT_TAG_BACKFIRE_10_03_1
    6770                default ""
     71
     72if !OPENWRT_TAG_NONE
     73config OPENWRT_REVISION
     74        default "HEAD"
     75endif
    6876
    6977endif
  • branches/1209/rules/debwrt.mk

    r524 r525  
    6767
    6868# Install dir
    69 INSTALL_DIR:=$(BIN_DIR)/$(BOARD)-$(DEBWRT_VERSION)-$(LINUX_VERSION)
     69INSTALL_DIR:=$(BIN_DIR)/$(BOARD)-$(SUB_BOARD)-$(DEBWRT_VERSION)
    7070
    7171# Install dir for OpenWrt binaries
     
    102102# OpenWrt Build (checkout) directory
    103103ifeq ($(OPENWRT_TAG),)
    104 OPENWRT_BUILD_DIR:=$(BUILD_DIR_BASE)/openwrt-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_BRANCH)-$(OPENWRT_REVISION)-$(LINUX_VERSION)
     104OPENWRT_BUILD_DIR:=$(BUILD_DIR_BASE)/openwrt-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_BRANCH)-$(OPENWRT_REVISION)
    105105else
    106 OPENWRT_BUILD_DIR:=$(BUILD_DIR_BASE)/openwrt-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_BRANCH)-$(OPENWRT_TAG)-$(LINUX_VERSION)
     106OPENWRT_BUILD_DIR:=$(BUILD_DIR_BASE)/openwrt-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_TAG)
    107107endif
    108108
Note: See TracChangeset for help on using the changeset viewer.