[oe-commits] Ulf Samuelsson : Use the in-tree patches in linux
git version control
git at git.openembedded.org
Thu Aug 13 23:33:39 UTC 2009
Module: openembedded.git
Branch: ulf/linux-2.6.30.2
Commit: 68f2ccca7cb6e885ef4ca6ee2b53df80c680f084
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=68f2ccca7cb6e885ef4ca6ee2b53df80c680f084
Author: Ulf Samuelsson <ulf.samuelsson at atmel.com>
Date: Fri Aug 14 01:32:56 2009 +0200
Use the in-tree patches in linux
---
.../linux/linux-2.6.30.2-at91-kernel-config.inc | 25 +++--
recipes/linux/linux_2.6.30.2.bb | 91 ++++++++++++-------
2 files changed, 72 insertions(+), 44 deletions(-)
diff --git a/recipes/linux/linux-2.6.30.2-at91-kernel-config.inc b/recipes/linux/linux-2.6.30.2-at91-kernel-config.inc
index 72d2201..91c80aa 100644
--- a/recipes/linux/linux-2.6.30.2-at91-kernel-config.inc
+++ b/recipes/linux/linux-2.6.30.2-at91-kernel-config.inc
@@ -5,28 +5,33 @@
# ----------------------------------------------
# Supported in kernel
-SRC_URI_append_at91cap9adk = \
- "ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+SRC_URI_append_at91cap9adk = "\
+ ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+ file://linux-2.6.30.2-configurable-NAND-partition-size.patch;patch=1 \
"
# Not supported in kernel - uses "at91cap9adk_defconfig"
-SRC_URI_append_at91cap9stk = \
- "ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+SRC_URI_append_at91cap9stk = "\
+ ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+ file://linux-2.6.30.2-configurable-NAND-partition-size.patch;patch=1 \
"
# Not supported in kernel - broken
-SRC_URI_append_at91sam9m10ek = \
- "ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+SRC_URI_append_at91sam9m10ek = "\
+ ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+ file://linux-2.6.30.2-configurable-NAND-partition-size.patch;patch=1 \
"
# Supported in kernel
-SRC_URI_append_at91sam9rlek = \
- "ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+SRC_URI_append_at91sam9rlek = "\
+ ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+ file://linux-2.6.30.2-configurable-NAND-partition-size.patch;patch=1 \
"
# Supported in kernel
-SRC_URI_append_at572d940hfek = \
- "ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+SRC_URI_append_at572d940hfek = "\
+ ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+ file://linux-2.6.30.2-configurable-NAND-partition-size.patch;patch=1 \
"
diff --git a/recipes/linux/linux_2.6.30.2.bb b/recipes/linux/linux_2.6.30.2.bb
index 766ec8c..4dc34cc 100644
--- a/recipes/linux/linux_2.6.30.2.bb
+++ b/recipes/linux/linux_2.6.30.2.bb
@@ -7,6 +7,8 @@ S = "${WORKDIR}/linux-2.6.30"
# Mark archs/machines that this kernel supports
DEFAULT_PREFERENCE = "-1"
+FILEDIR = "${FILE_DIRNAME}/${P}/arch-at91"
+
DEFAULT_PREFERENCE_at91sam9g10ek = "2"
DEFAULT_PREFERENCE_at91sam9g20ek = "2"
DEFAULT_PREFERENCE_at91sam9g45ek = "2"
@@ -24,89 +26,110 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.30.tar.bz2 \
"
-SRC_URI_append_at91sam9g10df = \
- "ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+SRC_URI_append_at91sam9g10df = "\
+ file://../arch-at91/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+ file://../arch-at91/linux-2.6.30.2-configurable-NAND-partition-size.patch;patch=1 \
file://defconfig \
"
-SRC_URI_append_at91sam9g20dfc = \
- "ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+# ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+
+
+
+SRC_URI_append_at91sam9g20dfc = "\
+ file://../arch-at91/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+ file://../arch-at91/linux-2.6.30.2-configurable-NAND-partition-size.patch;patch=1 \
file://defconfig \
"
-SRC_URI_append_at91sam9g45ek = \
- "ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+SRC_URI_append_at91sam9g45ek = "\
+ file://../arch-at91/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+ file://../arch-at91/linux-2.6.30.2-configurable-NAND-partition-size.patch;patch=1 \
file://defconfig \
"
-SRC_URI_append_at91sam9xedfc = \
- "ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+SRC_URI_append_at91sam9xedfc = "\
+ file://../arch-at91/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+ file://../arch-at91/linux-2.6.30.2-configurable-NAND-partition-size.patch;patch=1 \
file://defconfig \
"
-SRC_URI_append_at91sam9260dfc = \
- "ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+SRC_URI_append_at91sam9260dfc = "\
+ file://../arch-at91/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+ file://../arch-at91/linux-2.6.30.2-configurable-NAND-partition-size.patch;patch=1 \
file://defconfig \
"
-SRC_URI_append_at91sam9261df = \
- "ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+SRC_URI_append_at91sam9261df = "\
+ file://../arch-at91/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+ file://../arch-at91/linux-2.6.30.2-configurable-NAND-partition-size.patch;patch=1 \
file://defconfig \
"
-SRC_URI_append_at91sam9263dfc = \
- "ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+SRC_URI_append_at91sam9263dfc = "\
+ file://../arch-at91/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+ file://../arch-at91/linux-2.6.30.2-configurable-NAND-partition-size.patch;patch=1 \
file://defconfig \
"
# -------------------------
-SRC_URI_append_at91sam9260df = \
- "ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+SRC_URI_append_at91sam9260df = "\
+ file://../arch-at91/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+ file://../arch-at91/linux-2.6.30.2-configurable-NAND-partition-size.patch;patch=1 \
file://defconfig \
"
-SRC_URI_append_at91sam9260ek = \
- "ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+SRC_URI_append_at91sam9260ek = "\
+ file://../arch-at91/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+ file://../arch-at91/linux-2.6.30.2-configurable-NAND-partition-size.patch;patch=1 \
file://defconfig \
"
-SRC_URI_append_at91sam9260nf = \
- "ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+SRC_URI_append_at91sam9260nf = "\
+ file://../arch-at91/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+ file://../arch-at91/linux-2.6.30.2-configurable-NAND-partition-size.patch;patch=1 \
file://defconfig \
"
-SRC_URI_append_at91sam9261ek = \
- "ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+SRC_URI_append_at91sam9261ek = "\
+ file://../arch-at91/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+ file://../arch-at91/linux-2.6.30.2-configurable-NAND-partition-size.patch;patch=1 \
file://defconfig \
"
-SRC_URI_append_at91sam9263ek = \
- "ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+SRC_URI_append_at91sam9263ek = "\
+ file://../arch-at91/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+ file://../arch-at91/linux-2.6.30.2-configurable-NAND-partition-size.patch;patch=1 \
file://defconfig \
"
-SRC_URI_append_at91sam9g10ek = \
- "ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+SRC_URI_append_at91sam9g10ek = "\
+ file://../arch-at91/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+ file://../arch-at91/linux-2.6.30.2-configurable-NAND-partition-size.patch;patch=1 \
file://defconfig \
"
-SRC_URI_append_at91sam9g10nf = \
- "ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+SRC_URI_append_at91sam9g10nf = "\
+ file://../arch-at91/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+ file://../arch-at91/linux-2.6.30.2-configurable-NAND-partition-size.patch;patch=1 \
file://defconfig \
"
-SRC_URI_append_at91sam9g20df = \
- "ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+SRC_URI_append_at91sam9g20df = "\
+ file://../arch-at91/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+ file://../arch-at91/linux-2.6.30.2-configurable-NAND-partition-size.patch;patch=1 \
file://defconfig \
"
-SRC_URI_append_at91sam9g20ek = \
- "ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+SRC_URI_append_at91sam9g20ek = "\
+ file://../arch-at91/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+ file://../arch-at91/linux-2.6.30.2-configurable-NAND-partition-size.patch;patch=1 \
file://defconfig \
"
-SRC_URI_append_at91sam9g20nf = \
- "ftp://www.at91.com/pub/buildroot/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+SRC_URI_append_at91sam9g20nf = "\
+ file://../arch-at91/linux-2.6.30.2-at91-001.patch.gz;patch=1 \
+ file://../arch-at91/linux-2.6.30.2-configurable-NAND-partition-size.patch;patch=1 \
file://defconfig \
"
More information about the Openembedded-commits
mailing list