From 451e2ce006eaba5341d7e33ac587719c3bf18701 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Wed, 6 Nov 2024 16:32:03 +0100 Subject: [PATCH] imagebuilder: fix package inclusion and APK index We need to exclude packages from the APK index which must not be upgraded. To do so, the packages `libc`, `kernel` and `base-files` are excluded to APK never suggestes them as upgradable. The previous logic would however match packages like `libcomerr0`, causing build failures. Make the copying and excluding logic more precise by adding a single dash. Signed-off-by: Paul Spooren --- package/Makefile | 2 +- target/imagebuilder/Makefile | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/Makefile b/package/Makefile index d78200fd809..b60ed10fb6d 100644 --- a/package/Makefile +++ b/package/Makefile @@ -130,7 +130,7 @@ ifneq ($(CONFIG_USE_APK),) --keys-dir $(TOPDIR) \ --sign $(BUILD_KEY_APK_SEC) \ --output packages.adb \ - $$(ls *.apk | grep -v 'base-files\|kernel\|libc'); \ + $$(ls *.apk | grep -v 'base-files-\|kernel-\|libc-'); \ done else @for d in $(PACKAGE_SUBDIRS); do ( \ diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index ff14a43bed3..d455cbcd7aa 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -72,9 +72,9 @@ ifeq ($(CONFIG_BUILDBOT),) 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_SUFFIX)' -or \ + -name 'libc-*.$(PACKAGE_SUFFIX)' -or \ + -name 'kernel-*.$(PACKAGE_SUFFIX)' \) \ -exec $(CP) -t $(PKG_BUILD_DIR)/packages {} + else $(FIND) $(wildcard $(PACKAGE_SUBDIRS)) -type f -name '*.$(PACKAGE_SUFFIX)' \ @@ -83,9 +83,9 @@ ifeq ($(CONFIG_BUILDBOT),) else $(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_SUFFIX)' -or \ + -name 'libc-*.$(PACKAGE_SUFFIX)' -or \ + -name 'kernel-*.$(PACKAGE_SUFFIX)' \) \ -exec $(CP) -t $(IB_LDIR)/ {} + endif