hopefully the last fix for the aruba image stuff

[openwrt.git] / target / linux / Makefile

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 9f25fd7..af3e3bd 100644 (file)
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -3,88 +3,13 @@ include $(TOPDIR)/rules.mk
 PKG_OS:=$(shell uname -s)
 PKG_CPU:=$(shell uname -m)
 
 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
 define kernel_template

-
-$(1)/$(2)-clean:
-       @$(TRACE) target/linux/$(2)-$(1)-clean
-       $(MAKE) -C $(2)-$(1) BOARD="$(2)" clean
-
-$(1)/$(2)-prepare:
-       @$(TRACE) target/linux/$(2)-$(1)-prepare
-       $(MAKE) -C $(2)-$(1) BOARD="$(2)" prepare
-
-$(1)/$(2)-compile:
-       @$(TRACE) target/linux/$(2)-$(1)-compile
-       $(MAKE) -C $(2)-$(1) BOARD="$(2)" compile
-
-$(1)/$(2)-rebuild:
-       @$(TRACE) target/linux/$(2)-$(1)-rebuild
-       $(MAKE) -C $(2)-$(1) BOARD="$(2)" rebuild
-
-$(1)/$(2)-install:
-       @$(TRACE) target/linux/$(2)-$(1)-install
-       $(MAKE) -C $(2)-$(1) BOARD="$(2)" install
-
-$(1)/$(2)-image: $(1)/$(2)-install
-       @$(TRACE) target/linux/image-install
-       $(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" install
-
-$(1)/$(2)-install-ib:
-       @$(TRACE) target/linux/image-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 ($(BR2_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
-package/%:
-       $(MAKE) -C $(2)-$(1) BOARD="$(2)" $$@
+ifeq ($(CONFIG_LINUX_$(3)),y)
+KERNEL:=$(1)
+BOARD:=$(2)

 endif
 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
 
 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 ($(BR2_PACKAGE_IMAGEBUILDER),y)
-install: $(BIN_DIR)/$(IB_NAME).tar.bz2
-endif
-
-prepare:
-       @$(TRACE) target/linux/image-prepare
-       $(MAKE) -C image prepare
-compile:
-       @$(TRACE) target/linux/image-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))
 $(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))


@@ -93,3 +18,24 @@ $(eval $(call kernel_template,2.6,x86,2_6_X86))
 $(eval $(call kernel_template,2.4,ar531x,2_4_AR531X))
 $(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.4,ar531x,2_4_AR531X))
 $(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/%,%,$@)