Start adding uml target

[openwrt.git] / include / kernel-build.mk

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 9fbbe45..942a915 100644 (file)
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -1,4 +1,10 @@
-include $(TOPDIR)/include/modules-$(KERNEL).mk
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+-include $(INCLUDE_DIR)/modules-$(KERNEL).mk

 
 LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2
 LINUX_SITE=http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \
 
 LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2
 LINUX_SITE=http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \


@@ -8,6 +14,7 @@ LINUX_SITE=http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \
 
 KERNEL_IDIR:=$(KERNEL_BUILD_DIR)/kernel-ipkg
 KERNEL_IPKG:=$(KERNEL_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_$(ARCH).ipk
 
 KERNEL_IDIR:=$(KERNEL_BUILD_DIR)/kernel-ipkg
 KERNEL_IPKG:=$(KERNEL_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_$(ARCH).ipk

+TARGETS += $(KERNEL_IPKG)

 INSTALL_TARGETS += $(KERNEL_IPKG)
 
 $(TARGETS): $(PACKAGE_DIR)
 INSTALL_TARGETS += $(KERNEL_IPKG)
 
 $(TARGETS): $(PACKAGE_DIR)


@@ -74,8 +81,12 @@ $(LINUX_DIR)/.modules_done:
        $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
        touch $(LINUX_DIR)/.modules_done
 
        $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
        touch $(LINUX_DIR)/.modules_done
 

+modules: $(LINUX_DIR)/.modules_done
+packages: $(TARGETS)
+

 $(STAMP_DIR)/.linux-compile:
 $(STAMP_DIR)/.linux-compile:

-       @$(MAKE) $(LINUX_DIR)/.modules_done $(TARGETS) $(KERNEL_IPKG)
+       @$(MAKE) modules
+       @$(MAKE) packages

        ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux
        touch $@
 
        ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux
        touch $@
 


@@ -94,12 +105,13 @@ $(TOPDIR)/.kernel.mk:
        echo "LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@
 
 pkg-install: FORCE
        echo "LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@
 
 pkg-install: FORCE

-       @{ [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG) install $(INSTALL_TARGETS) || true; }
+       @for pkg in $(INSTALL_TARGETS); do \
+               $(IPKG) install $$pkg || echo; \
+       done

 
 source: $(DL_DIR)/$(LINUX_SOURCE)
 
 source: $(DL_DIR)/$(LINUX_SOURCE)

-prepare:
+prepare: $(LINUX_DIR)/.configured

        @mkdir -p $(STAMP_DIR) $(PACKAGE_DIR)
        @mkdir -p $(STAMP_DIR) $(PACKAGE_DIR)

-       @$(MAKE) $(LINUX_DIR)/.configured

 
 compile: prepare $(STAMP_DIR)/.linux-compile
 
 
 compile: prepare $(STAMP_DIR)/.linux-compile
 


@@ -123,3 +135,4 @@ clean: FORCE
        rm -f $(STAMP_DIR)/.linux-compile
        rm -rf $(KERNEL_BUILD_DIR)
        rm -f $(TARGETS)
        rm -f $(STAMP_DIR)/.linux-compile
        rm -rf $(KERNEL_BUILD_DIR)
        rm -f $(TARGETS)

+