projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[kernel] 2.6.31: refresh generic patches
[openwrt.git]
/
include
/
kernel.mk
diff --git
a/include/kernel.mk
b/include/kernel.mk
index
a9a350b
..
cb62e63
100644
(file)
--- a/
include/kernel.mk
+++ b/
include/kernel.mk
@@
-30,7
+30,7
@@
else
KERNEL_CROSS?=$(TARGET_CROSS)
endif
KERNEL_CROSS?=$(TARGET_CROSS)
endif
- PATCH_DIR ?= ./patches$(
shell [ -d "./patches-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true
)
+ PATCH_DIR ?= ./patches$(
if $(wildcard ./patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER)
)
FILES_DIR ?= $(foreach dir,$(wildcard ./files ./files-$(KERNEL_PATCHVER)),"$(dir)")
KERNEL_BUILD_DIR ?= $(BUILD_DIR_BASE)/linux-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
FILES_DIR ?= $(foreach dir,$(wildcard ./files ./files-$(KERNEL_PATCHVER)),"$(dir)")
KERNEL_BUILD_DIR ?= $(BUILD_DIR_BASE)/linux-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
@@
-50,15
+50,10
@@
else
endif
ifneq (,$(findstring uml,$(BOARD)))
endif
ifneq (,$(findstring uml,$(BOARD)))
- LINUX_KARCH
:
=um
+ LINUX_KARCH=um
else
ifeq (,$(LINUX_KARCH))
else
ifeq (,$(LINUX_KARCH))
- LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
- -e 's/mipsel/mips/' \
- -e 's/mipseb/mips/' \
- -e 's/sh[234]/sh/' \
- -e 's/armeb/arm/' \
- )
+ LINUX_KARCH=$(strip $(subst i386,x86,$(subst armeb,arm,$(subst mipsel,mips,$(subst mips64,mips,$(subst mips64el,mips,$(subst sh2,sh,$(subst sh3,sh,$(subst sh4,sh,$(ARCH))))))))))
endif
endif
endif
endif
@@
-82,6
+77,7
@@
define ModuleAutoLoad
$(3) \
if [ -n "$$$$$$$$modules" ]; then \
mkdir -p $(2)/etc/modules.d; \
$(3) \
if [ -n "$$$$$$$$modules" ]; then \
mkdir -p $(2)/etc/modules.d; \
+ mkdir -p $(2)/CONTROL; \
echo "#!/bin/sh" > $(2)/CONTROL/postinst; \
echo "[ -z \"\$$$$$$$$IPKG_INSTROOT\" ] || exit 0" >> $(2)/CONTROL/postinst; \
echo ". /etc/functions.sh" >> $(2)/CONTROL/postinst; \
echo "#!/bin/sh" > $(2)/CONTROL/postinst; \
echo "[ -z \"\$$$$$$$$IPKG_INSTROOT\" ] || exit 0" >> $(2)/CONTROL/postinst; \
echo ". /etc/functions.sh" >> $(2)/CONTROL/postinst; \
@@
-94,6
+90,12
@@
ifeq ($(DUMP)$(TARGET_BUILD),)
-include $(LINUX_DIR)/.config
endif
-include $(LINUX_DIR)/.config
endif
+define KernelPackage/depends
+ $(STAMP_BUILT): $(LINUX_DIR)/.config
+ define KernelPackage/depends
+ endef
+endef
+
define KernelPackage
NAME:=$(1)
$(eval $(call Package/Default))
define KernelPackage
NAME:=$(1)
$(eval $(call Package/Default))
@@
-126,7
+128,7
@@
$(call KernelPackage/$(1)/config)
endef
endif
endef
endif
- $(
STAMP_BUILT): $(LINUX_DIR)/.config
+ $(
call KernelPackage/depends)
ifneq ($(if $(filter-out %=y %=n %=m,$(KCONFIG)),$(filter m,$(foreach c,$(filter-out %=y %=n %=m,$(KCONFIG)),$($(c)))),.),)
ifneq ($(strip $(FILES)),)
ifneq ($(if $(filter-out %=y %=n %=m,$(KCONFIG)),$(filter m,$(foreach c,$(filter-out %=y %=n %=m,$(KCONFIG)),$($(c)))),.),)
ifneq ($(strip $(FILES)),)
@@
-153,7
+155,11
@@
define AutoLoad
add_module $(1) "$(2)";
endef
add_module $(1) "$(2)";
endef
-define CompareKernelPatchVer
- $(shell [ $$(echo $(1) | tr . 0) -$(2) $$(echo $(3) | tr . 0) ] && echo 1 || echo 0)
-endef
+ifdef DUMP
+ CompareKernelPatchVer=0
+else
+ define CompareKernelPatchVer
+ $(shell [ $$(echo $(1) | tr . 0) -$(2) $$(echo $(3) | tr . 0) ] && echo 1 || echo 0)
+ endef
+endif
This page took
0.019459 seconds
and
4
git commands to generate.