X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=include%2Fkernel-defaults.mk;h=4aa5c0ef18232305df8c7412e37dccbf08e9cea2;hp=d5cf1202b3382d3801459eb6e3a299dc3d71bb35;hb=0abe62d13fe85841922db0f6e9556ef687238e10;hpb=00792a235d2b6fedf9b6ae640f10357b5f9d7f62 diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index d5cf1202b3..4aa5c0ef18 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -12,9 +12,6 @@ endif ifneq (,$(findstring rdc,$(BOARD))) KERNELNAME="bzImage" endif -ifneq (,$(findstring ppc,$(BOARD))) - KERNELNAME="uImage" -endif ifneq (,$(findstring avr32,$(BOARD))) KERNELNAME="uImage" endif @@ -34,19 +31,31 @@ endif # defined in quilt.mk Kernel/Patch:=$(Kernel/Patch/Default) ifeq ($(strip $(CONFIG_EXTERNAL_KERNEL_TREE)),"") -define Kernel/Prepare/Default + ifeq ($(strip $(CONFIG_KERNEL_GIT_CLONE_URI)),"") + 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 -else + touch $(LINUX_DIR)/.quilt_used + endef + else + ifeq ($(strip $(CONFIG_KERNEL_GIT_LOCAL_REPOSITORY)),"") define Kernel/Prepare/Default + git clone $(CONFIG_KERNEL_GIT_CLONE_URI) $(LINUX_DIR) + endef + else + define Kernel/Prepare/Default + git clone --reference $(CONFIG_KERNEL_GIT_LOCAL_REPOSITORY) $(CONFIG_KERNEL_GIT_CLONE_URI) $(LINUX_DIR) + endef + endif +endif +else + define Kernel/Prepare/Default mkdir -p $(KERNEL_BUILD_DIR) if [ -d $(LINUX_DIR) ]; then \ rmdir $(LINUX_DIR); \ fi ln -s $(CONFIG_EXTERNAL_KERNEL_TREE) $(LINUX_DIR) -endef + endef endif ifeq ($(KERNEL),2.6) @@ -77,6 +86,9 @@ define Kernel/Configure/2.6 endef define Kernel/Configure/Default $(LINUX_CONFCMD) > $(LINUX_DIR)/.config.target + echo "$(if $(CONFIG_KERNEL_KALLSYMS),CONFIG_KALLSYMS=y,# CONFIG_KALLSYMS is not set)" >> $(LINUX_DIR)/.config.target + echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> $(LINUX_DIR)/.config.target + echo "# CONFIG_KPROBES is not set" >> $(LINUX_DIR)/.config.target $(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config > $(LINUX_DIR)/.config.override $(SCRIPT_DIR)/kconfig.pl 'm+' $(LINUX_DIR)/.config.target $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config $(call Kernel/SetInitramfs)