summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Štetiar2024-11-17 05:13:27 +0000
committerRobert Marko2024-11-17 18:29:06 +0000
commit40be892a020e37869cdc188cd9a09bb7dc0a6872 (patch)
tree748565f573bbd893995960dbb4eaaf4af889888b
parentac640718aa0ceae55969bb9e7e45d00bb7bc228a (diff)
downloadopenwrt-40be892a020e37869cdc188cd9a09bb7dc0a6872.tar.gz
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>
-rw-r--r--include/default-packages.mk5
-rw-r--r--target/imagebuilder/files/Makefile1
2 files changed, 6 insertions, 0 deletions
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 56f761e966..c4e2c390fe 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