revert to orig kernel.mk

git-svn-id: http://svn.librewrt.org/librewrt@71 d459f2a8-9e7c-4474-95e1-7f88c49cc8e2

diff --git a/bright-ben/include/kernel.mk b/bright-ben/include/kernel.mk
index 71ea712a6272015ee86ef96f213c566e63c5be52..6795bd49fcb0ee760297c1bd78864bdc77bdd667 100644 (file)
--- a/bright-ben/include/kernel.mk
+++ b/bright-ben/include/kernel.mk
@@ -31,12 +31,7 @@ else
     FILES_DIR ?= $(foreach dir,$(wildcard ./files ./files-$(KERNEL_PATCHVER)),"$(dir)")
   endif
   KERNEL_BUILD_DIR ?= $(BUILD_DIR_BASE)/linux-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
-  ifneq ($(CONFIG_USE_LIBRE_KERNEL),)
-    LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(shell echo $(LINUX_VERSION) | cut -d"-" -f1 -)
-  else
-    LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
-  endif
-
+  LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
 
   MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)
   TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)
@@ -46,12 +41,12 @@ else
   LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2
   TESTING:=$(if $(findstring -rc,$(LINUX_VERSION)),/testing,)
   ifeq ($(call qstrip,$(CONFIG_EXTERNAL_KERNEL_TREE)),)
-       LINUX_SITE:=@KERNEL/linux/kernel/v$(KERNEL)$(TESTING)
-    endif
+    LINUX_SITE:=@KERNEL/linux/kernel/v$(KERNEL)$(TESTING)
   endif
 
   ifneq ($(TARGET_BUILD),1)
-      PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(shell echo $(PKG_VERSION) | cut -d"-" -f1 -))
+    PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
+  endif
 endif
 
 ifneq (,$(findstring uml,$(BOARD)))