Merge pull request #3026 from freifunk-gluon/v2023.1.x-module-precedence

[v2023.1.x] Prefer packages from Gluon feeds to upstream feeds

modules

-GLUON_FEEDS='packages routing gluon'
+GLUON_FEEDS='gluon packages routing'
 
 OPENWRT_REPO=https://github.com/openwrt/openwrt.git
 OPENWRT_BRANCH=openwrt-22.03
 OPENWRT_COMMIT=9e8c9592d6832fd2a2d0deca6784d8b686c26dd0
 
+PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
+PACKAGES_GLUON_COMMIT=ce2e6ac1937af9a4c5c54181ab00781a0bf0097c
+
 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
 PACKAGES_PACKAGES_BRANCH=openwrt-22.03
 PACKAGES_PACKAGES_COMMIT=b7fcfa261a809f4d268c1b16c986157983e62ab4
@@ -11,6 +14,3 @@ PACKAGES_PACKAGES_COMMIT=b7fcfa261a809f4d268c1b16c986157983e62ab4
 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
 PACKAGES_ROUTING_BRANCH=openwrt-22.03
 PACKAGES_ROUTING_COMMIT=b312934dabb09a45e8ebdab371bc182230513487
-
-PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
-PACKAGES_GLUON_COMMIT=ce2e6ac1937af9a4c5c54181ab00781a0bf0097c

scripts/modules.sh

@@ -2,7 +2,7 @@
 [ ! -f "$GLUON_SITEDIR"/modules ] || . "$GLUON_SITEDIR"/modules
 
 # shellcheck disable=SC2086
-FEEDS="$(echo $GLUON_FEEDS $GLUON_SITE_FEEDS | tr ' ' '\n')"
+FEEDS="$(echo $GLUON_SITE_FEEDS $GLUON_FEEDS | tr ' ' '\n')"
 
 GLUON_MODULES=openwrt