From b4cb437c6595ff8ac13506e502fe04b1a60c4e04 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 9 May 2006 18:38:19 +0000 Subject: Merge packages changes from OE into poky. git-svn-id: https://svn.o-hand.com/repos/poky/trunk@386 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- openembedded/packages/prism3-support/files/hostap-fw-load | 12 +++++++++--- openembedded/packages/prism3-support/prism3-support_1.0.0.bb | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'openembedded/packages/prism3-support') diff --git a/openembedded/packages/prism3-support/files/hostap-fw-load b/openembedded/packages/prism3-support/files/hostap-fw-load index 0b2aec51a..00df1ef84 100644 --- a/openembedded/packages/prism3-support/files/hostap-fw-load +++ b/openembedded/packages/prism3-support/files/hostap-fw-load @@ -1,11 +1,17 @@ #!/bin/sh +if test -e /sbin/cardctl; then + CARDCTL=/sbin/cardctl +elif test -e /sbin/pccardctl; then + CARDCTL=/sbin/pccardctl +else + exit 0 +fi + # Special case for prism3 cards needing firmware upload # Add more known manfids, if necessary - -test -x /sbin/cardctl || exit 0 -if [ `cardctl info|grep "d601,0010\|d601,0101"` ]; then +if [ `$CARDCTL info|grep "d601,0010\|d601,0101"` ]; then iwpriv "$IFACE" reset 1 hostap_fw_load "$IFACE" fi diff --git a/openembedded/packages/prism3-support/prism3-support_1.0.0.bb b/openembedded/packages/prism3-support/prism3-support_1.0.0.bb index dfe3f5a9f..85f1391ed 100644 --- a/openembedded/packages/prism3-support/prism3-support_1.0.0.bb +++ b/openembedded/packages/prism3-support/prism3-support_1.0.0.bb @@ -4,8 +4,8 @@ LICENSE = "GPL" DEPENDS = "prism3-firmware hostap-utils" RDEPENDS = "prism3-firmware hostap-utils" MAINTAINER = "Michael 'Mickey' Lauer " -PR = "r1" PACKAGE_ARCH = "all" +PR = "r2" SRC_URI = "file://hostap-fw-load" -- cgit v1.2.3