From 239cdcd90c3e7ae7640c6478c0b8577bc93360a2 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Tue, 3 Dec 2024 11:30:18 +0100 Subject: [PATCH] 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 --- include/feeds.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/feeds.mk b/include/feeds.mk index 632fecb4a3a..a4997144317 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)), \