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@true.cz>
Link: https://github.com/openwrt/openwrt/pull/16986
Signed-off-by: Robert Marko <robimarko@gmail.com>
(cherry picked from commit 40be892a020e37869cdc188cd9a09bb7dc0a6872)

diff --git a/include/default-packages.mk b/include/default-packages.mk
new file mode 100644 (file)
index 0000000..c964e92
--- /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 811e8f14e5fbf4d2418a248aa8888758b461f921..e9e08fb2765b0ee88de963945a7ccd5b9294dc61 100644 (file)
--- 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