From 19db092082e676e8193a5bbe77f2bb62853fd8f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Sun, 17 Nov 2024 05:15:13 +0000 Subject: [PATCH] linux: fix missing default packages in profiles.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Robert reported, that in firmware images generated by ASU, there is `apk` package manager missing after the commit 44598c233dd9 ("build: remove broken dependency of metadata on toplevel .config variables"). That is happening, because apk got removed from `default_packages` list in `profiles.json`, which is being generated by `json_overview_image_info` Make target, which uses `scripts/json_overview_image_info.py` helper script, which gets the information from `DEFAULT_PACKAGES` Make variable. So lets fix it by providing `DEFAULT_PACKAGES` variable when its needed. The reason why we didn't added those packages as a dependency to base-files like any other packages, was to allow disabling them (in order to save space). Fixes: #16969 Fixes: openwrt/asu/issues/1084 Fixes: 44598c233dd9 ("build: remove broken dependency of metadata on toplevel .config variables") Reported-by: Robert Marko Signed-off-by: Petr Štetiar Link: https://github.com/openwrt/openwrt/pull/16986 Signed-off-by: Robert Marko (cherry picked from commit 90f0be8521a8608b0932c1ccb747c0ef1a085910) --- target/linux/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/Makefile b/target/linux/Makefile index eaf31982229..f1e20abf046 100644 --- a/target/linux/Makefile +++ b/target/linux/Makefile @@ -4,6 +4,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/target.mk +include $(INCLUDE_DIR)/default-packages.mk export TARGET_BUILD=1