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 <mail@aparcar.org>

diff --git a/package/Makefile b/package/Makefile
index d78200fd809de24c3fda802d2d7d243b7577c445..b60ed10fb6d87d21611c79ec4e1da996ef407c8d 100644 (file)
--- 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 ff14a43bed3b3244d5b30dca21014c85304936e6..d455cbcd7aa303fda62d64d2ef32485499381d63 100644 (file)
--- 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