From patchwork Fri Sep 18 23:33:24 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: buildscript: reorganize user-defined variables
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
X-Patchwork-Id: 1432
Message-Id: <20200918233324.28953-1-freifunk@adrianschmutzler.de>
To: franken-dev@freifunk.net
Date: Sat, 19 Sep 2020 01:33:24 +0200

This patch moves the user-defined "variables" in buildscript, i.e.
checked-out revisions and selected packages to the top, so it's
easier to find them and there is more overview in general.

In contrast, the packages repo path is moved down to be consistent
with the other feeds.

While at it, remove the BATMAN version comment from Gluon; we don't
pull it from there anyway.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---

This has to be applied after the 19.07.4 bump.
---
 buildscript | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/buildscript b/buildscript
index 97baab74..b910b3e4 100755
--- a/buildscript
+++ b/buildscript
@@ -13,31 +13,36 @@
 
 builddir=./build
 
+# OpenWrt: openwrt-19.07.4
 OPENWRTREV="v19.07.4"
+PACKAGEREV="eae1bb397f064befe003b01a36ae318321e81d35"
+ROUTINGREV="b77498bd56d5e45ab4577a1f4ad6ffc55b4a86b7"
+
+# Gluon packages: master from 2020-02-04
+GLUONREV="12e41d0ff07ec54bbd67a31ab50d12ca04f2238c"
+
+OPENWRT_PKGS="gpioctl-sysfs libugpio fastd haserl micrond mtr bmon"
+ROUTING_PKGS="kmod-batman-adv batctl alfred babeld"
+GLUON_PKGS="simple-tc uradvd"
+
 OPENWRTURL="https://git.openwrt.org/openwrt/openwrt.git"
-PACKAGEREV="eae1bb397f064befe003b01a36ae318321e81d35" # openwrt-19.07.4
-PACKAGEURL="https://git.openwrt.org/feed/packages.git"
 
 ## Feed definition [0]: name aka directory, [1]: url, [2]: revision, [3..n]: patches
 
 #official openwrt packages
 OPENWRT=(openwrt
-         $PACKAGEURL
+         "https://git.openwrt.org/feed/packages.git"
          $PACKAGEREV)
-OPENWRT_PKGS="gpioctl-sysfs libugpio fastd haserl micrond mtr bmon"
 
-## Be careful: FFF uses COMPAT_VERSION 15 as default at the moment.
-## See http://www.open-mesh.org/projects/batman-adv/wiki/Compatversion
+#gluon packages
 GLUON=(gluon
-            https://github.com/freifunk-gluon/packages.git
-            12e41d0ff07ec54bbd67a31ab50d12ca04f2238c) # 2020-02-04
-GLUON_PKGS="simple-tc uradvd"
+       https://github.com/freifunk-gluon/packages.git
+       $GLUONREV)
 
 #official openwrt routing packages
 ROUTING=(routing
          https://git.openwrt.org/feed/routing.git
-         b77498bd56d5e45ab4577a1f4ad6ffc55b4a86b7) # openwrt-19.07.4
-ROUTING_PKGS="kmod-batman-adv batctl alfred babeld"
+         $ROUTINGREV)
 
 FFF=(fff)
 FFF_PKGS="-a"