X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/95bfb9a5cf7455122dfb57d4f861a5e7de30d1f9..3d1e9d69441a6a32e5c437bdecebb421b818742d:/include/kernel-build.mk diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 55e1b82eb..9a1e36328 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -33,8 +33,8 @@ ifeq ($(DUMP),1) else all: compile endif -KERNEL:=2.$(word 2,$(subst ., ,$(strip $(LINUX_VERSION)))) +include $(INCLUDE_DIR)/kernel-version.mk include $(INCLUDE_DIR)/host.mk include $(INCLUDE_DIR)/kernel.mk @@ -56,6 +56,9 @@ KERNELNAME= ifneq (,$(findstring x86,$(BOARD))) KERNELNAME="bzImage" endif +ifneq (,$(findstring rdc,$(BOARD))) + KERNELNAME="bzImage" +endif ifneq (,$(findstring ppc,$(BOARD))) KERNELNAME="uImage" endif @@ -63,7 +66,7 @@ endif 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 @@ -110,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 - $(CP) $(TOPDIR)/target/linux/generic-2.6/files/init $(BUILD_DIR)/root/ + $(CP) $(GENERIC_PLATFORM_DIR)/files/init $(BUILD_DIR)/root/ endef else define Kernel/SetInitramfs @@ -203,10 +206,15 @@ 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-Packages: $(PACKAGES)"; \ + echo "Target-Profile-Description:"; \ + getvar "$(call shvar,Profile/$(1)/Description)"; \ + echo "@@"; \ + echo; endef $(eval $(call shexport,Target/Description))