update to linux 2.6.15.3 (security fixes)

[openwrt.git] / target / linux / Makefile

diff --git a/target/linux/Makefile b/target/linux/Makefile
index 3bbe3cd..4ef6c45 100644 (file)
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -1,39 +1,85 @@
 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 linux-$(1) BOARD="$(2)" clean
+       @$(TRACE) target/linux/$(2)-$(1)-clean
+       $(MAKE) -C $(2)-$(1) BOARD="$(2)" clean
 
 $(1)/$(2)-prepare:
-       $(MAKE) -C linux-$(1) BOARD="$(2)" prepare
+       @$(TRACE) target/linux/$(2)-$(1)-prepare
+       $(MAKE) -C $(2)-$(1) BOARD="$(2)" prepare
 
 $(1)/$(2)-compile:
-       $(MAKE) -C linux-$(1) BOARD="$(2)" compile
+       @$(TRACE) target/linux/$(2)-$(1)-compile
+       $(MAKE) -C $(2)-$(1) BOARD="$(2)" compile
 
 $(1)/$(2)-rebuild:
-       $(MAKE) -C linux-$(1) BOARD="$(2)" rebuild
+       @$(TRACE) target/linux/$(2)-$(1)-rebuild
+       $(MAKE) -C $(2)-$(1) BOARD="$(2)" rebuild
 
 $(1)/$(2)-install:
-       $(MAKE) -C linux-$(1) BOARD="$(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
-install: $(1)/$(2)-image
+$(BIN_DIR)/$(IB_NAME).tar.bz2 install: $(1)/$(2)-image
+install-ib: $(1)/$(2)-install-ib
+package/%:
+       $(MAKE) -C $(2)-$(1) BOARD="$(2)" $$@
 endif
 
-.PHONY: $(1)/$(2)-clean $(1)/$(2)-prepare $(1)/$(2)-compile $(1)/$(2)-rebuild $(1)/$(2)-install
+.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 ($(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:
@@ -41,4 +87,8 @@ 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,soekris,2_4_SOEKRIS))
+$(eval $(call kernel_template,2.4,x86,2_4_X86))
+$(eval $(call kernel_template,2.6,brcm,2_6_BRCM))
+$(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))