Patchwork [04/12] udev-rules-buglabs: sync with buglabs repository

login
register
mail settings
Submitter Denis Carikli
Date May 13, 2011, 12:43 p.m.
Message ID <1305290588-7057-4-git-send-email-GNUtoo@no-log.org>
Download mbox | patch
Permalink /patch/3947/
State Accepted
Headers show

Comments

Denis Carikli - May 13, 2011, 12:43 p.m.
This commit fixes the following issue:
 * apache felix crashed without the input/user_button on 2.6.35
   for the bug20 machine

The changes were taken from https://github.com/buglabs/oe-buglabs.git
  at commit f6169d03b37d7832ea9372a479469df5f556848b

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
---
 recipes/udev-rules-buglabs/bug-udev/00-bug20.rules |    7 ++++---
 .../udev-rules-buglabs/bug-udev/wlan-trigger.sh    |    7 +++++++
 recipes/udev-rules-buglabs/bug-udev_0.1.bb         |    9 +++++----
 3 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 recipes/udev-rules-buglabs/bug-udev/wlan-trigger.sh
Stefan Schmidt - May 13, 2011, 6:10 p.m.
Hello.

On Fri, 2011-05-13 at 14:43, Denis 'GNUtoo' Carikli wrote:
> This commit fixes the following issue:
>  * apache felix crashed without the input/user_button on 2.6.35
>    for the bug20 machine

I had this patch locally but not pushed to master yet. I'll drop mine.

Acked-by: Stefan Schmidt <stefan@buglabs.net>


> The changes were taken from https://github.com/buglabs/oe-buglabs.git
>   at commit f6169d03b37d7832ea9372a479469df5f556848b
> 
> Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
> ---
>  recipes/udev-rules-buglabs/bug-udev/00-bug20.rules |    7 ++++---
>  .../udev-rules-buglabs/bug-udev/wlan-trigger.sh    |    7 +++++++
>  recipes/udev-rules-buglabs/bug-udev_0.1.bb         |    9 +++++----
>  3 files changed, 16 insertions(+), 7 deletions(-)
>  create mode 100644 recipes/udev-rules-buglabs/bug-udev/wlan-trigger.sh
> 
> diff --git a/recipes/udev-rules-buglabs/bug-udev/00-bug20.rules b/recipes/udev-rules-buglabs/bug-udev/00-bug20.rules
> index 0722c5c..946c89c 100644
> --- a/recipes/udev-rules-buglabs/bug-udev/00-bug20.rules
> +++ b/recipes/udev-rules-buglabs/bug-udev/00-bug20.rules
> @@ -12,12 +12,13 @@ KERNEL=="ttySC1", SUBSYSTEMS=="platform", SYMLINK+="ttyBMI3"
>  ACTION=="add" KERNEL=="mmcblk1*", RUN+="/sbin/modprobe g_file_storage file=/dev/%k removable=1"
>  ACTION=="remove" KERNEL=="mmcblk1*", RUN+="/sbin/modprobe -r g_file_storage"
>  # For Novatel USB 3G (CDMA) Dongle
> -ATTRS{idVendor}=="1410", ATTRS{idProduct}=="5030", RUN+="/usr/bin/eject %k"
> -ATTRS{idVendor}=="1410", ATTRS{idProduct}=="6000", RUN+="/sbin/modprobe usbserial vendor=0x1410 product=0x6000"
> +SUBSYSTEMS=="scsi",DRIVERS=="sr",ATTRS{vendor}=="Novatel ",ACTION=="add",RUN+="/usr/bin/eject %k"
>  # For Sprint U301 3g/4g
>  ATTRS{idVendor}=="1a40", ATTRS{idProduct}=="0101", RUN+="/usr/bin/eject %k" 
>  ATTRS{idVendor}=="16d8", ATTRS{idProduct}=="6008" RUN+="/sbin/modprobe usbserial vendor=0x16d8 product=0x6008"
>  # For libertas_sdio named eth1
>  SUBSYSTEMS=="sdio", DRIVERS=="libertas_sdio", NAME="wlan0"
>  KERNEL=="event*",ATTRS{name}=="twl4030_pwrbutton",SYMLINK+="input/power_button"
> -KERNEL=="event*",ATTRS{name}=="omap_twl4030keypad",SYMLINK+="input/user_button"
> +KERNEL=="event*",ATTRS{name}=="TWL4030 Keypad",SYMLINK+="input/user_button"
> +# Set eth1assoc as the default trigger for the wifi-green LED
> +SUBSYSTEMS=="sdio", DRIVERS=="libertas_sdio", NAME="wlan0", RUN+="/etc/udev/scripts/wlan-trigger.sh"
> diff --git a/recipes/udev-rules-buglabs/bug-udev/wlan-trigger.sh b/recipes/udev-rules-buglabs/bug-udev/wlan-trigger.sh
> new file mode 100644
> index 0000000..1eb4ca1
> --- /dev/null
> +++ b/recipes/udev-rules-buglabs/bug-udev/wlan-trigger.sh
> @@ -0,0 +1,7 @@
> +#!/bin/sh
> +if [ -e /sys/class/net/eth0 ]; then
> +    echo phy1assoc > /sys/class/leds/omap3bug\:green\:wifi/trigger
> +else
> +    echo phy0assoc > /sys/class/leds/omap3bug\:green\:wifi/trigger
> +fi
> +echo none > /sys/class/leds/omap3bug\:red\:wifi/trigger
> diff --git a/recipes/udev-rules-buglabs/bug-udev_0.1.bb b/recipes/udev-rules-buglabs/bug-udev_0.1.bb
> index b9238fa..35db9e3 100644
> --- a/recipes/udev-rules-buglabs/bug-udev_0.1.bb
> +++ b/recipes/udev-rules-buglabs/bug-udev_0.1.bb
> @@ -3,14 +3,15 @@ LICENSE = "GPL"
>  SECTION = "x11"
>  PRIORITY = "optional"
>  RDEPENDS_${PN} = "udev"
> -PR = "r25"
> +PR = "r26"
>  
>  SRC_URI = "file://00-bug20.rules \
> -	   file://bmi_eventpipe.sh \
> -	   file://bt_init.sh \
> -	   file://working.psr \
> +           file://bmi_eventpipe.sh \
> +           file://bt_init.sh \
> +           file://working.psr \
>             file://mbkb-stop.sh \
>             file://mbkb-start.sh \
> +           file://wlan-trigger.sh \
>             "
>  
>  S = "${WORKDIR}"
> -- 
> 1.7.0.4
>

Patch

diff --git a/recipes/udev-rules-buglabs/bug-udev/00-bug20.rules b/recipes/udev-rules-buglabs/bug-udev/00-bug20.rules
index 0722c5c..946c89c 100644
--- a/recipes/udev-rules-buglabs/bug-udev/00-bug20.rules
+++ b/recipes/udev-rules-buglabs/bug-udev/00-bug20.rules
@@ -12,12 +12,13 @@  KERNEL=="ttySC1", SUBSYSTEMS=="platform", SYMLINK+="ttyBMI3"
 ACTION=="add" KERNEL=="mmcblk1*", RUN+="/sbin/modprobe g_file_storage file=/dev/%k removable=1"
 ACTION=="remove" KERNEL=="mmcblk1*", RUN+="/sbin/modprobe -r g_file_storage"
 # For Novatel USB 3G (CDMA) Dongle
-ATTRS{idVendor}=="1410", ATTRS{idProduct}=="5030", RUN+="/usr/bin/eject %k"
-ATTRS{idVendor}=="1410", ATTRS{idProduct}=="6000", RUN+="/sbin/modprobe usbserial vendor=0x1410 product=0x6000"
+SUBSYSTEMS=="scsi",DRIVERS=="sr",ATTRS{vendor}=="Novatel ",ACTION=="add",RUN+="/usr/bin/eject %k"
 # For Sprint U301 3g/4g
 ATTRS{idVendor}=="1a40", ATTRS{idProduct}=="0101", RUN+="/usr/bin/eject %k" 
 ATTRS{idVendor}=="16d8", ATTRS{idProduct}=="6008" RUN+="/sbin/modprobe usbserial vendor=0x16d8 product=0x6008"
 # For libertas_sdio named eth1
 SUBSYSTEMS=="sdio", DRIVERS=="libertas_sdio", NAME="wlan0"
 KERNEL=="event*",ATTRS{name}=="twl4030_pwrbutton",SYMLINK+="input/power_button"
-KERNEL=="event*",ATTRS{name}=="omap_twl4030keypad",SYMLINK+="input/user_button"
+KERNEL=="event*",ATTRS{name}=="TWL4030 Keypad",SYMLINK+="input/user_button"
+# Set eth1assoc as the default trigger for the wifi-green LED
+SUBSYSTEMS=="sdio", DRIVERS=="libertas_sdio", NAME="wlan0", RUN+="/etc/udev/scripts/wlan-trigger.sh"
diff --git a/recipes/udev-rules-buglabs/bug-udev/wlan-trigger.sh b/recipes/udev-rules-buglabs/bug-udev/wlan-trigger.sh
new file mode 100644
index 0000000..1eb4ca1
--- /dev/null
+++ b/recipes/udev-rules-buglabs/bug-udev/wlan-trigger.sh
@@ -0,0 +1,7 @@ 
+#!/bin/sh
+if [ -e /sys/class/net/eth0 ]; then
+    echo phy1assoc > /sys/class/leds/omap3bug\:green\:wifi/trigger
+else
+    echo phy0assoc > /sys/class/leds/omap3bug\:green\:wifi/trigger
+fi
+echo none > /sys/class/leds/omap3bug\:red\:wifi/trigger
diff --git a/recipes/udev-rules-buglabs/bug-udev_0.1.bb b/recipes/udev-rules-buglabs/bug-udev_0.1.bb
index b9238fa..35db9e3 100644
--- a/recipes/udev-rules-buglabs/bug-udev_0.1.bb
+++ b/recipes/udev-rules-buglabs/bug-udev_0.1.bb
@@ -3,14 +3,15 @@  LICENSE = "GPL"
 SECTION = "x11"
 PRIORITY = "optional"
 RDEPENDS_${PN} = "udev"
-PR = "r25"
+PR = "r26"
 
 SRC_URI = "file://00-bug20.rules \
-	   file://bmi_eventpipe.sh \
-	   file://bt_init.sh \
-	   file://working.psr \
+           file://bmi_eventpipe.sh \
+           file://bt_init.sh \
+           file://working.psr \
            file://mbkb-stop.sh \
            file://mbkb-start.sh \
+           file://wlan-trigger.sh \
            "
 
 S = "${WORKDIR}"