projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add support for KernelPackage/*/description
[openwrt.git]
/
include
/
kernel.mk
diff --git
a/include/kernel.mk
b/include/kernel.mk
index
e0fda0d
..
7f035c7
100644
(file)
--- a/
include/kernel.mk
+++ b/
include/kernel.mk
@@
-12,6
+12,8
@@
ifeq ($(DUMP),1)
else
include $(INCLUDE_DIR)/target.mk
else
include $(INCLUDE_DIR)/target.mk
+ export GCC_HONOUR_COPTS=s
+
ifeq ($(KERNEL),2.6)
LINUX_KMOD_SUFFIX=ko
else
ifeq ($(KERNEL),2.6)
LINUX_KMOD_SUFFIX=ko
else
@@
-28,10
+30,9
@@
else
KERNEL_PATCHVER:=$(shell echo $(LINUX_VERSION) | cut -d. -f1,2,3 | cut -d- -f1)
PLATFORM_DIR := $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)
KERNEL_PATCHVER:=$(shell echo $(LINUX_VERSION) | cut -d. -f1,2,3 | cut -d- -f1)
PLATFORM_DIR := $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)
- PATCH_DIR := ./patches$(shell [ -d "./patches-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
- GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/patches$(shell [ -d "$(GENERIC_PLATFORM_DIR)/patches-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
- KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
- LINUX_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
+ PATCH_DIR ?= ./patches$(shell [ -d "./patches-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
+ KERNEL_BUILD_DIR ?= $(BUILD_DIR_BASE)/linux-$(KERNEL)-$(BOARD)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
+ LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)
TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)
MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)
TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)
@@
-48,11
+49,11
@@
else
PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
endif
GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic-$(KERNEL)
PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
endif
GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic-$(KERNEL)
+GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/patches$(shell [ -d "$(GENERIC_PLATFORM_DIR)/patches-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
define KernelPackage/Defaults
FILES:=
define KernelPackage/Defaults
FILES:=
- KCONFIG:=m
AUTOLOAD:=
endef
AUTOLOAD:=
endef
@@
-91,7
+92,6
@@
define KernelPackage
TITLE:=$(TITLE)
SECTION:=kernel
CATEGORY:=Kernel modules
TITLE:=$(TITLE)
SECTION:=kernel
CATEGORY:=Kernel modules
- DEFAULT:=$(KMOD_DEFAULT)
DESCRIPTION:=$(DESCRIPTION)
EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))
$(call KernelPackage/$(1))
DESCRIPTION:=$(DESCRIPTION)
EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))
$(call KernelPackage/$(1))
@@
-99,13
+99,19
@@
define KernelPackage
$(call KernelPackage/$(1)/$(BOARD)-$(KERNEL))
endef
$(call KernelPackage/$(1)/$(BOARD)-$(KERNEL))
endef
- ifeq ($(findstring m,$(KCONFIG)),m)
+ ifdef KernelPackage/$(1)/description
+ define Package/kmod-$(1)/description
+$(call KernelPackage/$(1)/description)
+ endef
+ endif
+
+ ifneq ($(if $(KCONFIG),$(filter m,$(foreach c,$(filter-out %=y %=n %=m,$(KCONFIG)),$($(c)))),.),)
ifneq ($(strip $(FILES)),)
define Package/kmod-$(1)/install
ifneq ($(strip $(FILES)),)
define Package/kmod-$(1)/install
- mkdir -p $$(1)/lib/modules/$(LINUX_VERSION)
- $(CP) -L $$(FILES) $$(1)/lib/modules/$(LINUX_VERSION)/
- $(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD))
- $(call KernelPackage/$(1)/install,$$(1))
+
mkdir -p $$(1)/lib/modules/$(LINUX_VERSION)
+
$(CP) -L $$(FILES) $$(1)/lib/modules/$(LINUX_VERSION)/
+
$(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD))
+
$(call KernelPackage/$(1)/install,$$(1))
endef
endif
endif
endef
endif
endif