fix image installation

SVN-Revision: 8324
This commit is contained in:
Felix Fietkau 2007-08-03 01:21:41 +00:00
parent 0f74fa296c
commit d6666fdd40
2 changed files with 7 additions and 4 deletions

View file

@ -8,6 +8,9 @@
include $(INCLUDE_DIR)/prereq.mk include $(INCLUDE_DIR)/prereq.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/host.mk include $(INCLUDE_DIR)/host.mk
override MAKEFLAGS=
override MAKE:=$(SUBMAKE)
KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
ifneq ($(CONFIG_BIG_ENDIAN),y) ifneq ($(CONFIG_BIG_ENDIAN),y)
@ -94,14 +97,14 @@ define BuildImage
download: download:
prepare: prepare:
ifneq ($(IB),1) ifneq ($(IB),1)
compile: compile-targets compile: compile-targets FORCE
$(call Build/Compile) $(call Build/Compile)
else else
compile: compile:
endif endif
ifneq ($(IB),1) ifneq ($(IB),1)
install: compile install-targets install: compile install-targets FORCE
$(call Image/Prepare) $(call Image/Prepare)
$(call Image/mkfs/prepare) $(call Image/mkfs/prepare)
$(call Image/BuildKernel) $(call Image/BuildKernel)

View file

@ -174,7 +174,7 @@ oldconfig menuconfig: $(STAMP_PREPARED) FORCE
$(SCRIPT_DIR)/config.pl '>' $(GENERIC_LINUX_CONFIG) $(LINUX_DIR)/.config > $(LINUX_CONFIG) $(SCRIPT_DIR)/config.pl '>' $(GENERIC_LINUX_CONFIG) $(LINUX_DIR)/.config > $(LINUX_CONFIG)
install: $(LINUX_DIR)/.image install: $(LINUX_DIR)/.image
$(MAKE) -C image install $(MAKE) -C image compile install
clean: FORCE clean: FORCE
rm -f $(STAMP_DIR)/.linux-compile rm -f $(STAMP_DIR)/.linux-compile
@ -188,6 +188,6 @@ rebuild: FORCE
@$(MAKE) compile @$(MAKE) compile
image-prereq: image-prereq:
$(MAKE) -s -C image prereq $(SUBMAKE) -s -C image prereq
prereq: image-prereq prereq: image-prereq