RepoMirrors
/
openwrt
mirror of git://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Paul Spooren 2024-11-06 16:32:03 +01:00
parent ad1c1b7047
commit 451e2ce006
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/Makefile
View File

@ -130,7 +130,7 @@ ifneq ($(CONFIG_USE_APK),)
--keys-dir $(TOPDIR) \ --keys-dir $(TOPDIR) \
--sign $(BUILD_KEY_APK_SEC) \ --sign $(BUILD_KEY_APK_SEC) \
--output packages.adb \ --output packages.adb \
$$(ls *.apk | grep -v 'base-files\|kernel\|libc'); \ $$(ls *.apk | grep -v 'base-files-\|kernel-\|libc-'); \
done done
else else
@for d in $(PACKAGE_SUBDIRS); do ( \ @for d in $(PACKAGE_SUBDIRS); do ( \

12
target/imagebuilder/Makefile
View File

@ -72,9 +72,9 @@ ifeq ($(CONFIG_BUILDBOT),)
ifeq ($(CONFIG_IB_STANDALONE),) ifeq ($(CONFIG_IB_STANDALONE),)
$(FIND) $(call FeedPackageDir,libc) -type f \ $(FIND) $(call FeedPackageDir,libc) -type f \
\( \ \( \
-name 'base-files*.$(PACKAGE_SUFFIX)' -or \ -name 'base-files-*.$(PACKAGE_SUFFIX)' -or \
-name 'libc*.$(PACKAGE_SUFFIX)' -or \ -name 'libc-*.$(PACKAGE_SUFFIX)' -or \
-name 'kernel*.$(PACKAGE_SUFFIX)' \) \ -name 'kernel-*.$(PACKAGE_SUFFIX)' \) \
-exec $(CP) -t $(PKG_BUILD_DIR)/packages {} + -exec $(CP) -t $(PKG_BUILD_DIR)/packages {} +
else else
$(FIND) $(wildcard $(PACKAGE_SUBDIRS)) -type f -name '*.$(PACKAGE_SUFFIX)' \ $(FIND) $(wildcard $(PACKAGE_SUBDIRS)) -type f -name '*.$(PACKAGE_SUFFIX)' \
@ -83,9 +83,9 @@ ifeq ($(CONFIG_BUILDBOT),)
else else
$(FIND) $(call FeedPackageDir,libc) -type f \ $(FIND) $(call FeedPackageDir,libc) -type f \
\( \ \( \
-name 'base-files*.$(PACKAGE_SUFFIX)' -or \ -name 'base-files-*.$(PACKAGE_SUFFIX)' -or \
-name 'libc*.$(PACKAGE_SUFFIX)' -or \ -name 'libc-*.$(PACKAGE_SUFFIX)' -or \
-name 'kernel*.$(PACKAGE_SUFFIX)' \) \ -name 'kernel-*.$(PACKAGE_SUFFIX)' \) \
-exec $(CP) -t $(IB_LDIR)/ {} + -exec $(CP) -t $(IB_LDIR)/ {} +
endif endif