[openwrt/openwrt] ib: split out processing user provided packages

[LEDE Commits]

chunkeey pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/04ee513ededec3c396af2787ad9deb93447e25aa

commit 04ee513ededec3c396af2787ad9deb93447e25aa
Author: Tomasz Maciej Nowak <tmn505 at gmail.com>
AuthorDate: Tue Jul 11 16:06:21 2023 +0200

    ib: split out processing user provided packages
    
    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 at gmail.com>
    (cherry picked from commit e40b9a7fa002154e85459791101a0444d99dfb86)
---
 target/imagebuilder/files/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index eadb0ebe85..a8708bc882 100644
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -108,9 +108,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