From a029c974983879c1f656d655158ed8a62b241952 Mon Sep 17 00:00:00 2001
From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Thu, 16 Aug 2007 17:52:51 +0000
Subject: linux-x86-2.6.20: Use ARCH override, not MACHINE override to bring in
 correct defconfig. Should be safe for current i?86-generic machines.

---
 packages/linux/linux-x86_2.6.20.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'packages/linux')

diff --git a/packages/linux/linux-x86_2.6.20.bb b/packages/linux/linux-x86_2.6.20.bb
index 969fd55f0e..8688725bd7 100644
--- a/packages/linux/linux-x86_2.6.20.bb
+++ b/packages/linux/linux-x86_2.6.20.bb
@@ -1,13 +1,13 @@
 DESCRIPTION = "Linux Kernel for x86 compatible machines"
 SECTION = "kernel"
 LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 " 
 
 SRC_URI_append_x86 = "file://i486-defconfig"
-SRC_URI_append_i586-generic = "file://i586-defconfig"
-SRC_URI_append_i686-generic = "file://i686-defconfig"
+SRC_URI_append_i586 = "file://i586-defconfig"
+SRC_URI_append_i686 = "file://i686-defconfig"
 
 
 S = "${WORKDIR}/linux-${PV}"
-- 
cgit v1.2.3


From 8aef461d33cd252c0d2d3f89a8a6aea3d807f9bf Mon Sep 17 00:00:00 2001
From: Philip Balister <philip@balister.org>
Date: Thu, 16 Aug 2007 21:43:41 +0000
Subject: linux-gumstix : Add dependency on uboot-utils. This builds mkimage so
 kernel build completes.

---
 packages/linux/linux-gumstix_2.6.15.bb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'packages/linux')

diff --git a/packages/linux/linux-gumstix_2.6.15.bb b/packages/linux/linux-gumstix_2.6.15.bb
index 90a7259d9f..9a9a4d4df3 100644
--- a/packages/linux/linux-gumstix_2.6.15.bb
+++ b/packages/linux/linux-gumstix_2.6.15.bb
@@ -3,6 +3,8 @@ SECTION = "kernel"
 LICENSE = "GPL"
 PR = "r1"
 
+DEPENDS = "uboot-utils"
+
 COMPATIBLE_MACHINE = "gumstix"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
-- 
cgit v1.2.3