diff mbox series

ib: split out processing user provided packages

Message ID 20230711140927.33375-1-tmn505@terefe.re
State Accepted, archived
Headers show
Series ib: split out processing user provided packages | expand

Commit Message

Tomasz Maciej Nowak July 11, 2023, 2:06 p.m. UTC 
From: Tomasz Maciej Nowak <tmn505@gmail.com>

Some device recipes remove default target packages. If user tries to add
them back they will be ignored, since packages list is processed in one
go. Process the device recipe packages first and do user ones later, so
additions won't get filtered out.

Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>
---

Test case is simple, download ath79 SDK and invoke:
make image PROFILE=ubnt_routerstation PACKAGES=kmod-ath9k
The resulting image won't include kmod-ath9k.

 target/imagebuilder/files/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index 502037379245..78ec7e2e94a9 100644
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -127,9 +127,11 @@  _call_info: FORCE
 	echo 'Available Profiles:'
 	echo; $(PROFILE_LIST)
 
-BUILD_PACKAGES:=$(USER_PACKAGES) $(sort $(DEFAULT_PACKAGES) $($(USER_PROFILE)_PACKAGES) kernel)
+BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $($(USER_PROFILE)_PACKAGES) kernel)
 # "-pkgname" in the package list means remove "pkgname" from the package list
 BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(filter -%,$(BUILD_PACKAGES))),$(BUILD_PACKAGES))
+BUILD_PACKAGES:=$(USER_PACKAGES) $(BUILD_PACKAGES)
+BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(filter -%,$(BUILD_PACKAGES))),$(BUILD_PACKAGES))
 PACKAGES:=
 
 _call_image: staging_dir/host/.prereq-build