浏览代码

build: don't include kernel/libc in package index

The same that is done in `ipkg-make-index.sh` should happen with APK.
If the pseudo packages, only added to add dependency constraints, are
added to the index, APK happily "upgrades" them and installs updated
kmods, too. However, the Kernel itself is never installed via a regular
package.

Fixes: https://github.com/openwrt/openwrt/issues/16808

Signed-off-by: Paul Spooren <[email protected]>
Paul Spooren 11 月之前
父节点
当前提交
07b845b1f2
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      package/Makefile

+ 1 - 1
package/Makefile

@@ -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 \
-			*.apk; \
+			$$(ls *.apk | grep -v 'kernel\|libc'); \
 	done
 	done
 else
 else
 	@for d in $(PACKAGE_SUBDIRS); do ( \
 	@for d in $(PACKAGE_SUBDIRS); do ( \