diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/prism3-support/files/hostap-fw-load | 2 | ||||
-rw-r--r-- | packages/prism3-support/prism3-support_1.0.0.bb | 2 | ||||
-rw-r--r-- | packages/udev/files/local.rules | 2 | ||||
-rw-r--r-- | packages/udev/files/network.sh | 26 | ||||
-rw-r--r-- | packages/udev/udev.inc | 2 | ||||
-rw-r--r-- | packages/udev/udev_071.bb | 2 |
6 files changed, 34 insertions, 2 deletions
diff --git a/packages/prism3-support/files/hostap-fw-load b/packages/prism3-support/files/hostap-fw-load index 538a4a7836..0b2aec51a8 100644 --- a/packages/prism3-support/files/hostap-fw-load +++ b/packages/prism3-support/files/hostap-fw-load @@ -2,6 +2,8 @@ # 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 iwpriv "$IFACE" reset 1 diff --git a/packages/prism3-support/prism3-support_1.0.0.bb b/packages/prism3-support/prism3-support_1.0.0.bb index 12a8caea81..dfe3f5a9fb 100644 --- a/packages/prism3-support/prism3-support_1.0.0.bb +++ b/packages/prism3-support/prism3-support_1.0.0.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" DEPENDS = "prism3-firmware hostap-utils" RDEPENDS = "prism3-firmware hostap-utils" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -PR = "r0" +PR = "r1" PACKAGE_ARCH = "all" SRC_URI = "file://hostap-fw-load" diff --git a/packages/udev/files/local.rules b/packages/udev/files/local.rules index 95b3e10830..4bcaaa8aba 100644 --- a/packages/udev/files/local.rules +++ b/packages/udev/files/local.rules @@ -1,3 +1,5 @@ SUBSYSTEM=="block", ACTION=="add" RUN+="/etc/udev/scripts/mount.sh" SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh" +SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh" +SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh" diff --git a/packages/udev/files/network.sh b/packages/udev/files/network.sh new file mode 100644 index 0000000000..2cfbfa91b3 --- /dev/null +++ b/packages/udev/files/network.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +# Do not run when pcmcia-cs is installed +test -x /sbin/cardctl && exit 0 + +# We get two "add" events for hostap cards due to wifi0 +echo "$INTERFACE" | grep -q wifi && exit 0 + +# +# Code taken from pcmcia-cs:/etc/pcmcia/network +# + +# if this interface has an entry in /etc/network/interfaces, let ifupdown +# handle it +if grep -q "iface \+$INTERFACE" /etc/network/interfaces; then + case $ACTION in + add) + ifup $INTERFACE + ;; + remove) + ifdown $INTERFACE + ;; + esac + + exit 0 +fi diff --git a/packages/udev/udev.inc b/packages/udev/udev.inc index 2387d07945..a3896a6978 100644 --- a/packages/udev/udev.inc +++ b/packages/udev/udev.inc @@ -8,6 +8,7 @@ SRC_URI += " \ file://links.conf \ file://permissions.rules \ file://mount.sh \ + file://network.sh \ file://local.rules \ file://init" @@ -56,4 +57,5 @@ do_install () { install -d ${D}${sysconfdir}/udev/scripts/ install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh + install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts } diff --git a/packages/udev/udev_071.bb b/packages/udev/udev_071.bb index e5f0409b17..4540720fc7 100644 --- a/packages/udev/udev_071.bb +++ b/packages/udev/udev_071.bb @@ -6,7 +6,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ include udev.inc -PR = "r5" +PR = "r6" UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" |