Skip to content

Commit 40be892

Browse files
ynezzrobimarko
authored andcommitted
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 <[email protected]> Link: openwrt/openwrt#16986 Signed-off-by: Robert Marko <[email protected]>
1 parent ac64071 commit 40be892

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

include/default-packages.mk

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
ifneq ($(CONFIG_USE_APK),)
2+
DEFAULT_PACKAGES += apk-mbedtls
3+
else
4+
DEFAULT_PACKAGES += opkg
5+
endif

target/imagebuilder/files/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ include $(INCLUDE_DIR)/debug.mk
2626
include $(INCLUDE_DIR)/depends.mk
2727
include $(INCLUDE_DIR)/rootfs.mk
2828

29+
include $(INCLUDE_DIR)/default-packages.mk
2930
include $(INCLUDE_DIR)/version.mk
3031
export REVISION
3132
export SOURCE_DATE_EPOCH

0 commit comments

Comments
 (0)