X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/1f9447cc2bba189264b851ab47d90c01c5f052ff..1495465bb401dc696b5a85562de8aa8a6c1705db:/include/kernel.mk diff --git a/include/kernel.mk b/include/kernel.mk index 28567776a..1ca231282 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -30,7 +30,7 @@ else 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) @@ -42,7 +42,9 @@ else LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2 TESTING:=$(if $(findstring -rc,$(LINUX_VERSION)),/testing,) - LINUX_SITE:=@KERNEL/linux/kernel/v$(KERNEL)$(TESTING) \ + ifeq ($(call qstrip,$(CONFIG_EXTERNAL_KERNEL_TREE)),) + LINUX_SITE:=@KERNEL/linux/kernel/v$(KERNEL)$(TESTING) + endif ifneq ($(TARGET_BUILD),1) PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION)) @@ -50,15 +52,10 @@ else endif ifneq (,$(findstring uml,$(BOARD))) - LINUX_KARCH:=um + LINUX_KARCH=um else ifeq (,$(LINUX_KARCH)) - LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/x86/' \ - -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 @@ -73,6 +70,9 @@ define ModuleAutoLoad add_module() { \ mkdir -p $(2)/etc/modules.d; \ ( \ + [ "$$$$$$$$3" = "1" ] && { \ + echo '# May be required for rootfs' ; \ + } ; \ for mod in $$$$$$$$2; do \ getvar mod; \ done \ @@ -82,6 +82,7 @@ define ModuleAutoLoad $(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; \ @@ -94,24 +95,30 @@ ifeq ($(DUMP)$(TARGET_BUILD),) -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)) $(eval $(call KernelPackage/Defaults)) $(eval $(call KernelPackage/$(1))) $(eval $(call KernelPackage/$(1)/$(KERNEL))) - $(eval $(call KernelPackage/$(1)/$(BOARD)-$(KERNEL))) + $(eval $(call KernelPackage/$(1)/$(BOARD))) define Package/kmod-$(1) TITLE:=$(TITLE) SECTION:=kernel CATEGORY:=Kernel modules DESCRIPTION:=$(DESCRIPTION) - EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)) - VERSION:=$(LINUX_VERSION)$(if $(PKG_VERSION),+$(PKG_VERSION))-$(BOARD)-$(if $(PKG_RELEASE),$(PKG_RELEASE),$(LINUX_RELEASE)) + EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(LINUX_RELEASE)) + VERSION:=$(LINUX_VERSION)$(if $(PKG_VERSION),+$(PKG_VERSION))-$(if $(PKG_RELEASE),$(PKG_RELEASE),$(LINUX_RELEASE)) $(call KernelPackage/$(1)) $(call KernelPackage/$(1)/$(KERNEL)) - $(call KernelPackage/$(1)/$(BOARD)-$(KERNEL)) + $(call KernelPackage/$(1)/$(BOARD)) endef ifdef KernelPackage/$(1)/description @@ -126,7 +133,7 @@ $(call KernelPackage/$(1)/config) 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)),) @@ -150,10 +157,14 @@ $(call KernelPackage/$(1)/config) endef define AutoLoad - add_module $(1) "$(2)"; + add_module $(1) "$(2)" $(3); 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