From bf887e8d5a79713e772a16a0600a599773c78b09 Mon Sep 17 00:00:00 2001
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Sat, 19 Sep 2020 01:29:12 +0200
Subject: [PATCH] buildscript: reorganize user-defined variables

The only part that is changed regularly inside buildscript are
the OpenWrt and package revisions and the selected packages.

Move them up and put them into dedicated variables so it is more
obvious what to change and easier to do so.

While at it, remove outdated COMPAT_VERSION comment from Gluon
package; we don't pull it from there anyway. Update comment on
feed definition syntax as well.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 buildscript | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/buildscript b/buildscript
index 81ae501e..f9a2c256 100755
--- a/buildscript
+++ b/buildscript
@@ -13,31 +13,36 @@
 
 builddir=./build
 
+# OpenWrt: openwrt-19.07.5
 OPENWRTREV="v19.07.5"
-OPENWRTURL="https://git.openwrt.org/openwrt/openwrt.git"
-PACKAGEREV="2974079d3db786fe5da00c10f1d80e79b0112093" # openwrt-19.07.5
-PACKAGEURL="https://git.openwrt.org/feed/packages.git"
+PACKAGEREV="2974079d3db786fe5da00c10f1d80e79b0112093"
+ROUTINGREV="02b4dbfcb7b8f8b566940847d22d5a6f229d2e66"
 
-## Feed definition [0]: name aka directory, [1]: url, [2]: revision, [3..n]: patches
+# 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"
+
+## Feed definition [0]: name aka directory, [1]: url, [2]: revision
 
 #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
-         02b4dbfcb7b8f8b566940847d22d5a6f229d2e66) # openwrt-19.07.5
-ROUTING_PKGS="kmod-batman-adv batctl alfred babeld"
+         $ROUTINGREV)
 
 FFF=(fff)
 FFF_PKGS="-a"
-- 
2.39.2