summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2007-05-04 08:13:56 +0000
committerSascha Hauer <s.hauer@pengutronix.de>2007-05-04 08:13:56 +0000
commit00ad2495ebac3cfaf791f451a3302aee24d49684 (patch)
treea22f5f613cc2e5fc8f859b7a6c0d16ec96d6bae5
parent8fc0598653390d9253f4a6bce6f54d3eb3b08d48 (diff)
downloadptxdist-00ad2495ebac3cfaf791f451a3302aee24d49684.tar.gz
ptxdist-00ad2495ebac3cfaf791f451a3302aee24d49684.tar.xz
* do not use kernel-patches-target and kernel-patches-native
anymore. The kernel patches are now placed under patches/linux-version like for every other package git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7136 33e552b5-05e3-0310-8538-816dae2090ed
-rw-r--r--README3
-rw-r--r--rules/kernel.in4
-rw-r--r--rules/kernel.make5
3 files changed, 2 insertions, 10 deletions
diff --git a/README b/README
index bc3454952..c23239388 100644
--- a/README
+++ b/README
@@ -68,9 +68,6 @@ Directory Layout
These files and directories are supposed to be in an empty project
directory:
-kernel-patches-native/ contains patch series for the kernel which is
- compiled natively (for simulation)
-kernel-patches-target/ contains patch series for the target kernel
kernelconfig.native kernel .config file for the native kernel
kernelconfig.target kernel .config file for the target kernel
patches/ project specific patches, overwrites the generic
diff --git a/rules/kernel.in b/rules/kernel.in
index f749a5654..30c86abdf 100644
--- a/rules/kernel.in
+++ b/rules/kernel.in
@@ -65,9 +65,7 @@ config KERNEL_SERIES
default ""
help
This entry specifies a patch series file which has to live in
- this directory:
-
- $PTXDIST_WORKSPACE/kernel-patches-target
+ the kernel patches directory:
The series file contains lines with names of patch files which
are then being applied to the kernel.
diff --git a/rules/kernel.make b/rules/kernel.make
index c83f6bbde..c1e8b049c 100644
--- a/rules/kernel.make
+++ b/rules/kernel.make
@@ -25,7 +25,6 @@ KERNEL_SOURCE := $(SRCDIR)/$(KERNEL).$(KERNEL_SUFFIX)
KERNEL_DIR := $(BUILDDIR)/$(KERNEL)
KERNEL_CONFIG := $(call remove_quotes,$(PTXDIST_WORKSPACE)/$(PTXCONF_KERNEL$(KERNEL_STYLE)_CONFIG))
-KERNEL_SERIES := $(PTXDIST_WORKSPACE)/kernel-patches$(KERNEL_style)/$(PTXCONF_KERNEL$(KERNEL_STYLE)_SERIES)
KERNEL_DIR_INSTALL := $(KERNEL_DIR)-install
@@ -81,9 +80,7 @@ $(STATEDIR)/kernel.extract: $(kernel_extract_deps_default)
@$(call targetinfo, $@)
@$(call clean, $(KERNEL_DIR))
@$(call extract, KERNEL)
-ifneq ($(PTXCONF_KERNEL_SERIES),"")
- @$(call patchin, KERNEL,,$(KERNEL_SERIES))
-endif
+ @$(call patchin, KERNEL)
@$(call touch, $@)
# ----------------------------------------------------------------------------