summaryrefslogtreecommitdiffstats
path: root/rules
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2011-06-22 17:42:49 +0200
committerRobert Schwebel <r.schwebel@pengutronix.de>2011-07-12 15:31:14 +0200
commitcef51e6071cd9032f09df2e9c85d4774bae8bda9 (patch)
tree5ffe992d72952ac4b3657890cdf8ced0e8338011 /rules
parent8907381605c1d995ddd0e1ad03b49c1a52c40a52 (diff)
downloadptxdist-cef51e6071cd9032f09df2e9c85d4774bae8bda9.tar.gz
ptxdist-cef51e6071cd9032f09df2e9c85d4774bae8bda9.tar.xz
ptxdist: remove old local-kernel method
As we know have the possibility to overwrite any package in local_src/<package>.<platform>, remove the old methods to set PTXCONF_KERNEL_LOCAL_FLAG and PTXCONF_SETUP_KERNELDIR_PREFIX Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'rules')
-rw-r--r--rules/kernel-checks.make21
-rw-r--r--rules/kernel.make5
2 files changed, 0 insertions, 26 deletions
diff --git a/rules/kernel-checks.make b/rules/kernel-checks.make
index d810e2ea3..4ce4c247f 100644
--- a/rules/kernel-checks.make
+++ b/rules/kernel-checks.make
@@ -10,27 +10,6 @@
ifdef PTXCONF_KERNEL
-ifdef PTXCONF_KERNEL_LOCAL_FLAG
-ifeq ($(PTXCONF_SETUP_KERNELDIR_PREFIX),)
- $(warning ***)
- $(warning *** PTXCONF_KERNEL_LOCAL_FLAG feature activated, but)
- $(warning *** PTXCONF_SETUP_KERNELDIR_PREFIX is unset!)
- $(warning ***)
- $(warning *** This feature is mainly for developers, who to want have their kernel sources)
- $(warning *** outside of ptxdist. You can turn it off by deselecting "Local kernel tree":)
- $(warning *** "ptxdist platformconfig" -> "Linux kernel" -> "Local kernel tree")
- $(warning ***)
- $(warning *** If you want to use the feature, please enter a proper prefix)
- $(warning *** to your kernel tree)
- $(warning *** "ptxdist setup" -> "Source Directories")
- $(warning *** -> "Prefix for kernel trees")
- $(warning *** and specify where to look for your kernel tree)
- $(warning ***)
- $(error )
-endif
-endif
-
-
ifeq ($(PTXCONF_KERNEL_VERSION),)
$(warning *** PTXCONF_KERNEL_VERSION is empty)
$(warning *** please run 'ptxdist platformconfig' and activate the kernel)
diff --git a/rules/kernel.make b/rules/kernel.make
index 40a931bbd..6e0523b13 100644
--- a/rules/kernel.make
+++ b/rules/kernel.make
@@ -35,13 +35,8 @@ KERNEL_SUFFIX := tar.bz2
KERNEL_DIR := $(KERNEL_BDIR)/$(KERNEL)
KERNEL_CONFIG := $(call remove_quotes, $(PTXDIST_PLATFORMCONFIGDIR)/$(PTXCONF_KERNEL_CONFIG))
KERNEL_LICENSE := GPLv2
-
-ifdef PTXCONF_KERNEL_LOCAL_FLAG
-KERNEL_URL := file://$(PTXCONF_SETUP_KERNELDIR_PREFIX)/$(KERNEL_VERSION)
-else
KERNEL_URL := $(call kernel-url, KERNEL)
KERNEL_SOURCE := $(SRCDIR)/$(KERNEL).$(KERNEL_SUFFIX)
-endif
# ----------------------------------------------------------------------------
# Prepare