wpa-supplicant: minor edits to helper scripts for busybox compatibility.

(replace long-form "--quiet" with short-form equivalent, and bump PR)

diff --git a/packages/wpa-supplicant/files/functions.sh b/packages/wpa-supplicant/files/functions.sh
index 5132fbb..8ff0cb5 100755 (executable)
--- a/packages/wpa-supplicant/files/functions.sh
+++ b/packages/wpa-supplicant/files/functions.sh
@@ -767,7 +767,7 @@ ifup () {
                
                local WPA_MAP_STDIN
                
-               WPA_MAP_STDIN=$(set | sed --quiet 's/^\(IF_WPA_MAP[0-9]*\)=.*/echo \$\1/p')
+               WPA_MAP_STDIN=$(set | sed -n 's/^\(IF_WPA_MAP[0-9]*\)=.*/echo \$\1/p')
                
                if [ -n "$WPA_MAP_STDIN" ]; then
                        WPA_LOGICAL_IFACE=$(eval "$WPA_MAP_STDIN" | "$IF_WPA_MAPPING_SCRIPT" "$WPA_IFACE")
@@ -797,7 +797,7 @@ ifup () {
                        
                        echo "ifup $WPA_IFACE=$WPA_LOGICAL_IFACE"
                        
-                       if grep --quiet "^$WPA_IFACE=$WPA_IFACE" "$IFSTATE_FILE"; then
+                       if grep -q "^$WPA_IFACE=$WPA_IFACE" "$IFSTATE_FILE"; then
                                # Force settings over the unconfigured "master" IFACE
                                /sbin/ifup --force "$WPA_IFACE=$WPA_LOGICAL_IFACE"
                        else
@@ -816,7 +816,7 @@ ifup () {
 # Check IFACE state and ifdown as requested.
 #
 ifdown () {
-       if grep --quiet "^$WPA_IFACE" "$IFSTATE_FILE"; then
+       if grep -q "^$WPA_IFACE" "$IFSTATE_FILE"; then
                echo "ifdown $WPA_IFACE"
                /sbin/ifdown "$WPA_IFACE"
        else

diff --git a/packages/wpa-supplicant/files/ifupdown.sh b/packages/wpa-supplicant/files/ifupdown.sh
index 71486f7..4a292ac 100755 (executable)
--- a/packages/wpa-supplicant/files/ifupdown.sh
+++ b/packages/wpa-supplicant/files/ifupdown.sh
@@ -78,7 +78,7 @@ if [ -n "$IF_WPA_CONF" ]; then
                wpa_msg stderr "cannot read contents of $IF_WPA_CONF"
                exit 1
        fi      
-       WPA_SUP_CONF_CTRL_DIR=$(sed --quiet \
+       WPA_SUP_CONF_CTRL_DIR=$(sed -n \
                's/[[:space:]]*#.*//g;s/[[:space:]]\+.*$//g;s/^\(ctrl_interface\|DIR\)=\(.*\)/\2/p' "$IF_WPA_CONF")
        if [ -n "$WPA_SUP_CONF_CTRL_DIR" ]; then
                WPA_CTRL_DIR="$WPA_SUP_CONF_CTRL_DIR"

diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.10.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.10.bb
index ccded27..14186db 100644 (file)
--- a/packages/wpa-supplicant/wpa-supplicant_0.5.10.bb
+++ b/packages/wpa-supplicant/wpa-supplicant_0.5.10.bb
@@ -4,6 +4,8 @@ LICENSE = "GPL"
 HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
 DEPENDS = "gnutls ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}"
 
+PR = "r1"
+
 #we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds
 MY_ARCH := "${PACKAGE_ARCH}"
 PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}', d)}"