[openwrt/openwrt] build: Unconditionally append kmod feed for BuildBot

[LEDE Commits]

ansuel pushed a commit to openwrt/openwrt.git, branch openwrt-24.10:
https://git.openwrt.org/ea17e958b9933aaf3e4a390073025aa226fe91b7

commit ea17e958b9933aaf3e4a390073025aa226fe91b7
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Tue Dec 3 11:30:18 2024 +0100

    build: Unconditionally append kmod feed for BuildBot
    
    Recent changes to BuildBot config moved the kmods to a dedicated
    directory and dropped them from the packages dir. This was needed as
    both OPKG and APK gets confused if both entry are present.
    
    To fix this, unconditionally append the kmod feed line if
    CONFIG_BUILDBOT is enabled.
    
    Fixes: #17146
    Link: https://github.com/openwrt/openwrt/pull/17151
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
    (cherry picked from commit 53ee2e8c0339c1d7ace47b8cf390147b86ea8d1d)
---
 include/feeds.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/feeds.mk b/include/feeds.mk
index 87b1562c3e..c3a47cf5f9 100644
--- a/include/feeds.mk
+++ b/include/feeds.mk
@@ -37,7 +37,7 @@ define FeedSourcesAppendOPKG
   echo 'src/gz %d_core %U/targets/%S/packages'; \
   $(strip $(if $(CONFIG_PER_FEED_REPO), \
 	echo 'src/gz %d_base %U/packages/%A/base'; \
-	$(if $(filter %SNAPSHOT-y,$(VERSION_NUMBER)-$(CONFIG_BUILDBOT)), \
+	$(if $(CONFIG_BUILDBOT), \
 		echo 'src/gz %d_kmods %U/targets/%S/kmods/$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC)';) \
 	$(foreach feed,$(FEEDS_AVAILABLE), \
 		$(if $(CONFIG_FEED_$(feed)), \
@@ -51,7 +51,7 @@ define FeedSourcesAppendAPK
   echo '%U/targets/%S/packages/packages.adb'; \
   $(strip $(if $(CONFIG_PER_FEED_REPO), \
 	echo '%U/packages/%A/base/packages.adb'; \
-	$(if $(filter %SNAPSHOT-y,$(VERSION_NUMBER)-$(CONFIG_BUILDBOT)), \
+	$(if $(CONFIG_BUILDBOT), \
 		echo '%U/targets/%S/kmods/$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC)/packages.adb';) \
 	$(foreach feed,$(FEEDS_AVAILABLE), \
 		$(if $(CONFIG_FEED_$(feed)), \