[openwrt/openwrt] imagebuilder: fix OPKG package inclusion

[LEDE Commits]

aparcar pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/999ef8270fcce23ff976f3361f562f96ecee7b21

commit 999ef8270fcce23ff976f3361f562f96ecee7b21
Author: Paul Spooren <mail at aparcar.org>
AuthorDate: Sun Nov 10 04:26:43 2024 +0100

    imagebuilder: fix OPKG package inclusion
    
    In 451e2ce006 the code would only move packages separated by dashes,
    however OPKG uses underscores to split between package name and version.
    Result was the lack of such packages in the packed ImageBuilder.
    
    Use dashes or underscores depending on the select package manger.
    
    Fixes: 451e2ce006 "imagebuilder: fix package inclusion and APK index"
    
    Signed-off-by: Paul Spooren <mail at aparcar.org>
---
 target/imagebuilder/Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index 19f21472bd..9181d86a1c 100644
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -23,6 +23,7 @@ BUNDLER_PATH := $(subst $(space),:,$(filter-out $(TOPDIR)/%,$(subst :,$(space),$
 BUNDLER_COMMAND := PATH=$(BUNDLER_PATH) $(XARGS) $(SCRIPT_DIR)/bundle-libraries.sh $(PKG_BUILD_DIR)/staging_dir/host
 
 PACKAGE_SUFFIX:=$(if $(CONFIG_USE_APK),apk,ipk)
+PACKAGE_VERSION_SEPARATOR:=$(if $(CONFIG_USE_APK),-,_)
 
 all: compile
 
@@ -71,9 +72,9 @@ endif
 ifeq ($(CONFIG_IB_STANDALONE),)
 	$(FIND) $(call FeedPackageDir,libc) -type f \
 	  \( \
-		-name 'base-files-*.$(PACKAGE_SUFFIX)' -or \
-		-name 'libc-*.$(PACKAGE_SUFFIX)' -or \
-		-name 'kernel-*.$(PACKAGE_SUFFIX)' \) \
+		-name 'base-files$(PACKAGE_VERSION_SEPARATOR)*.$(PACKAGE_SUFFIX)' -or \
+		-name 'libc$(PACKAGE_VERSION_SEPARATOR)*.$(PACKAGE_SUFFIX)' -or \
+		-name 'kernel$(PACKAGE_VERSION_SEPARATOR)*.$(PACKAGE_SUFFIX)' \) \
 	  -exec $(CP) -t $(PKG_BUILD_DIR)/packages {} +
 else
 	$(FIND) $(wildcard $(PACKAGE_SUBDIRS)) -type f -name '*.$(PACKAGE_SUFFIX)' \