diff options
| -rwxr-xr-x | bin/ptxdist | 24 | ||||
| -rw-r--r-- | platforms/kernel.in | 22 | ||||
| -rw-r--r-- | rules/kernel-checks.make | 21 | ||||
| -rw-r--r-- | rules/kernel.make | 5 |
4 files changed, 2 insertions, 70 deletions
diff --git a/bin/ptxdist b/bin/ptxdist index 1fad54b18..a47d9689f 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -1742,8 +1742,6 @@ parse_second() exit fi - local kernellink="${PTXDIST_WORKSPACE}/.kernel" - while [ ${#} -ne 0 ]; do local cmd="${1}" shift @@ -1801,17 +1799,8 @@ parse_second() ;; platformconfig) - if [ -L "${kernellink}" ]; then - rm -f -- "${kernellink}" - fi - do_config menuconfig platform - local retval=${?} - - if [ -n "$(ptxd_get_ptxconf PTXCONF_KERNEL_SYMLINK_IN_PROJECTDIR)" ]; then - ln -sf "${BUILDDIR}/linux-$(ptxd_get_ptxconf PTXCONF_KERNEL_VERSION)" "${kernellink}" - fi - exit ${retval} + exit ${?} ;; kernelconfig) @@ -1842,17 +1831,8 @@ parse_second() ;; platform) - if [ -L "${kernellink}" ]; then - rm -f -- "${kernellink}" - fi - do_select platformconfig "${1}" - local retval=${?} - - if [ -n "$(ptxd_get_ptxconf PTXCONF_KERNEL_SYMLINK_IN_PROJECTDIR)" ]; then - ln -sf "${BUILDDIR}/linux-$(ptxd_get_ptxconf PTXCONF_KERNEL_VERSION)" "${kernellink}" - fi - exit ${retval} + exit ${?} ;; collection) diff --git a/platforms/kernel.in b/platforms/kernel.in index 176cd11ab..caafd9d68 100644 --- a/platforms/kernel.in +++ b/platforms/kernel.in @@ -264,26 +264,4 @@ config KERNEL_EXTRA_MAKEVARS * V=1 Increase verbosity when compiling -config KERNEL_LOCAL_FLAG - prompt "Local kernel tree" - bool - help - Do not download a kernel archive, but use a local kernel tree - (most probably a working tree from a git repository). Its path - is concatenated from SETUP_KERNELDIR_PREFIX defined in setup - and KERNEL_VERSION from above. - - This function is mostly needed by developers who want to test their - patches against a git-tree. - -config KERNEL_SYMLINK_IN_PROJECTDIR - prompt "Symlink to kernel tree" - bool - help - Create a symlink named '.kernel' in the workspace directory pointing to - the currently selected kernel. This is a shortcut for developers often - working with kernel sources. It can also prevent to accidently work on - an unselected kernel. Note that the link may be invalid unless you have - extracted the specified kernel version. - endif # KERNEL 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 |