diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-06-01 15:01:26 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-06-01 15:01:26 +0000 |
| commit | 261b9ad61fd9a039489b8432fc26769b4348e548 (patch) | |
| tree | e1f316e42e56d4dfd8bf70d149ddd73a1938ec82 | |
| parent | 27f69443f5d63b18bed1baa9112b94a7df61acbf (diff) | |
| parent | 32a81c73f2d14e67d711cb8e740e2efc62225dfd (diff) | |
merge of '1f4e0f888e7980338bb85c2dec1e2387e28fc91b'
and '61320145c8e5ea3c80d409d857d23c62daf28d45'
| -rw-r--r-- | conf/distro/amsdelta-oe.conf | 2 | ||||
| -rw-r--r-- | packages/pcmcia-cs/pcmcia-cs_3.2.8.bb | 3 | ||||
| -rw-r--r-- | packages/tasks/task-base.bb | 3 |
3 files changed, 4 insertions, 4 deletions
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" 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 = "\ |