target/linux/image rewrite

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3905 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 21 insertions, 66 deletions

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 46b162c7e6..af3e3bd26f 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -3,77 +3,13 @@ include $(TOPDIR)/rules.mk
 PKG_OS:=$(shell uname -s)
 PKG_CPU:=$(shell uname -m)
 
-IB_NAME:=OpenWrt-ImageBuilder-$(PKG_OS)-$(PKG_CPU)
-IB_DIR:=$(BUILD_DIR)/$(IB_NAME)
-
 define kernel_template
-
-$(1)/$(2)-clean:
-	$(MAKE) -C $(2)-$(1) BOARD="$(2)" clean
-
-$(1)/$(2)-prepare:
-	$(MAKE) -C $(2)-$(1) BOARD="$(2)" prepare
-
-$(1)/$(2)-compile:
-	$(MAKE) -C $(2)-$(1) BOARD="$(2)" compile
-
-$(1)/$(2)-rebuild:
-	$(MAKE) -C $(2)-$(1) BOARD="$(2)" rebuild
-
-$(1)/$(2)-install:
-	$(MAKE) -C $(2)-$(1) BOARD="$(2)" install
-
-$(1)/$(2)-image: $(1)/$(2)-install
-	$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" install
-
-$(1)/$(2)-install-ib:
-	$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" IB_DIR="$(IB_DIR)" install-ib
-	echo '$$$$(eval $$$$(call image_template,$(2),$(1)))' >> $(IB_DIR)/kernel.mk
-
-
 ifeq ($(CONFIG_LINUX_$(3)),y)
-clean: $(1)/$(2)-clean
-prepare: $(1)/$(2)-prepare
-compile: $(1)/$(2)-compile
-rebuild: $(1)/$(2)-rebuild
-$(BIN_DIR)/$(IB_NAME).tar.bz2 install: $(1)/$(2)-image
-install-ib: $(1)/$(2)-install-ib
+KERNEL:=$(1)
+BOARD:=$(2)
 endif
-
-.PHONY: $(1)/$(2)-clean $(1)/$(2)-prepare $(1)/$(2)-compile $(1)/$(2)-rebuild $(1)/$(2)-install $(1)/$(2)-image $(1)/$(2)-install-ib
 endef
 
-.PHONY: clean prepare compile rebuild install imagebuilder install-ib
-
-install-ib:
-
-$(BIN_DIR)/$(IB_NAME).tar.bz2:	
-	rm -rf $(IB_DIR)
-	mkdir -p $(IB_DIR)/packages
-	mkdir -p $(IB_DIR)/scripts
-	$(CP) ./imagebuilder/* $(IB_DIR)/
-	$(CP) $(TOPDIR)/bin/packages/*.ipk $(IB_DIR)/packages/
-	$(CP) $(TOPDIR)/scripts/ipkg $(IB_DIR)/scripts/
-	$(MAKE) install-ib
-	$(CP) $(TOPDIR)/rules.mk $(IB_DIR)
-	$(CP) ./image $(IB_DIR)/
-	$(CP) $(TOPDIR)/.config $(IB_DIR)/
-	find $(IB_DIR) -name .svn | xargs rm -rf
-	find $(IB_DIR) -name CVS | xargs rm -rf
-	(cd $(BUILD_DIR); tar c $(IB_NAME) | bzip2 -c > $(BIN_DIR)/$(IB_NAME).tar.bz2)
-
-ifeq ($(CONFIG_PACKAGE_IMAGEBUILDER),y)
-install: $(BIN_DIR)/$(IB_NAME).tar.bz2
-endif
-
-prepare:
-	$(MAKE) -C image prepare
-compile:
-	$(MAKE) -C image compile
-install:
-rebuild:
-clean:
-
 $(eval $(call kernel_template,2.4,brcm,2_4_BRCM))
 $(eval $(call kernel_template,2.4,ar7,2_4_AR7))
 $(eval $(call kernel_template,2.4,x86,2_4_X86))
@@ -84,3 +20,22 @@ $(eval $(call kernel_template,2.6,aruba,2_6_ARUBA))
 $(eval $(call kernel_template,2.6,au1000,2_6_AU1000))
 $(eval $(call kernel_template,2.6,xscale,2_6_XSCALE))
 $(eval $(call kernel_template,2.6,sibyte,2_6_SIBYTE))
+
+export BOARD
+export KERNEL
+
+prepare:
+	$(MAKE) -C $(BOARD)-$(KERNEL) prepare
+
+compile:
+	$(MAKE) -C $(BOARD)-$(KERNEL) compile
+
+install:
+	$(MAKE) -C $(BOARD)-$(KERNEL) install
+	$(MAKE) -C image/$(BOARD) install
+	
+clean:
+	$(MAKE) -C $(BOARD)-$(KERNEL) clean
+
+image/%:
+	$(MAKE) -C image $(patsubst image/%,%,$@)