replace our no_shadow fix with a better patch from upstream (#1118)

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

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 8420c83..6d9c9d9 100644 (file)
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -6,15 +6,38 @@
 #
 KERNEL_BUILD:=1
 
 #
 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
+  all: compile
+endif
+
+include $(INCLUDE_DIR)/kernel-version.mk

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

 LINUX_CONFIG:=./config
 
 ifneq (,$(findstring uml,$(BOARD)))
 LINUX_CONFIG:=./config
 
 ifneq (,$(findstring uml,$(BOARD)))


@@ -33,6 +56,9 @@ KERNELNAME=
 ifneq (,$(findstring x86,$(BOARD)))
   KERNELNAME="bzImage"
 endif
 ifneq (,$(findstring x86,$(BOARD)))
   KERNELNAME="bzImage"
 endif

+ifneq (,$(findstring rdc,$(BOARD)))
+  KERNELNAME="bzImage"
+endif

 ifneq (,$(findstring ppc,$(BOARD)))
   KERNELNAME="uImage"
 endif
 ifneq (,$(findstring ppc,$(BOARD)))
   KERNELNAME="uImage"
 endif


@@ -40,21 +66,25 @@ endif
 
 define Kernel/Prepare/Default
        bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS)
 
 define Kernel/Prepare/Default
        bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS)

-       [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches 
+       [ -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
 
        [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches
 endef
 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
 
 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
 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
 endef
 define Kernel/Configure/Default
        @$(CP) $(LINUX_CONFIG) $(LINUX_DIR)/.config


@@ -66,8 +96,8 @@ endef
 
 
 define Kernel/CompileModules/Default
 
 
 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)
 endef
 define Kernel/CompileModules
        $(call Kernel/CompileModules/Default)


@@ -83,7 +113,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
                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) $(GENERIC_PLATFORM_DIR)/files/init $(BUILD_DIR)/root/

     endef
   else
     define Kernel/SetInitramfs
     endef
   else
     define Kernel/SetInitramfs


@@ -96,7 +126,7 @@ ifeq ($(KERNEL),2.6)
 endif
 define Kernel/CompileImage/Default
        $(call Kernel/SetInitramfs)
 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
        $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $(LINUX_DIR)/vmlinux $(LINUX_KERNEL)
 endef
 define Kernel/CompileImage


@@ -145,13 +175,47 @@ define BuildKernel
   mostlyclean: FORCE
        $(call Kernel/Clean)
 
   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 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))

 
 download: $(DL_DIR)/$(LINUX_SOURCE)
 
 download: $(DL_DIR)/$(LINUX_SOURCE)

-prepare: $(LINUX_DIR)/.configured $(TOPDIR)/.kernel.mk
+prepare: $(LINUX_DIR)/.configured $(TMP_DIR)/.kernel.mk

 compile: $(LINUX_DIR)/.modules
 install: $(LINUX_DIR)/.image
 
 compile: $(LINUX_DIR)/.modules
 install: $(LINUX_DIR)/.image
 


@@ -166,11 +230,4 @@ rebuild: FORCE
        fi
        @$(MAKE) compile
 
        fi
        @$(MAKE) compile
 

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