From: Koen Kooi <koen@openembedded.org>
Date: Sun, 26 Jun 2005 10:28:58 +0000 (+0000)
Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
X-Git-Tag: Release-2010-05/1~9453^2~4349
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c19e9f9db79fb40d5c6be2959cc70225358e0b37;p=openembedded.git

Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/06/26 12:28:14+02:00 utwente.nl!koen
linux-omap1_2.6.12_rc2.bb:
  revert my misguided change to src_uri

BKrev: 42be836aRIXFs7NExqmd5ZN6APKbqA
---

diff --git a/packages/linux/linux-omap1_2.6.12_rc2.bb b/packages/linux/linux-omap1_2.6.12_rc2.bb
index f59999c770..a4c407eecd 100644
--- a/packages/linux/linux-omap1_2.6.12_rc2.bb
+++ b/packages/linux/linux-omap1_2.6.12_rc2.bb
@@ -3,9 +3,9 @@ DESCRIPTION = "Linux kernel for OMAP processors"
 LICENSE = "GPL"
 
 SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.12-rc2.tar.bz2 \
-           http://www.muru.com/linux/omap/patches/patch-2.6.12-rc2-omap1.bz2;patch=1"
+           http://www.muru.com/linux/omap/patches/patch-2.6.12-rc2-omap1.bz2;patch=1 \
+	   file://defconfig"
 
-SRC_URI_append_omap5912osk = "file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.12-rc2"