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

[LEDE Commits]

ansuel pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/239cdcd90c3e7ae7640c6478c0b8577bc93360a2

commit 239cdcd90c3e7ae7640c6478c0b8577bc93360a2
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
    (cherry picked from commit 53ee2e8c0339c1d7ace47b8cf390147b86ea8d1d)
    [ fix conflict error for missing APK support ]
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
 include/feeds.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/feeds.mk b/include/feeds.mk
index 632fecb4a3..a499714431 100644
--- a/include/feeds.mk
+++ b/include/feeds.mk
@@ -33,7 +33,7 @@ define FeedSourcesAppend
   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)), \