From 40be892a020e37869cdc188cd9a09bb7dc0a6872 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petr=20=C5=A0tetiar?= Date: Sun, 17 Nov 2024 05:13:27 +0000 Subject: [PATCH] imagebuilder: move handling of DEFAULT_PACKAGES into shareable place MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Link: https://github.com/openwrt/openwrt/pull/16986 Signed-off-by: Robert Marko --- include/default-packages.mk | 5 +++++ target/imagebuilder/files/Makefile | 1 + 2 files changed, 6 insertions(+) create mode 100644 include/default-packages.mk 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 -- 2.30.2