fix a typo in my netfilter commit - worked for iptables, didn't work for the kernel...

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

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 5e45342..c0b17aa 100644 (file)
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -4,131 +4,238 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

--include $(INCLUDE_DIR)/modules-$(KERNEL).mk
+KERNEL_BUILD:=1

 
 

-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)
+include $(INCLUDE_DIR)/prereq.mk

 
 

-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)
+-include ./config
+ifneq ($(CONFIG_ATM),)
+  FEATURES += atm
+endif
+ifneq ($(CONFIG_PCI),)
+  FEATURES += pci
+endif
+ifneq ($(CONFIG_USB),)
+  FEATURES += usb
+endif
+ifneq ($(CONFIG_PCMCIA),)
+  FEATURES += pcmcia
+endif
+ifneq ($(CONFIG_VIDEO_DEV),)
+  FEATURES += video
+endif

 
 

-$(PACKAGE_DIR):
-       mkdir -p $@
+# remove duplicates
+FEATURES:=$(sort $(FEATURES))

 
 

-$(DL_DIR)/$(LINUX_SOURCE):
-       -mkdir -p $(DL_DIR)
-       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_SOURCE) $(LINUX_KERNEL_MD5SUM) $(LINUX_SITE)
+# For target profile selection - the default set
+DEFAULT_PACKAGES:=base-files libgcc uclibc bridge busybox dnsmasq dropbear iptables mtd ppp ppp-mod-pppoe mtd kmod-ipt-nathelper

 
 

-$(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 ($(DUMP),1)
+  all: dumpinfo
+else
+  all: compile
+endif

 
 

-ifeq ($(KERNEL),2.4)
-$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
-       $(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile
-       $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h
-       touch $@
+include $(INCLUDE_DIR)/kernel-version.mk
+include $(INCLUDE_DIR)/host.mk
+include $(INCLUDE_DIR)/kernel.mk

 
 

-$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured
-       $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) dep
-       touch $@
+LINUX_CONFIG:=./config

 
 

-$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.depend_done
+ifneq (,$(findstring uml,$(BOARD)))
+  LINUX_KARCH:=um

 else
 else

-$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched
-       $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts
-       touch $@
+  LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
+       -e 's/mipsel/mips/' \
+       -e 's/mipseb/mips/' \
+       -e 's/powerpc/ppc/' \
+       -e 's/sh[234]/sh/' \
+       -e 's/armeb/arm/' \
+  )

 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
+KERNELNAME=
+ifneq (,$(findstring x86,$(BOARD)))
+  KERNELNAME="bzImage"
+endif
+ifneq (,$(findstring rdc,$(BOARD)))
+  KERNELNAME="bzImage"
+endif
+ifneq (,$(findstring ppc,$(BOARD)))
+  KERNELNAME="uImage"

 endif
 
 endif
 

-$(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
-       $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@
-       touch -c $(LINUX_KERNEL)
+define Kernel/Prepare/Default
+       bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS)
+       [ -d $(GENERIC_PLATFORM_DIR)/patches ] && $(PATCH) $(LINUX_DIR) $(GENERIC_PLATFORM_DIR)/patches 
+       [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches
+endef
+define Kernel/Prepare
+       $(call Kernel/Prepare/Default)
+endef

 
 

-$(LINUX_DIR)/.modules_done:
-       rm -rf $(KERNEL_BUILD_DIR)/modules
-       $(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
+KERNEL_MAKEOPTS := -C $(LINUX_DIR) \
+       CROSS_COMPILE="$(KERNEL_CROSS)" \
+       ARCH="$(LINUX_KARCH)" \
+       CONFIG_SHELL="$(BASH)"

 
 

-modules: $(LINUX_DIR)/.modules_done
-packages: $(TARGETS)
+define Kernel/Configure/2.4
+       $(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile
+       $(MAKE) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" oldconfig include/linux/compile.h include/linux/version.h
+       $(MAKE) $(KERNEL_MAKEOPTS) dep
+endef
+define Kernel/Configure/2.6
+       $(MAKE) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" oldconfig prepare scripts
+endef
+define Kernel/Configure/Default
+       @$(CP) $(LINUX_CONFIG) $(LINUX_DIR)/.config
+       $(call Kernel/Configure/$(KERNEL))
+endef
+define Kernel/Configure
+       $(call Kernel/Configure/Default)
+endef
+
+
+define Kernel/CompileModules/Default
+       $(MAKE) -j$(CONFIG_JLEVEL) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" modules
+       $(MAKE) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
+endef
+define Kernel/CompileModules
+       $(call Kernel/CompileModules/Default)
+endef
+
+
+ifeq ($(KERNEL),2.6)
+  ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
+    define Kernel/SetInitramfs
+               mv $(LINUX_DIR)/.config $(LINUX_DIR)/.config.old
+               grep -v INITRAMFS $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config
+               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_PLATFORM_DIR)/files/init $(BUILD_DIR)/root/
+    endef
+  else
+    define Kernel/SetInitramfs
+               mv $(LINUX_DIR)/.config $(LINUX_DIR)/.config.old
+               grep -v INITRAMFS $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config
+               rm -f $(BUILD_DIR)/root/init $(BUILD_DIR)/root/etc/init.d/S00initramfs
+               echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config
+    endef
+  endif
+endif
+define Kernel/CompileImage/Default
+       $(call Kernel/SetInitramfs)
+       $(MAKE) -j$(CONFIG_JLEVEL) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" $(KERNELNAME)
+       $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $(LINUX_DIR)/vmlinux $(LINUX_KERNEL)
+endef
+define Kernel/CompileImage
+       $(call Kernel/CompileImage/Default)
+endef
+
+define Kernel/Clean/Default
+       rm -f $(LINUX_DIR)/.linux-compile
+       rm -f $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/.configured
+       rm -f $(LINUX_KERNEL)
+       $(MAKE) -C $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) clean
+endef

 
 

-$(LINUX_DIR)/.linux-compile:
-       @rm -f $(BUILD_DIR)/linux
-       ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux
-       @$(MAKE) modules
-       @$(MAKE) packages
-       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)
+define Kernel/Clean
+       $(call Kernel/Clean/Default)
+endef

 
 

-$(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)" >> $@
+define BuildKernel
+  ifneq ($(LINUX_SITE),)
+    $(DL_DIR)/$(LINUX_SOURCE):
+               -mkdir -p $(DL_DIR)
+               $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_SOURCE) $(LINUX_KERNEL_MD5SUM) $(LINUX_SITE)
+  endif

 
 

-pkg-install: FORCE
-       @for pkg in $(INSTALL_TARGETS); do \
-               $(IPKG) install $$pkg || echo; \
-       done
+  $(LINUX_DIR)/.prepared: $(DL_DIR)/$(LINUX_SOURCE)
+       -rm -rf $(KERNEL_BUILD_DIR)
+       -mkdir -p $(KERNEL_BUILD_DIR)
+       $(call Kernel/Prepare)
+       touch $$@

 
 

-download: $(DL_DIR)/$(LINUX_SOURCE)
-prepare: $(LINUX_DIR)/.configured
-       @mkdir -p $(LINUX_DIR) $(PACKAGE_DIR)
+  $(LINUX_DIR)/.configured: $(LINUX_DIR)/.prepared $(LINUX_CONFIG)
+       $(call Kernel/Configure)
+       touch $$@

 
 

-compile: prepare $(LINUX_DIR)/.linux-compile
+  $(LINUX_DIR)/.modules: $(LINUX_DIR)/.configured
+       rm -rf $(KERNEL_BUILD_DIR)/modules
+       @rm -f $(BUILD_DIR)/linux
+       ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux
+       $(call Kernel/CompileModules)
+       touch $$@
+
+  $(LINUX_DIR)/.image: $(LINUX_DIR)/.configured FORCE
+       $(call Kernel/CompileImage)
+       touch $$@
+       
+  mostlyclean: FORCE
+       $(call Kernel/Clean)
+
+  ifeq ($(DUMP),1)
+    dumpinfo:
+               @echo 'Target: $(BOARD)-$(KERNEL)'
+               @echo 'Target-Name: $(BOARDNAME) [$(KERNEL)]'
+               @echo 'Target-Path: $(subst $(TOPDIR)/,,$(PWD))'
+               @echo 'Target-Arch: $(ARCH)'
+               @echo 'Target-Features: $(FEATURES)'
+               @echo 'Linux-Version: $(LINUX_VERSION)'
+               @echo 'Linux-Release: $(LINUX_RELEASE)'
+               @echo 'Linux-Kernel-Arch: $(LINUX_KARCH)'
+               @echo 'Target-Description:'
+               @getvar $(call shvar,Target/Description)
+               @echo '@@'
+               @echo 'Default-Packages: $(DEFAULT_PACKAGES)'
+    ifneq ($(DUMPINFO),)
+               @$(DUMPINFO)
+    endif
+  endif
+
+  define BuildKernel
+  endef
+endef
+
+define Profile/Default
+  NAME:=
+  PACKAGES:=
+endef
+
+define Profile
+  $(eval $(call Profile/Default))
+  $(eval $(call Profile/$(1)))
+  $(eval $(call shexport,Profile/$(1)/Description))
+  DUMPINFO += \
+       echo "Target-Profile: $(1)"; \
+       echo "Target-Profile-Name: $(NAME)"; \
+       echo "Target-Profile-Packages: $(PACKAGES)"; \
+       echo "Target-Profile-Description:"; \
+       getvar "$(call shvar,Profile/$(1)/Description)"; \
+       echo "@@"; \
+       echo;
+endef
+
+$(eval $(call shexport,Target/Description))

 
 

-install: compile $(LINUX_KERNEL)
+download: $(DL_DIR)/$(LINUX_SOURCE)
+prepare: $(LINUX_DIR)/.configured $(TMP_DIR)/.kernel.mk
+compile: $(LINUX_DIR)/.modules
+install: $(LINUX_DIR)/.image

 
 

-mostlyclean: FORCE
-       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 $(LINUX_KERNEL)
+clean: FORCE
+       rm -f $(STAMP_DIR)/.linux-compile
+       rm -rf $(KERNEL_BUILD_DIR)

 
 rebuild: FORCE
 
 rebuild: FORCE

-       -$(MAKE) mostlyclean
-       if [ -f $(LINUX_KERNEL) ]; then \
+       @$(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)