From: nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>
Date: Sun, 20 Feb 2005 12:40:13 +0000 (+0000)
Subject: Merge bk://oe-devel.bkbits.net/openembedded
X-Git-Tag: Release-2010-05/1~14918
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df447e0eaacdd3d5ac09291aaa345be09e4a4faf;p=openembedded.git

Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/20 13:31:32+01:00 dyndns.org!reenoo
task-bootstrap: bump PR to force a rebuild after the change to handhelds-common.conf

2005/02/20 13:24:42+01:00 dyndns.org!reenoo
Merge oe-devel@oe-devel.bkbits.net:openembedded
into sugarcube.dyndns.org:/home2/oe/bakery/openembedded

2005/02/20 13:24:17+01:00 dyndns.org!reenoo
handhelds-common.conf: add missing space between ide-probe-mod and loop

BKrev: 4218852dV4qI1Z9ArOV70wBa3Zo-vQ
---

diff --git a/conf/machine/handheld-common.conf b/conf/machine/handheld-common.conf
index 71a8263383..ead8991eca 100644
--- a/conf/machine/handheld-common.conf
+++ b/conf/machine/handheld-common.conf
@@ -3,7 +3,7 @@ ipsec \
 nvrd \
 mip6-mn \
 tun \
-ide-cs ide-disk ide-probe-mod\
+ide-cs ide-disk ide-probe-mod \
 loop \
 vfat ext2 \
 sunrpc nfs \
diff --git a/packages/meta/task-bootstrap.bb b/packages/meta/task-bootstrap.bb
index 87f23f39fb..00074b679d 100644
--- a/packages/meta/task-bootstrap.bb
+++ b/packages/meta/task-bootstrap.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Core packages required for a basic installation"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r20"
+PR = "r21"
 
 # The BOOTSTRAP_EXTRA_ variables are often manipulated by the
 # MACHINE .conf files, so adjust PACKAGE_ARCH accordingly.