Changeset 346

Timestamp:

Sep 28, 2012, 7:05:59 AM (11 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:

• Config.in (modified) (1 diff)
• config/openwrt_version.in (moved) (moved from branches/contrib/config/openwrt_revision.in) (1 diff)
• rules/debwrt.mk (modified) (1 diff)

branches/contrib/Config.in

@@ -88 +88 @@
 source "config/flash_ip.in"
 
-choice
-        prompt "OpenWrt Revision"
-        default OPENWRT_REVISION_TRUNK
-
-config OPENWRT_REVISION_TRUNK
-        bool "trunk"
-
-config OPENWRT_REVISION_BACKFIRE
-        bool "backfire ( not tested recently )"
-
-endchoice
-
-source "config/openwrt_revision.in"
+source "config/openwrt_version.in"
 
 choice

branches/contrib/config/openwrt_version.in

@@ +1 @@
+choice
+        prompt "OpenWrt Revision"
+        default OPENWRT_REVISION_TRUNK
+        help
+                Choose the branch of OpenWRT to build from. Most often this will be
+                OpenWRT's trunk, but there could be reasons to use another branch. If you
+                want to use a branch beside these two, choose OTHER and specify below.
+
+        config OPENWRT_BRANCH_TRUNK
+                bool "trunk"
+
+        config OPENWRT_BRANCH_BACKFIRE
+                bool "backfire ( not tested recently )"
+
+        config OPENWRT_BRANCH_OTHER
+                bool "some other branch of OpenWRT (specify below)"
+endchoice
+
+if OPENWRT_BRANCH_OTHER
+config OPENWRT_BRANCH
+        string "Specify OpenWRT branch to use"
+        help
+                Specify what branch you wish to use. You can even specify "trunk" or
+                "backfire" here, but you generally choose those above.
+
+endif
+# sigh, no else statement in this grammer
+if !OPENWRT_BRANCH_OTHER
+config OPENWRT_BRANCH
+        string
+                default "trunk" if OPENWRT_BRANCH_TRUNK
+                default "backfire" if OPENWRT_BRANCH_BACKFIRE
+                default "unset"
+endif
+
 config OPENWRT_REVISION
-        string
-                default "trunk" if OPENWRT_REVISION_TRUNK
-                default "backfire" if OPENWRT_REVISION_BACKFIRE
-                default "unknown"
+        string "Specify OpenWRT revision to use (`svn co -r XXXXX`)"
+                default "HEAD"
+        help
+                This sets the revision of the OpenWRT branch that should be used.
+                Sometimes changes at the head of a branch may break DebWRT, and this
+                allows you to specify an earlier revision that still works.
 
+                This may also be used by some plugins that target specific revision of
+                OpenWRT.
+

branches/contrib/rules/debwrt.mk

@@ -42 +42 @@
 LINUX_VERSION:=$(call qstrip,$(CONFIG_DEBWRT_KERNEL_VERSION))
 
-# OpenWrt Revision to checkout [rXXXX]
+# OpenWrt Branch to checkout [trunk|<otherbranchname>]
+OPENWRT_BRANCH=$(call qstrip,$(CONFIG_OPENWRT_BRANCH))
+
+# OpenWrt Revision to checkout [suitable for `svn -r XXXXX`]
 OPENWRT_REVISION:=$(call qstrip,$(CONFIG_OPENWRT_REVISION))
 
 # OpenWrt Revision is trunk [y or emtpy]
-IS_OPENWRT_TRUNK:=$(call qstrip,$(CONFIG_OPENWRT_REVISION_TRUNK))
+IS_OPENWRT_TRUNK:=$(call qstrip,$(CONFIG_OPENWRT_BRANCH_TRUNK))
 
 # OpenWrt Revision is branch [y or empty]
-IS_OPENWRT_BACKFIRE:=$(call qstrip,$(CONFIG_OPENWRT_REVISION_BACKFIRE))
+IS_OPENWRT_BACKFIRE:=$(call qstrip,$(CONFIG_OPENWRT_BRANCH_BACKFIRE))
 
 # Base BuildDir