Changeset 510


Ignore:
Timestamp:
May 8, 2013, 6:18:46 AM (7 years ago)
Author:
ehem
Message:

Handle *another* bit of OpenWrt versioning we should handle. They've got
release tags too.

Location:
branches/contrib
Files:
3 edited

Legend:

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

    r483 r510  
    3838endif
    3939
     40if !OPENWRT_BRANCH_TRUNK
     41choice
     42        prompt "OpenWrt Release Tag"
     43        help
     44                Specify an OpenWrt release tag to build. Alternatively you can
     45                specify a Subversion revision below.
     46
     47if OPENWRT_BRANCH_ATTITUDE_ADJUSTMENT
     48        config OPENWRT_TAG_ATTITUDE_ADJUSTMENT_12_09
     49                bool "attitude_adjustment_12.09"
     50endif
     51if OPENWRT_BRANCH_BACKFIRE
     52        config OPENWRT_TAG_BACKFIRE_10_03_1
     53                bool "backfire_10.03.1"
     54
     55        config OPENWRT_TAG_BACKFIRE_10_03
     56                bool "backfire_10.03"
     57endif
     58        config OPENWRT_TAG_NONE
     59                bool "none"
     60endchoice
     61
     62config OPENWRT_TAG
     63        string
     64                default "attitude_adjustment_12.09" if OPENWRT_TAG_ATTITUDE_ADJUSTMENT_12_09
     65                default "backfire_10.03" if OPENWRT_TAG_BACKFIRE_10_03
     66                default "backfire_10.03.1" if OPENWRT_TAG_BACKFIRE_10_03_1
     67                default ""
     68
     69endif
     70
    4071if DO_CONF_OPENWRT_REVISON
    4172config OPENWRT_REVISION
  • branches/contrib/openwrt/openwrt.mk

    r509 r510  
    150150ifeq ($(OPENWRT_BRANCH),trunk)
    151151OPENWRT_SUBVERSION:=$(call qstrip,$(CONFIG_OPENWRT_SVN_REPO_URL))/trunk/
     152else ifeq ($(OPENWRT_TAG),)
     153OPENWRT_SUBVERSION:=$(call qstrip,$(CONFIG_OPENWRT_SVN_REPO_URL))/branches/$(OPENWRT_BRANCH)/
    152154else
    153 OPENWRT_SUBVERSION:=$(call qstrip,$(CONFIG_OPENWRT_SVN_REPO_URL))/branches/$(OPENWRT_BRANCH)/
     155OPENWRT_SUBVERSION:=$(call qstrip,$(CONFIG_OPENWRT_SVN_REPO_URL))/tags/$(OPENWRT_TAG)
    154156endif
    155157
  • branches/contrib/rules/debwrt.mk

    r508 r510  
    4343
    4444# OpenWrt Branch to checkout [trunk|<otherbranchname>]
    45 OPENWRT_BRANCH=$(call qstrip,$(CONFIG_OPENWRT_BRANCH))
     45OPENWRT_BRANCH:=$(call qstrip,$(CONFIG_OPENWRT_BRANCH))
     46
     47# OpenWrt Release Tag to checkout
     48OPENWRT_TAG:=$(call qstrip,$(CONFIG_OPENWRT_TAG))
    4649
    4750# OpenWrt Revision to checkout [suitable for `svn -r XXXXX`]
Note: See TracChangeset for help on using the changeset viewer.