[openwrt/openwrt] linux: fix missing default packages in profiles.json

LEDE Commits lede-commits at lists.infradead.org
Sun Nov 17 10:29:12 PST 2024


robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/90f0be8521a8608b0932c1ccb747c0ef1a085910

commit 90f0be8521a8608b0932c1ccb747c0ef1a085910
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Sun Nov 17 05:15:13 2024 +0000

    linux: fix missing default packages in profiles.json
    
    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 <robimarko at gmail.com>
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
    Link: https://github.com/openwrt/openwrt/pull/16986
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 target/linux/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/linux/Makefile b/target/linux/Makefile
index eaf3198222..f1e20abf04 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
 




More information about the lede-commits mailing list