X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/d78cca2d997115db3ba82de619bb573e79e2ad98..323d4460bf52d332bffd17595c8e67ca55748aaa:/target/imagebuilder/files/Makefile diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index eae3697e8..2e309ae73 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -20,6 +20,7 @@ ifeq ($(KBUILD_VERBOSE),99) MAKE:=3>/dev/null $(MAKE) endif export IS_TTY=$(shell tty -s && echo 1 || echo 0) +export IMAGEBUILDER=1 # override variables from rules.mk PACKAGE_DIR:=$(TOPDIR)/packages @@ -34,10 +35,11 @@ IPKG:= \ define Profile/Default ID:= NAME:= + KCONFIG:= PACKAGES:= endef -define Profile +define AddProfile $(eval $(call Profile/Default)) $(eval $(call Profile/$(1))) ifneq ($(ID),) @@ -46,8 +48,10 @@ define Profile endif $(ID)_NAME:=$(NAME) $(ID)_PACKAGES:=$(PACKAGES) - PROFILE_LIST += \ + ifeq ($(KCONFIG),) + PROFILE_LIST += \ echo '$(ID):'; [ -z '$(NAME)' ] || echo ' $(NAME)'; echo ' Packages: $(PACKAGES)'; + endif endif endef @@ -133,7 +137,7 @@ package_postinst: FORCE for script in ./etc/init.d/*; do \ grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \ IPKG_INSTROOT=$(BUILD_DIR)/root $(which bash) ./etc/rc.common $$script enable; \ - done; \ + done || true; \ ) build_image: FORCE