disable driver_devicescape in hostapd

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

diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index 409b7d7..fd5bb1c 100644 (file)
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -5,12 +5,22 @@
 # See /LICENSE for more information.
 #
 
-# 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
+# default device type
+DEVICE_TYPE?=router
+
+# Default packages - the really basic set
+DEFAULT_PACKAGES:=base-files libgcc uclibc busybox dropbear mtd mtd
+# For router targets
+DEFAULT_PACKAGES.router:=dnsmasq iptables ppp ppp-mod-pppoe iptables kmod-ipt-nathelper bridge
+
+# Additional packages for Linux 2.6
 ifneq ($(KERNEL),2.4)
-  DEFAULT_PACKAGES+=udevtrigger hotplug2
+  DEFAULT_PACKAGES += udevtrigger hotplug2
 endif
 
+# Add device specific packages
+DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE))
+
 KERNELNAME=
 ifneq (,$(findstring x86,$(BOARD)))
   KERNELNAME="bzImage"
@@ -35,6 +45,7 @@ Kernel/Patch:=$(Kernel/Patch/Default)
 define Kernel/Prepare/Default
        bzcat $(DL_DIR)/$(LINUX_SOURCE) | $(TAR) -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS)
        $(Kernel/Patch)
+       $(if $(QUILT),touch $(LINUX_DIR)/.quilt_used)
 endef
 
 define Kernel/Configure/2.4
@@ -46,20 +57,16 @@ define Kernel/Configure/2.6
        -$(MAKE) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" oldconfig prepare scripts
 endef
 define Kernel/Configure/Default
-       $(SCRIPT_DIR)/config.pl '+' $(GENERIC_LINUX_CONFIG) \
-               $(if $(wildcard ./config/profile-$(PROFILE)),'+' $(LINUX_CONFIG) ./config/profile-$(PROFILE), $(LINUX_CONFIG)) \
-               > $(LINUX_DIR)/.config.target
+       $(LINUX_CONFCMD) > $(LINUX_DIR)/.config.target
        $(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config > $(LINUX_DIR)/.config.override
-       $(SCRIPT_DIR)/config.pl 'm+' $(LINUX_DIR)/.config.target $(LINUX_DIR)/.config.override >$(LINUX_DIR)/.config
+       $(SCRIPT_DIR)/kconfig.pl 'm+' $(LINUX_DIR)/.config.target $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config
        $(call Kernel/Configure/$(KERNEL))
        rm -rf $(KERNEL_BUILD_DIR)/modules
-       @rm -f $(BUILD_DIR)/linux
-       ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux
 endef
 
 define Kernel/CompileModules/Default
        rm -f $(LINUX_DIR)/vmlinux $(LINUX_DIR)/System.map
-       $(MAKE) -j$(CONFIG_JLEVEL) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" modules
+       $(MAKE) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" modules
 endef
 
 ifeq ($(KERNEL),2.6)
@@ -67,7 +74,7 @@ ifeq ($(KERNEL),2.6)
     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_SOURCE="$(TARGET_DIR)"' >> $(LINUX_DIR)/.config
                echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config
                echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config
     endef
@@ -75,20 +82,19 @@ ifeq ($(KERNEL),2.6)
     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
+               rm -f $(TARGET_DIR)/init
                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)
+       $(MAKE) $(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)
        $(KERNEL_CROSS)objcopy -R .reginfo -R .note -R .comment -R .mdebug -S $(LINUX_DIR)/vmlinux $(KERNEL_BUILD_DIR)/vmlinux.elf
 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