Oops, commited just one part :/

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

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index e491e48..55e1b82 100644 (file)
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -6,6 +6,28 @@
 #
 KERNEL_BUILD:=1
 
+include $(INCLUDE_DIR)/prereq.mk
+
+-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
+
+# remove duplicates
+FEATURES:=$(sort $(FEATURES))
+
+# For target profile selection - the default set
+DEFAULT_PACKAGES:=base-files libgcc uclibc bridge busybox dnsmasq dropbear iptables mtd ppp ppp-mod-pppoe mtd
+
 ifeq ($(DUMP),1)
   all: dumpinfo
 else
@@ -48,14 +70,18 @@ define Kernel/Prepare
        $(call Kernel/Prepare/Default)
 endef
 
+KERNEL_MAKEOPTS := -C $(LINUX_DIR) \
+       CROSS_COMPILE="$(KERNEL_CROSS)" \
+       ARCH="$(LINUX_KARCH)" \
+       CONFIG_SHELL="$(BASH)"
 
 define Kernel/Configure/2.4
        $(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
-       $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) dep
+       $(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) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts
+       $(MAKE) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" oldconfig prepare scripts
 endef
 define Kernel/Configure/Default
        @$(CP) $(LINUX_CONFIG) $(LINUX_DIR)/.config
@@ -67,8 +93,8 @@ endef
 
 
 define Kernel/CompileModules/Default
-       $(MAKE) -j$(CONFIG_JLEVEL) -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
+       $(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)
@@ -84,7 +110,7 @@ ifeq ($(KERNEL),2.6)
                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/
+               $(CP) $(TOPDIR)/target/linux/generic-2.6/files/init $(BUILD_DIR)/root/
     endef
   else
     define Kernel/SetInitramfs
@@ -97,7 +123,7 @@ ifeq ($(KERNEL),2.6)
 endif
 define Kernel/CompileImage/Default
        $(call Kernel/SetInitramfs)
-       $(MAKE) -j$(CONFIG_JLEVEL) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) $(KERNELNAME)
+       $(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
@@ -146,41 +172,59 @@ define BuildKernel
   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)))
+  DUMPINFO += \
+       echo "Target-Profile: $(1)"; \
+       echo "Target-Profile-Name: $(NAME)"; \
+       echo "Target-Profile-Packages: $(PACKAGES)"; 
+endef
+
 $(eval $(call shexport,Target/Description))
 
-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:'
-       @echo "$$$(call shvar,Target/Description)"
-       @echo '@@'
-else
-  download: $(DL_DIR)/$(LINUX_SOURCE)
-  prepare: $(LINUX_DIR)/.configured $(TMP_DIR)/.kernel.mk
-  compile: $(LINUX_DIR)/.modules
-  install: $(LINUX_DIR)/.image
+download: $(DL_DIR)/$(LINUX_SOURCE)
+prepare: $(LINUX_DIR)/.configured $(TMP_DIR)/.kernel.mk
+compile: $(LINUX_DIR)/.modules
+install: $(LINUX_DIR)/.image
 
-  clean: FORCE
+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) clean; \
        fi
        @$(MAKE) compile
-endif