diff options
| author | Paul Spooren <mail@aparcar.org> | 2024-11-10 04:26:43 +0100 |
|---|---|---|
| committer | Paul Spooren <mail@aparcar.org> | 2024-11-10 04:27:19 +0100 |
| commit | 999ef8270fcce23ff976f3361f562f96ecee7b21 (patch) | |
| tree | b38c44c6821cde544e1b73ba7802613f0d6e9268 | |
| parent | cc98cfafd799d502fbe09ddb62bab68633d570f5 (diff) | |
| download | openwrt-999ef8270fcce23ff976f3361f562f96ecee7b21.tar.gz openwrt-999ef8270fcce23ff976f3361f562f96ecee7b21.tar.bz2 openwrt-999ef8270fcce23ff976f3361f562f96ecee7b21.zip | |
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@aparcar.org>
| -rw-r--r-- | target/imagebuilder/Makefile | 7 |
1 files 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)' \ |