diff options
| author | Petr Štetiar | 2024-11-17 05:13:27 +0000 |
|---|---|---|
| committer | Felix Fietkau | 2025-01-03 10:14:12 +0000 |
| commit | c22410e7a9cdd409f7515416a1e4a3e094822b8c (patch) | |
| tree | 6536430c45f820c9856e657998e43611d4a5ae7b | |
| parent | f97e729f8c7b978f0b18986bcaa496e1be336778 (diff) | |
| download | openwrt-c22410e7a9cdd409f7515416a1e4a3e094822b8c.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>
(cherry picked from commit 40be892a020e37869cdc188cd9a09bb7dc0a6872)
| -rw-r--r-- | include/default-packages.mk | 5 | ||||
| -rw-r--r-- | target/imagebuilder/files/Makefile | 1 |
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 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 |