[openwrt/openwrt] imagebuilder: move handling of DEFAULT_PACKAGES into shareable place

[LEDE Commits]

nbd pushed a commit to openwrt/openwrt.git, branch openwrt-24.10:
https://git.openwrt.org/c22410e7a9cdd409f7515416a1e4a3e094822b8c

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

    imagebuilder: move handling of DEFAULT_PACKAGES into shareable place
    
    It seems, that handling of DEFAULT_PACKAGES is needed in more places, so
    lets move it into dedicated include file so it can be easily shared.
    
    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>
    (cherry picked from commit 40be892a020e37869cdc188cd9a09bb7dc0a6872)
---
 include/default-packages.mk        | 5 +++++
 target/imagebuilder/files/Makefile | 1 +
 2 files changed, 6 insertions(+)

diff --git a/include/default-packages.mk b/include/default-packages.mk
new file mode 100644
index 0000000000..c964e92a03
--- /dev/null
+++ b/include/default-packages.mk
@@ -0,0 +1,5 @@
+ifneq ($(CONFIG_USE_APK),)
+  DEFAULT_PACKAGES += apk-mbedtls
+else
+  DEFAULT_PACKAGES += opkg
+endif
diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index 811e8f14e5..e9e08fb276 100644
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -26,6 +26,7 @@ include $(INCLUDE_DIR)/debug.mk
 include $(INCLUDE_DIR)/depends.mk
 include $(INCLUDE_DIR)/rootfs.mk
 
+include $(INCLUDE_DIR)/default-packages.mk
 include $(INCLUDE_DIR)/version.mk
 export REVISION
 export SOURCE_DATE_EPOCH