diff options
-rw-r--r-- | configs/platform-mips/rules/kernel-ar9331.make | 41 | ||||
-rw-r--r-- | configs/platform-mips/rules/kernel-malta.make | 45 | ||||
-rw-r--r-- | configs/platform-mips/rules/kernel.make | 2 | ||||
-rw-r--r-- | configs/platform-mipsel/rules/kernel-malta.make | 39 | ||||
-rw-r--r-- | configs/platform-mipsel/rules/kernel.make | 2 |
5 files changed, 81 insertions, 48 deletions
diff --git a/configs/platform-mips/rules/kernel-ar9331.make b/configs/platform-mips/rules/kernel-ar9331.make index 7893431..b4a33fb 100644 --- a/configs/platform-mips/rules/kernel-ar9331.make +++ b/configs/platform-mips/rules/kernel-ar9331.make @@ -26,6 +26,7 @@ KERNEL_AR9331_BUILD_DIR := $(KERNEL_AR9331_DIR)-build KERNEL_AR9331_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig-ar9331) KERNEL_AR9331_REF_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig) KERNEL_AR9331_LICENSE := GPL-2.0-only +KERNEL_AR9331_LICENSE_FILES := KERNEL_AR9331_BUILD_OOT := KEEP # ---------------------------------------------------------------------------- @@ -36,15 +37,28 @@ KERNEL_AR9331_BUILD_OOT := KEEP KERNEL_AR9331_WRAPPER_BLACKLIST := \ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) -KERNEL_AR9331_PATH := PATH=$(CROSS_PATH) -KERNEL_AR9331_CONF_OPT := \ +KERNEL_AR9331_PATH := PATH=$(CROSS_PATH) +KERNEL_AR9331_SHARED_OPT := \ -C $(KERNEL_AR9331_DIR) \ O=$(KERNEL_AR9331_BUILD_DIR) \ $(call kernel-opts, KERNEL_AR9331) # no gcc plugins; avoid config changes depending on the host compiler -KERNEL_AR9331_CONF_OPT += \ - HOSTCXX=false +KERNEL_AR9331_SHARED_OPT += \ + HOSTCXX="$(HOSTCXX) -DGENERATOR_FILE" \ + HOSTCC="$(HOSTCC) -DGENERATOR_FILE" +KERNEL_AR9331_CONF_ENV := \ + PTXDIST_NO_GCC_PLUGINS=1 +KERNEL_AR9331_MAKE_ENV := \ + PTXDIST_NO_GCC_PLUGINS=1 + +KERNEL_AR9331_CONF_TOOL := kconfig +KERNEL_AR9331_CONF_OPT := \ + $(KERNEL_AR9331_SHARED_OPT) + +# force using KERNEL_AR9331_VERSION in the kernelconfig +#KERNEL_AR9331_CONF_OPT += \ +# KERNELVERSION=$(KERNEL_AR9331_VERSION) KERNEL_AR9331_IMAGES := vmlinuz KERNEL_AR9331_IMAGES := $(addprefix $(KERNEL_AR9331_BUILD_DIR)/,$(KERNEL_AR9331_IMAGES)) @@ -64,25 +78,18 @@ endif # Compile # ---------------------------------------------------------------------------- -KERNEL_AR9331_MAKE_OPT := \ - $(KERNEL_AR9331_CONF_OPT) \ +KERNEL_AR9331_MAKE_OPT := \ + $(KERNEL_AR9331_SHARED_OPT) \ vmlinuz modules # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- -KERNEL_AR9331_INSTALL_OPT := \ +KERNEL_AR9331_INSTALL_OPT := \ $(call kernel-opts, KERNEL_AR9331) \ modules_install -$(STATEDIR)/kernel-ar9331.install: - @$(call targetinfo) - @$(call world/install, KERNEL_AR9331) - @$(foreach image, $(KERNEL_AR9331_IMAGES), \ - install -m 644 $(image) $(IMAGEDIR)/$(notdir $(image))-ar9331$(ptx/nl)) - @$(call touch) - # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- @@ -90,6 +97,10 @@ $(STATEDIR)/kernel-ar9331.install: $(STATEDIR)/kernel-ar9331.targetinstall: @$(call targetinfo) + @$(foreach image, $(KERNEL_AR9331_IMAGES), \ + install -v -m 644 $(image) \ + $(IMAGEDIR)/$(notdir $(image))-ar9331$(ptx/nl)) + @$(call install_init, kernel-ar9331) @$(call install_fixup, kernel-ar9331, PRIORITY,optional) @$(call install_fixup, kernel-ar9331, SECTION,base) @@ -110,7 +121,7 @@ $(STATEDIR)/kernel-ar9331.targetinstall: # oldconfig / menuconfig # ---------------------------------------------------------------------------- -kernel-ar9331_oldconfig kernel-ar9331_menuconfig kernel-ar9331_nconfig: $(STATEDIR)/kernel-ar9331.extract +$(call ptx/kconfig-targets, kernel-ar9331): $(STATEDIR)/kernel-ar9331.extract @$(call world/kconfig, KERNEL_AR9331, $(subst kernel-ar9331_,,$@)) # vim: syntax=make diff --git a/configs/platform-mips/rules/kernel-malta.make b/configs/platform-mips/rules/kernel-malta.make index f93262c..1d8b72c 100644 --- a/configs/platform-mips/rules/kernel-malta.make +++ b/configs/platform-mips/rules/kernel-malta.make @@ -26,6 +26,7 @@ KERNEL_MALTA_BUILD_DIR := $(KERNEL_MALTA_DIR)-build KERNEL_MALTA_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig-malta) KERNEL_MALTA_REF_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig) KERNEL_MALTA_LICENSE := GPL-2.0-only +KERNEL_MALTA_LICENSE_FILES := KERNEL_MALTA_BUILD_OOT := KEEP # ---------------------------------------------------------------------------- @@ -36,18 +37,31 @@ KERNEL_MALTA_BUILD_OOT := KEEP KERNEL_MALTA_WRAPPER_BLACKLIST := \ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) -KERNEL_MALTA_PATH := PATH=$(CROSS_PATH) -KERNEL_MALTA_CONF_OPT := \ +KERNEL_MALTA_PATH := PATH=$(CROSS_PATH) +KERNEL_MALTA_SHARED_OPT := \ -C $(KERNEL_MALTA_DIR) \ O=$(KERNEL_MALTA_BUILD_DIR) \ $(call kernel-opts, KERNEL_MALTA) # no gcc plugins; avoid config changes depending on the host compiler -KERNEL_MALTA_CONF_OPT += \ - HOSTCXX=false +KERNEL_MALTA_SHARED_OPT += \ + HOSTCXX="$(HOSTCXX) -DGENERATOR_FILE" \ + HOSTCC="$(HOSTCC) -DGENERATOR_FILE" +KERNEL_MALTA_CONF_ENV := \ + PTXDIST_NO_GCC_PLUGINS=1 +KERNEL_MALTA_MAKE_ENV := \ + PTXDIST_NO_GCC_PLUGINS=1 + +KERNEL_MALTA_CONF_TOOL := kconfig +KERNEL_MALTA_CONF_OPT := \ + $(KERNEL_MALTA_SHARED_OPT) + +# force using KERNEL_MALTA_VERSION in the kernelconfig +#KERNEL_MALTA_CONF_OPT += \ +# KERNELVERSION=$(KERNEL_MALTA_VERSION) -KERNEL_MALTA_IMAGES := vmlinuz -KERNEL_MALTA_IMAGES := $(addprefix $(KERNEL_MALTA_BUILD_DIR)/,$(KERNEL_MALTA_IMAGES)) +KERNEL_MALTA_IMAGES := vmlinuz +KERNEL_MALTA_IMAGES := $(addprefix $(KERNEL_MALTA_BUILD_DIR)/,$(KERNEL_MALTA_IMAGES)) ifdef PTXCONF_KERNEL_MALTA $(KERNEL_MALTA_CONFIG): @@ -64,25 +78,18 @@ endif # Compile # ---------------------------------------------------------------------------- -KERNEL_MALTA_MAKE_OPT := \ - $(KERNEL_MALTA_CONF_OPT) \ +KERNEL_MALTA_MAKE_OPT := \ + $(KERNEL_MALTA_SHARED_OPT) \ vmlinuz modules # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- -KERNEL_MALTA_INSTALL_OPT := \ +KERNEL_MALTA_INSTALL_OPT := \ $(call kernel-opts, KERNEL_MALTA) \ modules_install -$(STATEDIR)/kernel-malta.install: - @$(call targetinfo) - @$(call world/install, KERNEL_MALTA) - @$(foreach image, $(KERNEL_MALTA_IMAGES), \ - install -m 644 $(image) $(IMAGEDIR)/$(notdir $(image))-malta$(ptx/nl)) - @$(call touch) - # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- @@ -90,6 +97,10 @@ $(STATEDIR)/kernel-malta.install: $(STATEDIR)/kernel-malta.targetinstall: @$(call targetinfo) + @$(foreach image, $(KERNEL_MALTA_IMAGES), \ + install -v -m 644 $(image) \ + $(IMAGEDIR)/$(notdir $(image))-malta$(ptx/nl)) + @$(call install_init, kernel-malta) @$(call install_fixup, kernel-malta, PRIORITY,optional) @$(call install_fixup, kernel-malta, SECTION,base) @@ -110,7 +121,7 @@ $(STATEDIR)/kernel-malta.targetinstall: # oldconfig / menuconfig # ---------------------------------------------------------------------------- -kernel-malta_oldconfig kernel-malta_menuconfig kernel-malta_nconfig: $(STATEDIR)/kernel-malta.extract +$(call ptx/kconfig-targets, kernel-malta): $(STATEDIR)/kernel-malta.extract @$(call world/kconfig, KERNEL_MALTA, $(subst kernel-malta_,,$@)) # vim: syntax=make diff --git a/configs/platform-mips/rules/kernel.make b/configs/platform-mips/rules/kernel.make index a9eb0f2..6d5ca4d 100644 --- a/configs/platform-mips/rules/kernel.make +++ b/configs/platform-mips/rules/kernel.make @@ -76,7 +76,7 @@ $(STATEDIR)/kernel.install: # oldconfig / menuconfig # ---------------------------------------------------------------------------- -kernel_oldconfig kernel_menuconfig kernel_nconfig: $(STATEDIR)/kernel.extract +$(call ptx/kconfig-targets, kernel): $(STATEDIR)/kernel.extract @$(call world/kconfig, KERNEL, $(subst kernel_,,$@)) # vim: syntax=make diff --git a/configs/platform-mipsel/rules/kernel-malta.make b/configs/platform-mipsel/rules/kernel-malta.make index f93262c..94f49b8 100644 --- a/configs/platform-mipsel/rules/kernel-malta.make +++ b/configs/platform-mipsel/rules/kernel-malta.make @@ -26,6 +26,7 @@ KERNEL_MALTA_BUILD_DIR := $(KERNEL_MALTA_DIR)-build KERNEL_MALTA_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig-malta) KERNEL_MALTA_REF_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig) KERNEL_MALTA_LICENSE := GPL-2.0-only +KERNEL_MALTA_LICENSE_FILES := KERNEL_MALTA_BUILD_OOT := KEEP # ---------------------------------------------------------------------------- @@ -37,14 +38,27 @@ KERNEL_MALTA_WRAPPER_BLACKLIST := \ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) KERNEL_MALTA_PATH := PATH=$(CROSS_PATH) -KERNEL_MALTA_CONF_OPT := \ +KERNEL_MALTA_SHARED_OPT := \ -C $(KERNEL_MALTA_DIR) \ O=$(KERNEL_MALTA_BUILD_DIR) \ $(call kernel-opts, KERNEL_MALTA) # no gcc plugins; avoid config changes depending on the host compiler -KERNEL_MALTA_CONF_OPT += \ - HOSTCXX=false +KERNEL_MALTA_SHARED_OPT += \ + HOSTCXX="$(HOSTCXX) -DGENERATOR_FILE" \ + HOSTCC="$(HOSTCC) -DGENERATOR_FILE" +KERNEL_MALTA_CONF_ENV := \ + PTXDIST_NO_GCC_PLUGINS=1 +KERNEL_MALTA_MAKE_ENV := \ + PTXDIST_NO_GCC_PLUGINS=1 + +KERNEL_MALTA_CONF_TOOL := kconfig +KERNEL_MALTA_CONF_OPT := \ + $(KERNEL_MALTA_SHARED_OPT) + +# force using KERNEL_MALTA_VERSION in the kernelconfig +#KERNEL_MALTA_CONF_OPT += \ +# KERNELVERSION=$(KERNEL_MALTA_VERSION) KERNEL_MALTA_IMAGES := vmlinuz KERNEL_MALTA_IMAGES := $(addprefix $(KERNEL_MALTA_BUILD_DIR)/,$(KERNEL_MALTA_IMAGES)) @@ -64,25 +78,18 @@ endif # Compile # ---------------------------------------------------------------------------- -KERNEL_MALTA_MAKE_OPT := \ - $(KERNEL_MALTA_CONF_OPT) \ +KERNEL_MALTA_MAKE_OPT := \ + $(KERNEL_MALTA_SHARED_OPT) \ vmlinuz modules # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- -KERNEL_MALTA_INSTALL_OPT := \ +KERNEL_MALTA_INSTALL_OPT := \ $(call kernel-opts, KERNEL_MALTA) \ modules_install -$(STATEDIR)/kernel-malta.install: - @$(call targetinfo) - @$(call world/install, KERNEL_MALTA) - @$(foreach image, $(KERNEL_MALTA_IMAGES), \ - install -m 644 $(image) $(IMAGEDIR)/$(notdir $(image))-malta$(ptx/nl)) - @$(call touch) - # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- @@ -90,6 +97,10 @@ $(STATEDIR)/kernel-malta.install: $(STATEDIR)/kernel-malta.targetinstall: @$(call targetinfo) + @$(foreach image, $(KERNEL_MALTA_IMAGES), \ + install -v -m 644 $(image) \ + $(IMAGEDIR)/$(notdir $(image))-malta$(ptx/nl)) + @$(call install_init, kernel-malta) @$(call install_fixup, kernel-malta, PRIORITY,optional) @$(call install_fixup, kernel-malta, SECTION,base) @@ -110,7 +121,7 @@ $(STATEDIR)/kernel-malta.targetinstall: # oldconfig / menuconfig # ---------------------------------------------------------------------------- -kernel-malta_oldconfig kernel-malta_menuconfig kernel-malta_nconfig: $(STATEDIR)/kernel-malta.extract +$(call ptx/kconfig-targets, kernel-malta): $(STATEDIR)/kernel-malta.extract @$(call world/kconfig, KERNEL_MALTA, $(subst kernel-malta_,,$@)) # vim: syntax=make diff --git a/configs/platform-mipsel/rules/kernel.make b/configs/platform-mipsel/rules/kernel.make index a9eb0f2..6d5ca4d 100644 --- a/configs/platform-mipsel/rules/kernel.make +++ b/configs/platform-mipsel/rules/kernel.make @@ -76,7 +76,7 @@ $(STATEDIR)/kernel.install: # oldconfig / menuconfig # ---------------------------------------------------------------------------- -kernel_oldconfig kernel_menuconfig kernel_nconfig: $(STATEDIR)/kernel.extract +$(call ptx/kconfig-targets, kernel): $(STATEDIR)/kernel.extract @$(call world/kconfig, KERNEL, $(subst kernel_,,$@)) # vim: syntax=make |