From c26c4c8a89c47afeb6624e3b33e491d918f4da52 Mon Sep 17 00:00:00 2001
From: Karol Sokolowski <sokoowpwr@o2.pl>
Date: Fri, 1 Jun 2007 13:51:17 +0000
Subject: amsdelta-oe: fix typo - close #2408

---
 conf/distro/amsdelta-oe.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf
index 6e7adda029..6d3ad7bd6b 100644
--- a/conf/distro/amsdelta-oe.conf
+++ b/conf/distro/amsdelta-oe.conf
@@ -2,7 +2,7 @@ DISTRO = "amsdelta-oe"
 DISTRO_NAME = "AmsDelta Linux"
 DISTRO_VERSION = "unstable-${DATE}"
 
-require conf/distro/ansgstrom-2007.1.conf
+require conf/distro/angstrom-2007.1.conf
 
 
 DISTRO_TYPE = "debug"
-- 
cgit v1.2.3


From cb5a149f701dde19bd27ba87f89ca673085b7c6b Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 1 Jun 2007 14:01:01 +0000
Subject: task-base/pcmcia-cs: moved hostap-conf/orinoco-conf to RDEPENDS of
 pcmcia-cs package as pcmciautils does not need that

---
 packages/pcmcia-cs/pcmcia-cs_3.2.8.bb | 3 ++-
 packages/tasks/task-base.bb           | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
index 3f4472b501..018f33550f 100644
--- a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
+++ b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
@@ -3,7 +3,8 @@ SECTION = "base"
 PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel"
-PR = "r27"
+RDEPENDS = "hostap-conf orinoco-conf"
+PR = "r28"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \
 	   file://busybox.patch;patch=1 \
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index a4579cf8c3..a164fa550d 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r34"
+PR = "r35"
 
 PROVIDES = "${PACKAGES}"
 PACKAGES = 'task-boot \
@@ -234,7 +234,6 @@ RDEPENDS_task-base-pcmcia = "\
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'prism3-firmware', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'prism3-support', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'spectrum-fw', '',d)} \
-    ${@base_contains('DISTRO_FEATURES', 'wifi', 'hostap-conf', '',d)} \
     "
 
 RRECOMMENDS_task-base-pcmcia = "\
-- 
cgit v1.2.3