Changeset 346


Ignore:
Timestamp:
Sep 28, 2012, 7:05:59 AM (8 years ago)
Author:
ehem
Message:

Straighten out $(OPENWRT_REVISION), now $(OPENWRT_REVISION) is *strictly*
the revision (for svn's -r option). Whereas $(OPENWRT_BRANCH) specifies
which branch of OpenWRT's tree to use.

Location:
branches/contrib
Files:
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • branches/contrib/Config.in

    r328 r346  
    8888source "config/flash_ip.in"
    8989
    90 choice
    91         prompt "OpenWrt Revision"
    92         default OPENWRT_REVISION_TRUNK
    93 
    94 config OPENWRT_REVISION_TRUNK
    95         bool "trunk"
    96 
    97 config OPENWRT_REVISION_BACKFIRE
    98         bool "backfire ( not tested recently )"
    99 
    100 endchoice
    101 
    102 source "config/openwrt_revision.in"
     90source "config/openwrt_version.in"
    10391
    10492choice
  • branches/contrib/config/openwrt_version.in

    r342 r346  
     1choice
     2        prompt "OpenWrt Revision"
     3        default OPENWRT_REVISION_TRUNK
     4        help
     5                Choose the branch of OpenWRT to build from. Most often this will be
     6                OpenWRT's trunk, but there could be reasons to use another branch. If you
     7                want to use a branch beside these two, choose OTHER and specify below.
     8
     9        config OPENWRT_BRANCH_TRUNK
     10                bool "trunk"
     11
     12        config OPENWRT_BRANCH_BACKFIRE
     13                bool "backfire ( not tested recently )"
     14
     15        config OPENWRT_BRANCH_OTHER
     16                bool "some other branch of OpenWRT (specify below)"
     17endchoice
     18
     19if OPENWRT_BRANCH_OTHER
     20config OPENWRT_BRANCH
     21        string "Specify OpenWRT branch to use"
     22        help
     23                Specify what branch you wish to use. You can even specify "trunk" or
     24                "backfire" here, but you generally choose those above.
     25
     26endif
     27# sigh, no else statement in this grammer
     28if !OPENWRT_BRANCH_OTHER
     29config OPENWRT_BRANCH
     30        string
     31                default "trunk" if OPENWRT_BRANCH_TRUNK
     32                default "backfire" if OPENWRT_BRANCH_BACKFIRE
     33                default "unset"
     34endif
     35
    136config OPENWRT_REVISION
    2         string
    3                 default "trunk" if OPENWRT_REVISION_TRUNK
    4                 default "backfire" if OPENWRT_REVISION_BACKFIRE
    5                 default "unknown"
     37        string "Specify OpenWRT revision to use (`svn co -r XXXXX`)"
     38                default "HEAD"
     39        help
     40                This sets the revision of the OpenWRT branch that should be used.
     41                Sometimes changes at the head of a branch may break DebWRT, and this
     42                allows you to specify an earlier revision that still works.
    643
     44                This may also be used by some plugins that target specific revision of
     45                OpenWRT.
     46
  • branches/contrib/rules/debwrt.mk

    r344 r346  
    4242LINUX_VERSION:=$(call qstrip,$(CONFIG_DEBWRT_KERNEL_VERSION))
    4343
    44 # OpenWrt Revision to checkout [rXXXX]
     44# OpenWrt Branch to checkout [trunk|<otherbranchname>]
     45OPENWRT_BRANCH=$(call qstrip,$(CONFIG_OPENWRT_BRANCH))
     46
     47# OpenWrt Revision to checkout [suitable for `svn -r XXXXX`]
    4548OPENWRT_REVISION:=$(call qstrip,$(CONFIG_OPENWRT_REVISION))
    4649
    4750# OpenWrt Revision is trunk [y or emtpy]
    48 IS_OPENWRT_TRUNK:=$(call qstrip,$(CONFIG_OPENWRT_REVISION_TRUNK))
     51IS_OPENWRT_TRUNK:=$(call qstrip,$(CONFIG_OPENWRT_BRANCH_TRUNK))
    4952
    5053# OpenWrt Revision is branch [y or empty]
    51 IS_OPENWRT_BACKFIRE:=$(call qstrip,$(CONFIG_OPENWRT_REVISION_BACKFIRE))
     54IS_OPENWRT_BACKFIRE:=$(call qstrip,$(CONFIG_OPENWRT_BRANCH_BACKFIRE))
    5255
    5356# Base BuildDir
Note: See TracChangeset for help on using the changeset viewer.