add fixes for the pptp network scripts

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

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 706764d..c5b3668 100644 (file)
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -1,3 +1,9 @@
+# 
+# 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
 -include $(INCLUDE_DIR)/modules-$(KERNEL).mk
 
 LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2


@@ -13,9 +19,6 @@ INSTALL_TARGETS += $(KERNEL_IPKG)
 
 $(TARGETS): $(PACKAGE_DIR)
 
 
 $(TARGETS): $(PACKAGE_DIR)
 

-$(LINUX_DIR):
-       mkdir -p $@
-

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


@@ -30,11 +33,8 @@ $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
 
 ifeq ($(KERNEL),2.4)
 $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
 
 ifeq ($(KERNEL),2.4)
 $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched

-       $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" \
-         $(LINUX_DIR)/Makefile  \
-         $(LINUX_DIR)/arch/*/Makefile

        $(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile
        $(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile

-       $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h
+       $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h

        touch $@
 
 $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured
        touch $@
 
 $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured


@@ -44,7 +44,7 @@ $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured
 $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.depend_done
 else
 $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
 $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.depend_done
 else
 $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched

-       $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts
+       $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts

        touch $@
 endif
 
        touch $@
 endif
 


@@ -62,26 +62,26 @@ else
        echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config
 endif
 
        echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config
 endif
 

-$(LINUX_DIR)/vmlinux: $(STAMP_DIR)/.linux-compile pkg-install ramdisk-config
-       $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH)
+$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config
+       $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) $(KERNELNAME)

 
 $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
 
 $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux

-       $(TARGET_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@
+       $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@

        touch -c $(LINUX_KERNEL)
 
 $(LINUX_DIR)/.modules_done:
        rm -rf $(KERNEL_BUILD_DIR)/modules
        touch -c $(LINUX_KERNEL)
 
 $(LINUX_DIR)/.modules_done:
        rm -rf $(KERNEL_BUILD_DIR)/modules

-       $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" modules
-       $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
+       $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) modules
+       $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install

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

-$(STAMP_DIR)/.linux-compile:
-       @$(MAKE) modules
-       @$(MAKE) packages
+$(LINUX_DIR)/.linux-compile:
+       @rm -f $(BUILD_DIR)/linux

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

+       @$(MAKE) modules

        touch $@
 
 $(KERNEL_IPKG):
        touch $@
 
 $(KERNEL_IPKG):


@@ -93,24 +93,28 @@ $(KERNEL_IPKG):
        fi
        $(IPKG_BUILD) $(KERNEL_IDIR) $(KERNEL_BUILD_DIR)
 
        fi
        $(IPKG_BUILD) $(KERNEL_IDIR) $(KERNEL_BUILD_DIR)
 

-$(TOPDIR)/.kernel.mk:
-       echo "BOARD:=$(BOARD)" > $@
-       echo "LINUX_VERSION:=$(LINUX_VERSION)" >> $@
-       echo "LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@
+$(TOPDIR)/.kernel.mk: $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/Makefile
+       echo "CONFIG_BOARD:=$(BOARD)" > $@
+       echo "CONFIG_KERNEL:=$(KERNEL)" >> $@
+       echo "CONFIG_LINUX_VERSION:=$(LINUX_VERSION)" >> $@
+       echo "CONFIG_LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@

 
 pkg-install: FORCE
 
 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)
+download: $(DL_DIR)/$(LINUX_SOURCE)

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

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

 
 

-compile: prepare $(STAMP_DIR)/.linux-compile
+compile: prepare $(LINUX_DIR)/.linux-compile
+       @$(MAKE) packages

 
 install: compile $(LINUX_KERNEL)
 
 mostlyclean: FORCE
 
 install: compile $(LINUX_KERNEL)
 
 mostlyclean: FORCE

-       rm -f $(STAMP_DIR)/.linux-compile
+       rm -f $(LINUX_DIR)/.linux-compile

        rm -f $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/.modules_done
        rm -f $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/.drivers-unpacked
        $(MAKE) -C $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) clean
        rm -f $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/.modules_done
        rm -f $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/.drivers-unpacked
        $(MAKE) -C $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) clean


@@ -127,3 +131,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)

+