diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-07-01 12:49:11 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-07-01 12:49:11 +0200 |
| commit | 2184b2862fd610efa771eac6364bbfe330684553 (patch) | |
| tree | a761b1d028c82db0f657dd348c4daa80953bb8ea /recipes/linux | |
| parent | 6d13b52b667b3318b1da6522d462532649907a18 (diff) | |
| parent | 81531b3915b61faf3f449bc00f01e3f8e14b48b0 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/linux')
| -rw-r--r-- | recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/defconfig (renamed from recipes/linux/linux-2.6.29+2.6.30-rc4/linux-2.6.30-rc4/tx25/defconfig) | 0 | ||||
| -rw-r--r-- | recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/linux-2.6.30-rc4-git.patch (renamed from recipes/linux/linux-2.6.29+2.6.30-rc4/linux-2.6.30-rc4/tx25/linux-2.6.30-rc4-git.patch) | 0 | ||||
| -rw-r--r-- | recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/linux-2.6.30-rc4-karo.diff (renamed from recipes/linux/linux-2.6.29+2.6.30-rc4/linux-2.6.30-rc4/tx25/linux-2.6.30-rc4-karo.diff) | 0 | ||||
| -rw-r--r-- | recipes/linux/linux_2.6.29+2.6.30-rc4.bb | 6 | ||||
| -rw-r--r-- | recipes/linux/linux_2.6.30-rc4.bb | 15 |
5 files changed, 5 insertions, 16 deletions
diff --git a/recipes/linux/linux-2.6.29+2.6.30-rc4/linux-2.6.30-rc4/tx25/defconfig b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/defconfig index 290f8df24c..290f8df24c 100644 --- a/recipes/linux/linux-2.6.29+2.6.30-rc4/linux-2.6.30-rc4/tx25/defconfig +++ b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/defconfig diff --git a/recipes/linux/linux-2.6.29+2.6.30-rc4/linux-2.6.30-rc4/tx25/linux-2.6.30-rc4-git.patch b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/linux-2.6.30-rc4-git.patch index b030555df6..b030555df6 100644 --- a/recipes/linux/linux-2.6.29+2.6.30-rc4/linux-2.6.30-rc4/tx25/linux-2.6.30-rc4-git.patch +++ b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/linux-2.6.30-rc4-git.patch diff --git a/recipes/linux/linux-2.6.29+2.6.30-rc4/linux-2.6.30-rc4/tx25/linux-2.6.30-rc4-karo.diff b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/linux-2.6.30-rc4-karo.diff index 17765b46f6..17765b46f6 100644 --- a/recipes/linux/linux-2.6.29+2.6.30-rc4/linux-2.6.30-rc4/tx25/linux-2.6.30-rc4-karo.diff +++ b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/linux-2.6.30-rc4-karo.diff diff --git a/recipes/linux/linux_2.6.29+2.6.30-rc4.bb b/recipes/linux/linux_2.6.29+2.6.30-rc4.bb index 3c79c45a64..8a6599553c 100644 --- a/recipes/linux/linux_2.6.29+2.6.30-rc4.bb +++ b/recipes/linux/linux_2.6.29+2.6.30-rc4.bb @@ -18,10 +18,11 @@ DEFAULT_PREFERENCE_poodle = "-1" DEFAULT_PREFERENCE_spitz = "-1" DEFAULT_PREFERENCE_tosa = "-1" DEFAULT_PREFERENCE_afeb9260 = "1" +DEFAULT_PREFERENCE_tx25 = "1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${OLD_KERNEL_RELEASE}.tar.bz2 \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_RELEASE}.bz2;patch=1 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.30/patch-${KERNEL_RELEASE}.bz2;patch=1 \ file://defconfig" SRC_URI_append_afeb9260 = " \ @@ -30,3 +31,6 @@ SRC_URI_append_afeb9260 = " \ file://0004-AFEB9260-ASoC-driver.patch;patch=1 \ " +SRC_URI_append_tx25 = " file://linux-2.6.30-rc4-git.patch;patch=1 \ + file://linux-2.6.30-rc4-karo.diff;patch=1" + diff --git a/recipes/linux/linux_2.6.30-rc4.bb b/recipes/linux/linux_2.6.30-rc4.bb deleted file mode 100644 index d4f7fdd8fe..0000000000 --- a/recipes/linux/linux_2.6.30-rc4.bb +++ /dev/null @@ -1,15 +0,0 @@ -require linux.inc - -PV = "2.6.29+2.6.30-rc4" - -S = "${WORKDIR}/linux-2.6.30-rc4" - -# Mark archs/machines that this kernel supports -DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_tx25 = "1" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/linux-${PV}.tar.bz2 \ - file://defconfig" - -SRC_URI_append_tx25 = " linux-2.6.30-rc4-git.patch;patch=1 \ - file://linux-2.6.30-rc4-karo.diff;patch=1" |