From 5d7aad74cf04e8d3a0314c91a4aa246f8a4794a9 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 13 Oct 2023 20:22:27 +0200
Subject: [PATCH] scripts/modules.sh: move site feeds to the front of the
 module list

We don't want OpenWrt packages to replace Gluon packages by accident;
the same logic applies to packages from site feeds.

This gives site feeds a higher precedence than gluon/packages, but that
is unlikely to cause any issues. Gluon base packages still have an even
higher precedence.

(cherry picked from commit a20a25e67dbd2e6df02ae704f4be4fd7ff30a9ef)
---
 scripts/modules.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/modules.sh b/scripts/modules.sh
index 78b819c34..d28d845aa 100644
--- a/scripts/modules.sh
+++ b/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
 
-- 
GitLab