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

diff --git a/bright-ben/Config.in b/bright-ben/Config.in
index e65c197f8d6bbaed7da58404d104c8e1115a8566..1ea55d0ff44314e452427669a47547a93b38cd33 100644 (file)
--- a/bright-ben/Config.in
+++ b/bright-ben/Config.in
@@ -118,11 +118,6 @@ menu "Target Images"
 endmenu
 
 
-#config USE_LIBRE_KERNEL
-#      bool "Use only 100% free software"
-#      depends TARGET_x86 || TARGET_xburst
-#      default y
-
 menu "Global build settings"
 
        config ALL
@@ -395,11 +390,6 @@ menuconfig DEVEL
                help
                  Compiler cache; see http://ccache.samba.org/
 
-       config ON_SITE_DEBLOB
-               bool "Deblob Linux kernel on site" if DEVEL
-               depends TARGET_x86 || TARGET_xburst
-               default n
-
        config EXTERNAL_KERNEL_TREE
                string "Use external kernel tree" if DEVEL
                default ""

diff --git a/bright-ben/include/kernel.mk b/bright-ben/include/kernel.mk
index 6795bd49fcb0ee760297c1bd78864bdc77bdd667..7f7549c2cb04eb6e510a841f80c9f39120d2d52c 100644 (file)
--- a/bright-ben/include/kernel.mk
+++ b/bright-ben/include/kernel.mk
@@ -31,7 +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))
-  LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
+  LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(shell echo $(LINUX_VERSION) | cut -d"-" -f1 -)
 
   MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)
   TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)
@@ -41,11 +41,11 @@ 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)
+    LINUX_SITE:=@KERNEL/download/releases/$(LINUX_VERSION)
   endif
 
   ifneq ($(TARGET_BUILD),1)
-    PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
+    PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(shell echo $(PKG_VERSION) | cut -d"-" -f1 -))
   endif
 endif
 

diff --git a/bright-ben/toolchain/kernel-headers/Makefile b/bright-ben/toolchain/kernel-headers/Makefile
index f262c3b1e4b22b8c28fbf270515145aa845e09b1..5fcc796784842d37a4f5798d63046d63a62a33b3 100644 (file)
--- a/bright-ben/toolchain/kernel-headers/Makefile
+++ b/bright-ben/toolchain/kernel-headers/Makefile
@@ -18,12 +18,7 @@ PKG_NAME:=linux
 PKG_VERSION:=$(LINUX_VERSION)
 PKG_SOURCE:=$(LINUX_SOURCE)
 PKG_SOURCE_URL:=$(LINUX_SITE)
-
-ifneq ($(CONFIG_USE_LIBRE_KERNEL),)
-  HOST_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-$(shell echo $(LINUX_VERSION) | cut -d"-" -f1 -)
-else
-  HOST_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
-endif
+HOST_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-$(shell echo $(LINUX_VERSION) | cut -d"-" -f1 -)
 
 PKG_MD5SUM:=$(LINUX_KERNEL_MD5SUM)
 LINUX_DIR := $(HOST_BUILD_DIR)