[kernel] netfilter: fix compiler warnings in xt_layer7

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

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 9fbbe45..678cf18 100644 (file)
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -1,125 +1,107 @@
-include $(TOPDIR)/include/modules-$(KERNEL).mk
-
-LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2
-LINUX_SITE=http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \
-           http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \
-           http://www.kernel.org/pub/linux/kernel/v$(KERNEL) \
-           http://www.de.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
-INSTALL_TARGETS += $(KERNEL_IPKG)
-
-$(TARGETS): $(PACKAGE_DIR)
-
-$(LINUX_DIR):
-       mkdir -p $@
-
-$(PACKAGE_DIR):
-       mkdir -p $@
-
-$(DL_DIR)/$(LINUX_SOURCE):
-       -mkdir -p $(DL_DIR)
-       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_SOURCE) $(LINUX_KERNEL_MD5SUM) $(LINUX_SITE)
-
-$(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
-       -mkdir -p $(KERNEL_BUILD_DIR)
-       bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS) -
-       touch $@
-
-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
-       $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h
-       touch $@
-
-$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured
-       $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) dep
-       touch $@
-
-$(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
-       touch $@
+#
+# Copyright (C) 2006-2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(INCLUDE_DIR)/host.mk
+include $(INCLUDE_DIR)/prereq.mk
+
+ifneq ($(DUMP),1)
+  override MAKEFLAGS=

 endif
 
 endif
 

-ramdisk-config: $(LINUX_DIR)/.configured FORCE
-       mv $(LINUX_DIR)/.config $(LINUX_DIR)/.config.old
-       grep -v INITRAMFS $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config
-ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
-       echo 'CONFIG_INITRAMFS_SOURCE="../../root"' >> $(LINUX_DIR)/.config
-       echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config
-       echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config
-       mkdir -p $(BUILD_DIR)/root/etc/init.d
-       $(CP) ../generic-2.6/files/init $(BUILD_DIR)/root/
-else
-       rm -f $(BUILD_DIR)/root/init $(BUILD_DIR)/root/etc/init.d/S00initramfs
-       echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config
+ifneq ($(DUMP),1)
+  all: compile

 endif
 
 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_KERNEL): $(LINUX_DIR)/vmlinux
-       $(TARGET_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
-       $(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
-       touch $(LINUX_DIR)/.modules_done
-
-$(STAMP_DIR)/.linux-compile:
-       @$(MAKE) $(LINUX_DIR)/.modules_done $(TARGETS) $(KERNEL_IPKG)
-       ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux
-       touch $@
-
-$(KERNEL_IPKG):
-       rm -rf $(KERNEL_IDIR)
-       mkdir -p $(KERNEL_IDIR)/etc
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(KERNEL_IDIR) ../control/kernel.control $(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE) $(ARCH)
-       if [ -f ./config/$(BOARD).modules ]; then \
-               cp ./config/$(BOARD).modules $(KERNEL_IDIR)/etc/modules; \
-       fi
-       $(IPKG_BUILD) $(KERNEL_IDIR) $(KERNEL_BUILD_DIR)
+STAMP_PREPARED:=$(LINUX_DIR)/.prepared
+STAMP_CONFIGURED:=$(LINUX_DIR)/.configured
+include $(INCLUDE_DIR)/download.mk
+include $(INCLUDE_DIR)/quilt.mk
+include $(INCLUDE_DIR)/kernel-defaults.mk
+
+define Kernel/Prepare
+       $(call Kernel/Prepare/Default)
+endef

 
 

-$(TOPDIR)/.kernel.mk:
-       echo "BOARD:=$(BOARD)" > $@
-       echo "LINUX_VERSION:=$(LINUX_VERSION)" >> $@
-       echo "LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@
+define Kernel/Configure
+       $(call Kernel/Configure/Default)
+endef

 
 

-pkg-install: FORCE
-       @{ [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG) install $(INSTALL_TARGETS) || true; }
+define Kernel/CompileModules
+       $(call Kernel/CompileModules/Default)
+endef

 
 

-source: $(DL_DIR)/$(LINUX_SOURCE)
-prepare:
-       @mkdir -p $(STAMP_DIR) $(PACKAGE_DIR)
-       @$(MAKE) $(LINUX_DIR)/.configured
+define Kernel/CompileImage
+       $(call Kernel/CompileImage/Default)
+endef

 
 

-compile: prepare $(STAMP_DIR)/.linux-compile
+define Kernel/Clean
+       $(call Kernel/Clean/Default)
+endef

 
 

-install: compile $(LINUX_KERNEL)
+define Download/kernel
+  URL:=$(LINUX_SITE)
+  FILE:=$(LINUX_SOURCE)
+  MD5SUM:=$(LINUX_KERNEL_MD5SUM)
+endef

 
 

-mostlyclean: FORCE
-       rm -f $(STAMP_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 $(LINUX_KERNEL)
+define BuildKernel
+  $(if $(QUILT),$(Build/Quilt))
+  $(if $(LINUX_SITE),$(call Download,kernel))
+
+  $(STAMP_PREPARED): $(DL_DIR)/$(LINUX_SOURCE)
+       -rm -rf $(KERNEL_BUILD_DIR)
+       -mkdir -p $(KERNEL_BUILD_DIR)
+       $(Kernel/Prepare)
+       touch $$@
+
+  $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(LINUX_CONFIG) $(GENERIC_LINUX_CONFIG) $(TOPDIR)/.config
+       $(Kernel/Configure)
+       touch $$@
+
+  $(LINUX_DIR)/.modules: $(STAMP_CONFIGURED) $(LINUX_DIR)/.config FORCE
+       $(Kernel/CompileModules)
+       touch $$@
+
+  $(LINUX_DIR)/.image: $(STAMP_CONFIGURED) FORCE
+       $(Kernel/CompileImage)
+       touch $$@
+       
+  mostlyclean: FORCE
+       $(Kernel/Clean)
+
+  define BuildKernel
+  endef
+
+  download: $(DL_DIR)/$(LINUX_SOURCE)
+  prepare: $(STAMP_CONFIGURED)
+  compile: $(LINUX_DIR)/.modules
+       $(MAKE) -C image compile TARGET_BUILD=
+
+  oldconfig menuconfig: $(STAMP_PREPARED) FORCE
+       $(LINUX_CONFCMD) > $(LINUX_DIR)/.config
+       $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $$@
+       $(SCRIPT_DIR)/kconfig.pl '>' $(GENERIC_LINUX_CONFIG) $(LINUX_DIR)/.config > $(LINUX_CONFIG)
+       $(Kernel/Configure)
+
+  install: $(LINUX_DIR)/.image
+       TARGET_BUILD="" $(MAKE) -C image compile install
+
+  clean: FORCE
+       rm -rf $(KERNEL_BUILD_DIR)

 
 

-rebuild: FORCE
-       -$(MAKE) mostlyclean
-       if [ -f $(LINUX_KERNEL) ]; then \
+  rebuild: FORCE
+       @$(MAKE) mostlyclean
+       @if [ -f $(LINUX_KERNEL) ]; then \

                $(MAKE) clean; \
        fi
                $(MAKE) clean; \
        fi

-       $(MAKE) compile $(MAKE_TRACE)
+       @$(MAKE) compile

 
 

-clean: FORCE
-       rm -f $(STAMP_DIR)/.linux-compile
-       rm -rf $(KERNEL_BUILD_DIR)
-       rm -f $(TARGETS)
+  image-prereq:
+       $(SUBMAKE) -s -C image prereq TARGET_BUILD=
+
+  prereq: image-prereq
+
+endef