From eddc00368ab31c2f0f195030b5df47480ebe826a Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 13 Oct 2023 20:17:22 +0200
Subject: [PATCH] modules: move Gluon packages to front of module list
To avoid getting surprised again by a (possibly incompatible) OpenWrt
package replacing one of ours, move our own feed to the front, so it has
higher precedence than openwrt/{packages,routing}.
(cherry picked from commit 9e8f58153f664f3d949719b3a5e100cda02000e7)
---
modules | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules b/modules
index f9e6e8f7..42e86efc 100644
--- a/modules
+++ b/modules
@@ -1,9 +1,12 @@
-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
--
GitLab